From 2578c1c6ec67a8b9c7274c6f0e0f47ed030a6813 Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Sun, 22 Jul 2018 00:25:42 +0800
Subject: [PATCH] Fix direct boot

---
 mobile/build.gradle                           |  2 +-
 mobile/src/main/AndroidManifest.xml           |  3 +++
 .../src/main/java/be/mygod/vpnhotspot/App.kt  | 17 +++++++++-------
 .../mygod/vpnhotspot/util/DeviceStorageApp.kt | 20 +++++++++++++++++++
 .../java/be/mygod/vpnhotspot/util/NoisySu.kt  |  2 +-
 5 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 mobile/src/main/java/be/mygod/vpnhotspot/util/DeviceStorageApp.kt

diff --git a/mobile/build.gradle b/mobile/build.gradle
index c9c17518..8b53230e 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 28
         resConfigs "zh-rCN"
-        versionCode 30
+        versionCode 31
         versionName "1.3.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 96d5babb..ac1f33ba 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -41,6 +41,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <meta-data android:name="firebase_crashlytics_collection_enabled"
+                   android:value="false"/>
+
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/App.kt b/mobile/src/main/java/be/mygod/vpnhotspot/App.kt
index f39b177a..1b06c022 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/App.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/App.kt
@@ -2,7 +2,6 @@ package be.mygod.vpnhotspot
 
 import android.annotation.SuppressLint
 import android.app.Application
-import android.content.Context
 import android.content.SharedPreferences
 import android.content.res.Configuration
 import android.net.ConnectivityManager
@@ -10,10 +9,13 @@ import android.net.wifi.WifiManager
 import android.os.Build
 import android.os.Handler
 import android.preference.PreferenceManager
-import androidx.annotation.StringRes
 import android.widget.Toast
+import androidx.annotation.StringRes
 import androidx.core.content.getSystemService
+import be.mygod.vpnhotspot.util.DeviceStorageApp
 import be.mygod.vpnhotspot.util.Event0
+import com.crashlytics.android.Crashlytics
+import io.fabric.sdk.android.Fabric
 
 class App : Application() {
     companion object {
@@ -28,9 +30,10 @@ class App : Application() {
         super.onCreate()
         app = this
         if (Build.VERSION.SDK_INT >= 24) {
-            deviceContext = createDeviceProtectedStorageContext()
-            deviceContext.moveSharedPreferencesFrom(this, PreferenceManager.getDefaultSharedPreferencesName(this))
-        } else deviceContext = this
+            deviceStorage = DeviceStorageApp(this)
+            deviceStorage.moveSharedPreferencesFrom(this, PreferenceManager.getDefaultSharedPreferencesName(this))
+        } else deviceStorage = this
+        Fabric.with(deviceStorage, Crashlytics())
         ServiceNotification.updateNotificationChannels()
     }
 
@@ -39,9 +42,9 @@ class App : Application() {
         ServiceNotification.updateNotificationChannels()
     }
 
-    lateinit var deviceContext: Context
+    lateinit var deviceStorage: Application
     val handler = Handler()
-    val pref: SharedPreferences by lazy { PreferenceManager.getDefaultSharedPreferences(deviceContext) }
+    val pref: SharedPreferences by lazy { PreferenceManager.getDefaultSharedPreferences(deviceStorage) }
     val connectivity by lazy { getSystemService<ConnectivityManager>()!! }
     val wifi by lazy { getSystemService<WifiManager>()!! }
 
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/util/DeviceStorageApp.kt b/mobile/src/main/java/be/mygod/vpnhotspot/util/DeviceStorageApp.kt
new file mode 100644
index 00000000..3df4e7f8
--- /dev/null
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/util/DeviceStorageApp.kt
@@ -0,0 +1,20 @@
+package be.mygod.vpnhotspot.util
+
+import android.annotation.SuppressLint
+import android.annotation.TargetApi
+import android.app.Application
+import android.content.Context
+
+@SuppressLint("Registered")
+@TargetApi(24)
+class DeviceStorageApp(context: Context) : Application() {
+    init {
+        attachBaseContext(context.createDeviceProtectedStorageContext())
+    }
+
+    /**
+     * Thou shalt not get the REAL underlying application context which would no longer be operating under device
+     * protected storage.
+     */
+    override fun getApplicationContext(): Context = this
+}
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/util/NoisySu.kt b/mobile/src/main/java/be/mygod/vpnhotspot/util/NoisySu.kt
index f031b8f2..ac56eb80 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/util/NoisySu.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/util/NoisySu.kt
@@ -14,7 +14,7 @@ private class SuFailure : RuntimeException()
 fun loggerSuStream(command: String): InputStream? {
     val process = try {
         ProcessBuilder("su", "-c", command)
-                .directory(app.deviceContext.cacheDir)
+                .directory(app.deviceStorage.cacheDir)
                 .redirectErrorStream(true)
                 .start()
     } catch (e: IOException) {