Modernize MagiskInstaller

foreverchina · Jul 29, 2019 · 7d93ca5 · 7d93ca5
1 parent ac20063
commit 7d93ca5
Show file tree

Hide file tree

Showing 3 changed files with 357 additions and 359 deletions.
diff --git a/app/src/main/java/com/topjohnwu/magisk/App.kt b/app/src/main/java/com/topjohnwu/magisk/App.kt
@@ -41,12 +41,10 @@ open class App : Application() {
 
         protectedContext = baseContext
         self = this
-        deContext = base
 
         if (Build.VERSION.SDK_INT >= 24) {
             protectedContext = base.createDeviceProtectedStorageContext()
-            deContext = protectedContext
-            deContext.moveSharedPreferencesFrom(base, base.defaultPrefsName)
+            protectedContext.moveSharedPreferencesFrom(base, base.defaultPrefsName)
         }
 
         registerActivityLifecycleCallbacks(get())
@@ -69,11 +67,6 @@ open class App : Application() {
         @JvmStatic
         lateinit var self: App
 
-        @SuppressLint("StaticFieldLeak")
-        @Deprecated("Use dependency injection; replace with protectedContext")
-        @JvmStatic
-        lateinit var deContext: Context
-
         @Deprecated("Use Rx or similar")
         @JvmField
         var THREAD_POOL: ThreadPoolExecutor

diff --git a/app/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java b/app/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java