I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

This solves #2552 hopefully.

Browse Source
This commit is contained in:
meeh
2019-06-18 18:09:03 +00:00
parent 95e6c1f7a6
commit 5023d69222
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/net/i2p/android/i2ptunnel/util/TunnelUtil.java
View File

@ -7,6 +7,7 @@ import android.os.Bundle;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.android.router.R; import net.i2p.android.router.R;
import net.i2p.android.router.util.Util;
import net.i2p.android.wizard.model.Page; import net.i2p.android.wizard.model.Page;
import net.i2p.i2ptunnel.TunnelController; import net.i2p.i2ptunnel.TunnelController;
import net.i2p.i2ptunnel.TunnelControllerGroup; import net.i2p.i2ptunnel.TunnelControllerGroup;
@ -589,12 +590,17 @@ public class TunnelUtil extends GeneralHelper {
// Update the TunnelConfig from the tunnel wizard settings // Update the TunnelConfig from the tunnel wizard settings
String kClientServer = res.getString(R.string.i2ptunnel_wizard_k_client_server); String kClientServer = res.getString(R.string.i2ptunnel_wizard_k_client_server);
String kType = res.getString(R.string.i2ptunnel_wizard_k_type); String kType = res.getString(R.string.i2ptunnel_wizard_k_type);
String clientServer = data.getBundle(kClientServer).getString(Page.SIMPLE_DATA_KEY); try {
String typeName = data.getBundle(clientServer + ":" + kType).getString(Page.SIMPLE_DATA_KEY); String clientServer = data.getBundle(kClientServer).getString(Page.SIMPLE_DATA_KEY);
String type = getTypeFromName(typeName, ctx); String typeName = data.getBundle(clientServer + ":" + kType).getString(Page.SIMPLE_DATA_KEY);
cfg.setType(type); String type = getTypeFromName(typeName, ctx);
cfg.setType(type);
new TunnelConfigFromWizard(cfg, data, res, _group, type).runLogic();
} catch (NullPointerException ex) {
Util.e("Exception while trying to create config from wizard: "+ex.getMessage());
}
new TunnelConfigFromWizard(cfg, data, res, _group, type).runLogic();
return cfg; return cfg;
} }