diff options
author | cyberta <cyberta@riseup.net> | 2021-12-11 16:30:36 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2021-12-11 16:30:36 +0000 |
commit | 42a3735356881633004dfb6ed3c60fe8b7d26689 (patch) | |
tree | 9f54e737b24f9877938e79dd5726cb084be02d7e /app/src/main/java/se/leap/bitmaskclient/base/fragments | |
parent | 5aaa3bb1c83d486e300eb98876eab26ad4325b82 (diff) | |
parent | e7c09efba8a06bc7a000d525aff5ac027339023e (diff) |
Merge branch 'bugfixes' into 'master'
bug fixes
See merge request leap/bitmask_android!153
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/base/fragments')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java | 6 | ||||
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/fragments/GatewaySelectionFragment.java | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java index 14673874..07057d6e 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java @@ -336,9 +336,9 @@ public class EipFragment extends Fragment implements Observer { Bundle bundle = new Bundle(); bundle.putBoolean(EIP_ACTION_START, true); bundle.putBoolean(EIP_EARLY_ROUTES, false); - ProviderAPICommand.execute(getContext().getApplicationContext(), DOWNLOAD_GEOIP_JSON, bundle, provider); + ProviderAPICommand.execute(context, DOWNLOAD_GEOIP_JSON, bundle, provider); } else { - EipCommand.startVPN(context.getApplicationContext(), false); + EipCommand.startVPN(context, false); } EipStatus.getInstance().updateState("UI_CONNECTING", "", 0, ConnectionStatus.LEVEL_START); } @@ -349,7 +349,7 @@ public class EipFragment extends Fragment implements Observer { Log.e(TAG, "context is null when trying to stop EIP"); return; } - EipCommand.stopVPN(context.getApplicationContext()); + EipCommand.stopVPN(context); } private void askPendingStartCancellation() { diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/GatewaySelectionFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/GatewaySelectionFragment.java index 4e7bb6ab..f2c3b2d6 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/GatewaySelectionFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/GatewaySelectionFragment.java @@ -176,10 +176,14 @@ public class GatewaySelectionFragment extends Fragment implements Observer, Loca } PreferenceHelper.setPreferredCity(context, preferredCity); EipCommand.startVPN(context, false); - Intent intent = new Intent(getContext(), MainActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP); - intent.setAction(ACTION_SHOW_VPN_FRAGMENT); - startActivity(intent); + try { + Intent intent = new Intent(context, MainActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP); + intent.setAction(ACTION_SHOW_VPN_FRAGMENT); + context.startActivity(intent); + } catch (NullPointerException npe) { + npe.printStackTrace(); + } }).start(); } |