Merge branch 'bugfixes' into 'master'

bug fixes

See merge request leap/bitmask_android!153

1 files changed, 8 insertions, 4 deletions

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();
     }