Merge branch 'reduce_apk_size2' into 'master'

Reduce apk size

See merge request leap/bitmask_android!95

1 files changed, 23 insertions, 14 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
index 0485e907..a6f8040f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
@@ -324,13 +324,17 @@ public class EipFragment extends Fragment implements Observer {
             return;
         }
 
-        AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getActivity());
-        showPendingStartCancellation = true;
-        alertDialog = alertBuilder.setTitle(activity.getString(R.string.eip_cancel_connect_title))
-                .setMessage(activity.getString(R.string.eip_cancel_connect_text))
-                .setPositiveButton((android.R.string.yes), (dialog, which) -> stopEipIfPossible())
-                .setNegativeButton(activity.getString(android.R.string.no), (dialog, which) -> {
-                }).setOnDismissListener(dialog -> showPendingStartCancellation = false).show();
+        try {
+            AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getActivity());
+            showPendingStartCancellation = true;
+            alertDialog = alertBuilder.setTitle(activity.getString(R.string.eip_cancel_connect_title))
+                    .setMessage(activity.getString(R.string.eip_cancel_connect_text))
+                    .setPositiveButton((android.R.string.yes), (dialog, which) -> stopEipIfPossible())
+                    .setNegativeButton(activity.getString(android.R.string.no), (dialog, which) -> {
+                    }).setOnDismissListener(dialog -> showPendingStartCancellation = false).show();
+        } catch (IllegalStateException e) {
+            e.printStackTrace();
+        }
 
     }
 
@@ -340,13 +344,18 @@ public class EipFragment extends Fragment implements Observer {
             Log.e(TAG, "activity is null when asking to stop EIP");
             return;
         }
-        AlertDialog.Builder alertBuilder = new AlertDialog.Builder(activity);
-        showAskToStopEip = true;
-        alertDialog = alertBuilder.setTitle(activity.getString(R.string.eip_cancel_connect_title))
-                .setMessage(activity.getString(R.string.eip_warning_browser_inconsistency))
-                .setPositiveButton((android.R.string.yes), (dialog, which) -> stopEipIfPossible())
-                .setNegativeButton(activity.getString(android.R.string.no), (dialog, which) -> {
-                }).setOnDismissListener(dialog -> showAskToStopEip = false).show();
+        try {
+            AlertDialog.Builder alertBuilder = new AlertDialog.Builder(activity);
+            showAskToStopEip = true;
+            alertDialog = alertBuilder.setTitle(activity.getString(R.string.eip_cancel_connect_title))
+                    .setMessage(activity.getString(R.string.eip_warning_browser_inconsistency))
+                    .setPositiveButton((android.R.string.yes), (dialog, which) -> stopEipIfPossible())
+                    .setNegativeButton(activity.getString(android.R.string.no), (dialog, which) -> {
+                    }).setOnDismissListener(dialog -> showAskToStopEip = false).show();
+        } catch (IllegalStateException e) {
+            e.printStackTrace();
+        }
+
     }
 
     @Override