diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2017-11-10 10:47:05 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2017-11-26 23:51:44 -0500 |
| commit | bfc020a66bad76966b37f1a2be7887c0d9a6dc91 (patch) | |
| tree | 063916d08a254ade16073f1bfa1e573c6ab1c469 | |
| parent | f1c7ca88e48c6e314f3b1c16485fc6506077ffc5 (diff) | |
Ignroe our own always generated config items (closes #778)
4 files changed, 13 insertions, 12 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java b/main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java index 89b5e8d2..ebfab5b2 100644 --- a/main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java +++ b/main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java @@ -16,6 +16,8 @@ import de.blinkt.openvpn.core.ProfileManager; public class OnBootReceiver extends BroadcastReceiver { + + // Debug: am broadcast -a android.intent.action.BOOT_COMPLETED @Override public void onReceive(Context context, Intent intent) { diff --git a/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java index 74afd61e..9889754d 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java +++ b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java @@ -261,6 +261,7 @@ public class ConfigParser { "group", "allow-recursive-routing", "ip-win32", + "ifconfig-nowarn", "management-hold", "management", "management-client", @@ -275,6 +276,7 @@ public class ConfigParser { "management-client-user", "management-client-group", "pause-exit", + "preresolve", "plugin", "machine-readable-output", "persist-key", @@ -300,7 +302,8 @@ public class ConfigParser { {"setenv", "IV_GUI_VER"}, {"setenv", "IV_OPENVPN_GUI_VERSION"}, {"engine", "dynamic"}, - {"setenv", "CLIENT_CERT"} + {"setenv", "CLIENT_CERT"}, + {"resolve-retry","60"} }; final String[] connectionOptions = { diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java index c85dc114..7188aca1 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java @@ -258,6 +258,7 @@ public class Settings_Basic extends Settings_Fragment implements View.OnClickLis mUserName.setText(mProfile.mUsername); mPassword.setText(mProfile.mPassword); mKeyPassword.setText(mProfile.mKeyPassword); + mAuthRetry.setSelection(mProfile.mAuthRetry); setAlias(); @@ -299,16 +300,11 @@ public class Settings_Basic extends Settings_Fragment implements View.OnClickLis public void showCertDialog () { try { KeyChain.choosePrivateKeyAlias(getActivity(), - new KeyChainAliasCallback() { - - public void alias(String alias) { - // Credential alias selected. Remember the alias selection for future use. - mProfile.mAlias=alias; - mHandler.sendEmptyMessage(UPDATE_ALIAS); - } - - - }, + alias -> { + // Credential alias selected. Remember the alias selection for future use. + mProfile.mAlias=alias; + mHandler.sendEmptyMessage(UPDATE_ALIAS); + }, new String[] {"RSA"}, // List of acceptable key types. null for any null, // issuer, null for any mProfile.mServerName, // host name of server requesting the cert, null if unavailable diff --git a/remoteExample/build.gradle b/remoteExample/build.gradle index 7e063c75..31049d5d 100644 --- a/remoteExample/build.gradle +++ b/remoteExample/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 - buildToolsVersion '26.0.0' + buildToolsVersion '26.0.2' defaultConfig { minSdkVersion 15 |