diff options
| author | cyBerta <cyberta@riseup.net> | 2018-02-18 13:24:07 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-02-18 13:24:07 +0100 |
| commit | be6b775a7fdb1b8c194bea75ae8f923d9c1b0349 (patch) | |
| tree | c4c0b41bbe878187fb1344cb3978e097c620b8b4 /app/src/main/java/se/leap/bitmaskclient/MainActivity.java | |
| parent | 732e1f23d1e00f28ea5e64869737ba2c34e1791e (diff) | |
| parent | ff319e7862b5b6e1592811aa8c6571c7b9a1631c (diff) | |
Merge branch 'mirror_0xacab_0.9.8' into #8797_certificate_expiration
* fix merge conflicts in:
app/src/main/java/se/leap/bitmaskclient/EipFragment.java
app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/MainActivity.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/MainActivity.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java index 91b7f66c..6e778309 100644 --- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java @@ -194,7 +194,7 @@ public class MainActivity extends AppCompatActivity implements Observer { case REQUEST_CODE_CONFIGURE_LEAP: break; case REQUEST_CODE_LOG_IN: - EipCommand.startVPN(this); + EipCommand.startVPN(this, true); break; } } @@ -303,7 +303,7 @@ public class MainActivity extends AppCompatActivity implements Observer { switch (resultCode) { case CORRECTLY_DOWNLOADED_EIP_SERVICE: provider = resultData.getParcelable(PROVIDER_KEY); - EipCommand.startVPN(this); + EipCommand.startVPN(this, true); break; case INCORRECTLY_DOWNLOADED_EIP_SERVICE: // TODO CATCH ME IF YOU CAN - WHAT DO WE WANT TO DO? @@ -312,7 +312,7 @@ public class MainActivity extends AppCompatActivity implements Observer { case CORRECTLY_DOWNLOADED_VPN_CERTIFICATE: provider = resultData.getParcelable(PROVIDER_KEY); ConfigHelper.storeProviderInPreferences(preferences, provider); - EipCommand.startVPN(this); + EipCommand.startVPN(this, true); break; case INCORRECTLY_DOWNLOADED_VPN_CERTIFICATE: if (LeapSRPSession.loggedIn() || provider.allowsAnonymous()) { |