Merge branch 'reduce_apk_size2' into 'master'

Reduce apk size

See merge request leap/bitmask_android!95

21 files changed, 23 insertions, 14 deletions

diff --git a/app/src/custom/res/drawable-land/background_main.png b/app/src/custom/res/drawable-land/background_main.png
deleted file mode 100644
index ce11f5b4..00000000
--- a/app/src/custom/res/drawable-land/background_main.png
+++ /dev/null
diff --git a/app/src/custom/res/drawable-land/background_main.webp b/app/src/custom/res/drawable-land/background_main.webp
new file mode 100644
index 00000000..c28c2183
--- /dev/null
+++ b/app/src/custom/res/drawable-land/background_main.webp
diff --git a/app/src/custom/res/drawable-land/ic_splash_background.png b/app/src/custom/res/drawable-land/ic_splash_background.png
deleted file mode 100644
index 09103e4b..00000000
--- a/app/src/custom/res/drawable-land/ic_splash_background.png
+++ /dev/null
diff --git a/app/src/custom/res/drawable-land/ic_splash_background.webp b/app/src/custom/res/drawable-land/ic_splash_background.webp
new file mode 100644
index 00000000..f939c114
--- /dev/null
+++ b/app/src/custom/res/drawable-land/ic_splash_background.webp
diff --git a/app/src/custom/res/drawable-sw600dp-port/background_main.png b/app/src/custom/res/drawable-sw600dp-port/background_main.png
deleted file mode 100644
index 23c7ffa6..00000000
--- a/app/src/custom/res/drawable-sw600dp-port/background_main.png
+++ /dev/null
diff --git a/app/src/custom/res/drawable-sw600dp-port/background_main.webp b/app/src/custom/res/drawable-sw600dp-port/background_main.webp
new file mode 100644
index 00000000..6d23e9e1
--- /dev/null
+++ b/app/src/custom/res/drawable-sw600dp-port/background_main.webp
diff --git a/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.png b/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.png
deleted file mode 100644
index c5abd96a..00000000
--- a/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.png
+++ /dev/null
diff --git a/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.webp b/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.webp
new file mode 100644
index 00000000..227fcb24
--- /dev/null
+++ b/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.webp
diff --git a/app/src/custom/res/drawable-sw600dp/background_main.png b/app/src/custom/res/drawable-sw600dp/background_main.png
deleted file mode 100644
index d11acde1..00000000
--- a/app/src/custom/res/drawable-sw600dp/background_main.png
+++ /dev/null
diff --git a/app/src/custom/res/drawable-sw600dp/background_main.webp b/app/src/custom/res/drawable-sw600dp/background_main.webp
new file mode 100644
index 00000000..aa6b452b
--- /dev/null
+++ b/app/src/custom/res/drawable-sw600dp/background_main.webp
diff --git a/app/src/custom/res/drawable-sw600dp/ic_splash_background.png b/app/src/custom/res/drawable-sw600dp/ic_splash_background.png
deleted file mode 100644
index b3fb1f9c..00000000
--- a/app/src/custom/res/drawable-sw600dp/ic_splash_background.png
+++ /dev/null
diff --git a/app/src/custom/res/drawable-sw600dp/ic_splash_background.webp b/app/src/custom/res/drawable-sw600dp/ic_splash_background.webp
new file mode 100644
index 00000000..f1a035ec
--- /dev/null
+++ b/app/src/custom/res/drawable-sw600dp/ic_splash_background.webp
diff --git a/app/src/custom/res/drawable/background_drawer.png b/app/src/custom/res/drawable/background_drawer.png
deleted file mode 100644
index ed138c42..00000000
--- a/app/src/custom/res/drawable/background_drawer.png
+++ /dev/null
diff --git a/app/src/custom/res/drawable/background_drawer.webp b/app/src/custom/res/drawable/background_drawer.webp
new file mode 100644
index 00000000..8e0c4a6f
--- /dev/null
+++ b/app/src/custom/res/drawable/background_drawer.webp
diff --git a/app/src/custom/res/drawable/background_main.png b/app/src/custom/res/drawable/background_main.png
deleted file mode 100644
index 23c7ffa6..00000000
--- a/app/src/custom/res/drawable/background_main.png
+++ /dev/null
diff --git a/app/src/custom/res/drawable/background_main.webp b/app/src/custom/res/drawable/background_main.webp
new file mode 100644
index 00000000..6d23e9e1
--- /dev/null
+++ b/app/src/custom/res/drawable/background_main.webp
diff --git a/app/src/custom/res/drawable/ic_splash_background.png b/app/src/custom/res/drawable/ic_splash_background.png
deleted file mode 100644
index c5abd96a..00000000
--- a/app/src/custom/res/drawable/ic_splash_background.png
+++ /dev/null
diff --git a/app/src/custom/res/drawable/ic_splash_background.webp b/app/src/custom/res/drawable/ic_splash_background.webp
new file mode 100644
index 00000000..227fcb24
--- /dev/null
+++ b/app/src/custom/res/drawable/ic_splash_background.webp
diff --git a/app/src/custom/res/drawable/logo_square.png b/app/src/custom/res/drawable/logo_square.png
deleted file mode 100644
index d20cedd5..00000000
--- a/app/src/custom/res/drawable/logo_square.png
+++ /dev/null
diff --git a/app/src/custom/res/drawable/logo_square.webp b/app/src/custom/res/drawable/logo_square.webp
new file mode 100644
index 00000000..cd3ad9d0
--- /dev/null
+++ b/app/src/custom/res/drawable/logo_square.webp
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