From 9a1a3f7732980fbbf53941ce33c1a2ad2ccc37a6 Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Mon, 11 Jun 2018 10:41:01 +0800
Subject: [PATCH] Misc fixes

---
 mobile/src/main/AndroidManifest.xml                      | 1 +
 .../src/main/java/be/mygod/vpnhotspot/RepeaterService.kt | 2 +-
 mobile/src/main/res/drawable/ic_action_bug_report.xml    | 3 ++-
 mobile/src/main/res/drawable/ic_action_dns.xml           | 3 ++-
 mobile/src/main/res/drawable/ic_action_pan_tool.xml      | 3 ++-
 .../res/drawable/ic_action_settings_backup_restore.xml   | 3 ++-
 .../main/res/drawable/ic_action_settings_ethernet.xml    | 3 ++-
 mobile/src/main/res/drawable/ic_image_edit.xml           | 9 ---------
 mobile/src/main/res/drawable/ic_image_looks_6.xml        | 3 ++-
 mobile/src/main/res/drawable/ic_toggle_star.xml          | 3 ++-
 10 files changed, 16 insertions(+), 17 deletions(-)
 delete mode 100644 mobile/src/main/res/drawable/ic_image_edit.xml

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 0f759019..2796e587 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -24,6 +24,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.MANAGE_USB"
                      tools:ignore="ProtectedPermissions"/>
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
index 84e464e3..f9507789 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
@@ -134,7 +134,7 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, SharedPrefere
             p2pManager = systemService()
             onChannelDisconnected()
             app.pref.registerOnSharedPreferenceChangeListener(this)
-        } catch (exc: TypeCastException) {
+        } catch (exc: KotlinNullPointerException) {
             exc.printStackTrace()
             Crashlytics.logException(exc)
         }
diff --git a/mobile/src/main/res/drawable/ic_action_bug_report.xml b/mobile/src/main/res/drawable/ic_action_bug_report.xml
index 4d83902b..cc0fa09b 100644
--- a/mobile/src/main/res/drawable/ic_action_bug_report.xml
+++ b/mobile/src/main/res/drawable/ic_action_bug_report.xml
@@ -2,7 +2,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
         android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
diff --git a/mobile/src/main/res/drawable/ic_action_dns.xml b/mobile/src/main/res/drawable/ic_action_dns.xml
index 1a8528c5..dd725bed 100644
--- a/mobile/src/main/res/drawable/ic_action_dns.xml
+++ b/mobile/src/main/res/drawable/ic_action_dns.xml
@@ -2,7 +2,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
         android:pathData="M20,13H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1v-6c0,-0.55 -0.45,-1 -1,-1zM7,19c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM20,3H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1zM7,9c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
diff --git a/mobile/src/main/res/drawable/ic_action_pan_tool.xml b/mobile/src/main/res/drawable/ic_action_pan_tool.xml
index 872664c0..907facd0 100644
--- a/mobile/src/main/res/drawable/ic_action_pan_tool.xml
+++ b/mobile/src/main/res/drawable/ic_action_pan_tool.xml
@@ -1,5 +1,6 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tint="?attr/colorControlNormal">
     <path android:fillColor="#FF000000" android:pathData="M23,5.5V20c0,2.2 -1.8,4 -4,4h-7.3c-1.08,0 -2.1,-0.43 -2.85,-1.19L1,14.83s1.26,-1.23 1.3,-1.25c0.22,-0.19 0.49,-0.29 0.79,-0.29 0.22,0 0.42,0.06 0.6,0.16 0.04,0.01 4.31,2.46 4.31,2.46V4c0,-0.83 0.67,-1.5 1.5,-1.5S11,3.17 11,4v7h1V1.5c0,-0.83 0.67,-1.5 1.5,-1.5S15,0.67 15,1.5V11h1V2.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5V11h1V5.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5z"/>
 </vector>
diff --git a/mobile/src/main/res/drawable/ic_action_settings_backup_restore.xml b/mobile/src/main/res/drawable/ic_action_settings_backup_restore.xml
index aa424c0d..7167e7a2 100644
--- a/mobile/src/main/res/drawable/ic_action_settings_backup_restore.xml
+++ b/mobile/src/main/res/drawable/ic_action_settings_backup_restore.xml
@@ -2,7 +2,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
         android:pathData="M14,12c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2 0.9,2 2,2 2,-0.9 2,-2zM12,3c-4.97,0 -9,4.03 -9,9L0,12l4,4 4,-4L5,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.51,0 -2.91,-0.49 -4.06,-1.3l-1.42,1.44C8.04,20.3 9.94,21 12,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9z"/>
diff --git a/mobile/src/main/res/drawable/ic_action_settings_ethernet.xml b/mobile/src/main/res/drawable/ic_action_settings_ethernet.xml
index d60cda4f..da3ca6a8 100644
--- a/mobile/src/main/res/drawable/ic_action_settings_ethernet.xml
+++ b/mobile/src/main/res/drawable/ic_action_settings_ethernet.xml
@@ -2,7 +2,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
         android:pathData="M7.77,6.76L6.23,5.48 0.82,12l5.41,6.52 1.54,-1.28L3.42,12l4.35,-5.24zM7,13h2v-2L7,11v2zM17,11h-2v2h2v-2zM11,13h2v-2h-2v2zM17.77,5.48l-1.54,1.28L20.58,12l-4.35,5.24 1.54,1.28L23.18,12l-5.41,-6.52z"/>
diff --git a/mobile/src/main/res/drawable/ic_image_edit.xml b/mobile/src/main/res/drawable/ic_image_edit.xml
deleted file mode 100644
index 2ab2fb75..00000000
--- a/mobile/src/main/res/drawable/ic_image_edit.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
diff --git a/mobile/src/main/res/drawable/ic_image_looks_6.xml b/mobile/src/main/res/drawable/ic_image_looks_6.xml
index 6219b6d9..441f83ef 100644
--- a/mobile/src/main/res/drawable/ic_image_looks_6.xml
+++ b/mobile/src/main/res/drawable/ic_image_looks_6.xml
@@ -2,7 +2,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
         android:pathData="M11,15h2v-2h-2v2zM19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM15,9h-4v2h2c1.1,0 2,0.89 2,2v2c0,1.11 -0.9,2 -2,2h-2c-1.1,0 -2,-0.89 -2,-2L9,9c0,-1.11 0.9,-2 2,-2h4v2z"/>
diff --git a/mobile/src/main/res/drawable/ic_toggle_star.xml b/mobile/src/main/res/drawable/ic_toggle_star.xml
index a87ca098..667ac95c 100644
--- a/mobile/src/main/res/drawable/ic_toggle_star.xml
+++ b/mobile/src/main/res/drawable/ic_toggle_star.xml
@@ -2,7 +2,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
         android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>