Update v7.3.4 changelogs

Close #1607

.gitattributes

@@ -11,7 +11,7 @@
 *.bat text eol=crlf
 
 # Denote all files that are truly binary and should not be modified.
-chromeos/** binary
+tools/** binary
 *.jar binary
 *.exe binary
 *.apk binary

.gitmodules

@@ -19,3 +19,9 @@
 [submodule "nanopb"]
 	path = native/jni/external/nanopb
 	url = https://github.com/nanopb/nanopb.git
+[submodule "mincrypt"]
+	path = native/jni/external/mincrypt
+	url = https://github.com/topjohnwu/mincrypt.git
+[submodule "termux-elf-cleaner"]
+	path = tools/termux-elf-cleaner
+	url = https://github.com/termux/termux-elf-cleaner.git

README.MD

@@ -10,7 +10,7 @@ Furthermore, Magisk provides a **Systemless Interface** to alter the system (or
 
 ## Bug Reports
 
-**Make sure to install the latest [Canary Build](https://forum.xda-developers.com/apps/magisk/dev-magisk-canary-channel-bleeding-edge-t3839337) before reporting any bugs!** **DO NOT** report bugs that is already fixed upstream. Follow the instructions in the [Canary Channel XDA Thread](https://forum.xda-developers.com/apps/magisk/dev-magisk-canary-channel-bleeding-edge-t3839337), and report a bug either by opening an issue on GitHub or directly in the thread.
+**Make sure to install the latest [Canary Build](https://forum.xda-developers.com/apps/magisk/dev-magisk-canary-channel-bleeding-edge-t3839337) before reporting any bugs!** **DO NOT** report bugs that are already fixed upstream. Follow the instructions in the [Canary Channel XDA Thread](https://forum.xda-developers.com/apps/magisk/dev-magisk-canary-channel-bleeding-edge-t3839337), and report a bug either by [opening an issue on GitHub](https://github.com/topjohnwu/Magisk/issues) or directly in the thread.
 
 ## Building Environment Requirements
 

app/build.gradle

@@ -17,8 +17,8 @@ android {
         applicationId 'com.topjohnwu.magisk'
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
-        versionName configProps['appVersion']
-        versionCode configProps['appVersionCode'] as Integer
+        versionName props['appVersion']
+        versionCode props['appVersionCode'] as Integer
     }
 
     buildTypes {
@@ -39,7 +39,7 @@ android {
         exclude '/META-INF/*.kotlin_module'
         exclude '/META-INF/rxkotlin.properties'
         exclude '/androidsupportmultidexversion.txt'
-        exclude '/org/**'
+        exclude '/org/bouncycastle/**'
         exclude '/kotlin/**'
         exclude '/kotlinx/**'
     }
@@ -55,7 +55,6 @@ androidExtensions {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation project(':net')
     implementation project(':shared')
     implementation project(':signing')
 
@@ -63,13 +62,14 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'com.github.skoumalcz:teanity:0.3.3'
     implementation 'com.ncapdevi:frag-nav:3.2.0'
+    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.6'
 
-    def vMarkwon = '3.0.1'
+    def vMarkwon = '3.1.0'
     implementation "ru.noties.markwon:core:${vMarkwon}"
     implementation "ru.noties.markwon:html:${vMarkwon}"
     implementation "ru.noties.markwon:image-svg:${vMarkwon}"
 
-    def vLibsu = '2.5.0'
+    def vLibsu = '2.5.1'
     implementation "com.github.topjohnwu.libsu:core:${vLibsu}"
     implementation "com.github.topjohnwu.libsu:io:${vLibsu}"
 
@@ -78,12 +78,13 @@ dependencies {
     implementation "org.koin:koin-android:${vKoin}"
     implementation "org.koin:koin-androidx-viewmodel:${vKoin}"
 
-    def vRetrofit = "2.6.0"
+    def vRetrofit = '2.6.1'
     implementation "com.squareup.retrofit2:retrofit:${vRetrofit}"
     implementation "com.squareup.retrofit2:converter-moshi:${vRetrofit}"
+    implementation "com.squareup.retrofit2:converter-scalars:${vRetrofit}"
     implementation "com.squareup.retrofit2:adapter-rxjava2:${vRetrofit}"
 
-    def vOkHttp = "3.12.3"
+    def vOkHttp = '3.12.2'
     implementation "com.squareup.okhttp3:okhttp:${vOkHttp}"
     implementation "com.squareup.okhttp3:logging-interceptor:${vOkHttp}"
 
@@ -101,14 +102,18 @@ dependencies {
     }
     def vRoom = "2.1.0"
     implementation "com.github.topjohnwu:room-runtime:${vRoom}"
+    kapt "androidx.room:room-compiler:${vRoom}"
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVer}"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlinVer}"
 
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.browser:browser:1.0.0'
-    implementation 'androidx.preference:preference:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha06'
+    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta04'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.work:work-runtime:2.0.1'
-    implementation 'androidx.transition:transition:1.2.0-alpha01'
+    implementation 'androidx.work:work-runtime:2.2.0'
+    implementation 'androidx.transition:transition:1.2.0-rc01'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'com.google.android.material:material:1.1.0-alpha07'
+    implementation 'com.google.android.material:material:1.1.0-alpha10'
 }

app/proguard-rules.pro

@@ -17,9 +17,9 @@
 #}
 
 # Snet
--keepclassmembers class com.topjohnwu.magisk.utils.ISafetyNetHelper { *; }
--keep,allowobfuscation interface com.topjohnwu.magisk.utils.ISafetyNetHelper$Callback
--keepclassmembers class * implements com.topjohnwu.magisk.utils.ISafetyNetHelper$Callback {
+-keepclassmembers class com.topjohnwu.magisk.utils.SafetyNetHelper { *; }
+-keep,allowobfuscation interface com.topjohnwu.magisk.utils.SafetyNetHelper$Callback
+-keepclassmembers class * implements com.topjohnwu.magisk.utils.SafetyNetHelper$Callback {
   void onResponse(int);
 }
 
@@ -36,9 +36,6 @@
 
 # Strip logging
 -assumenosideeffects class timber.log.Timber.Tree { *; }
--assumenosideeffects class com.topjohnwu.magisk.utils.Logger {
-  public *** debug(...);
-}
 
 # Excessive obfuscation
 -repackageclasses 'a'

app/src/main/AndroidManifest.xml

@@ -3,14 +3,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.magisk">
 
+    <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 
     <application
-        android:allowBackup="true"
         android:name="a.e"
+        android:allowBackup="true"
         android:theme="@style/MagiskTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
@@ -41,9 +42,9 @@
 
         <activity
             android:name="a.m"
-            android:exported="false"
             android:directBootAware="true"
             android:excludeFromRecents="true"
+            android:exported="false"
             android:theme="@style/MagiskTheme.SU" />
 
         <!-- Receiver -->
@@ -65,7 +66,8 @@
 
         <!-- Service -->
 
-        <service android:name="a.j" />
+        <service android:name="a.j"
+            android:exported="false" />
 
         <!-- Hardcode GMS version -->
         <meta-data

app/src/main/java/a/j.java

@@ -1,7 +1,7 @@
 package a;
 
-import com.topjohnwu.magisk.model.download.DownloadModuleService;
+import com.topjohnwu.magisk.model.download.DownloadService;
 
-public class j extends DownloadModuleService {
+public class j extends DownloadService {
     /* stub */
 }

app/src/main/java/a/w.java

@@ -2,14 +2,14 @@ package a;
 
 import android.content.Context;
 
-import com.topjohnwu.magisk.model.worker.DelegateWorker;
-
-import java.lang.reflect.ParameterizedType;
-
 import androidx.annotation.NonNull;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
 
+import com.topjohnwu.magisk.model.worker.DelegateWorker;
+
+import java.lang.reflect.ParameterizedType;
+
 public abstract class w<T extends DelegateWorker> extends Worker {
 
     /* Wrapper class to workaround Proguard -keep class * extends Worker */
@@ -22,7 +22,7 @@ public abstract class w<T extends DelegateWorker> extends Worker {
         try {
             base = ((Class<T>) ((ParameterizedType) getClass().getGenericSuperclass())
                     .getActualTypeArguments()[0]).newInstance();
-            base.setActualWorker(this);
+            base.attachWorker(this);
         } catch (Exception ignored) {}
     }
 

app/src/main/java/com/topjohnwu/magisk/App.kt

@@ -1,35 +1,42 @@
 package com.topjohnwu.magisk
 
-import android.annotation.SuppressLint
-import android.app.Activity
 import android.app.Application
 import android.content.Context
 import android.content.res.Configuration
-import android.os.AsyncTask
-import android.os.Build
-import android.os.Bundle
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.multidex.MultiDex
 import androidx.room.Room
 import androidx.work.impl.WorkDatabase
 import androidx.work.impl.WorkDatabase_Impl
+import com.topjohnwu.magisk.data.database.RepoDatabase
+import com.topjohnwu.magisk.data.database.RepoDatabase_Impl
+import com.topjohnwu.magisk.di.ActivityTracker
 import com.topjohnwu.magisk.di.koinModules
+import com.topjohnwu.magisk.extensions.get
+import com.topjohnwu.magisk.net.Networking
 import com.topjohnwu.magisk.utils.LocaleManager
 import com.topjohnwu.magisk.utils.RootUtils
-import com.topjohnwu.magisk.utils.inject
-import com.topjohnwu.net.Networking
 import com.topjohnwu.superuser.Shell
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 import timber.log.Timber
-import java.util.concurrent.ThreadPoolExecutor
 
-open class App : Application(), Application.ActivityLifecycleCallbacks {
+open class App : Application() {
 
-    lateinit var protectedContext: Context
-
-    @Volatile
-    private var foreground: Activity? = null
+    init {
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+        Shell.Config.setFlags(Shell.FLAG_MOUNT_MASTER or Shell.FLAG_USE_MAGISK_BUSYBOX)
+        Shell.Config.verboseLogging(BuildConfig.DEBUG)
+        Shell.Config.addInitializers(RootUtils::class.java)
+        Shell.Config.setTimeout(2)
+        Room.setFactory {
+            when (it) {
+                WorkDatabase::class.java -> WorkDatabase_Impl()
+                RepoDatabase::class.java -> RepoDatabase_Impl()
+                else -> null
+            }
+        }
+    }
 
     override fun attachBaseContext(base: Context) {
         super.attachBaseContext(base)
@@ -42,17 +49,7 @@ open class App : Application(), Application.ActivityLifecycleCallbacks {
             modules(koinModules)
         }
 
-        protectedContext = baseContext
-        self = this
-        deContext = base
-
-        if (Build.VERSION.SDK_INT >= 24) {
-            protectedContext = base.createDeviceProtectedStorageContext()
-            deContext = protectedContext
-            deContext.moveSharedPreferencesFrom(base, base.defaultPrefsName)
-        }
-
-        registerActivityLifecycleCallbacks(this)
+        registerActivityLifecycleCallbacks(get<ActivityTracker>())
 
         Networking.init(base)
         LocaleManager.setLocale(this)
@@ -62,67 +59,4 @@ open class App : Application(), Application.ActivityLifecycleCallbacks {
         super.onConfigurationChanged(newConfig)
         LocaleManager.setLocale(this)
     }
-
-    //region ActivityLifecycleCallbacks
-    override fun onActivityCreated(activity: Activity, bundle: Bundle?) {}
-
-    override fun onActivityStarted(activity: Activity) {}
-
-    @Synchronized
-    override fun onActivityResumed(activity: Activity) {
-        foreground = activity
-    }
-
-    @Synchronized
-    override fun onActivityPaused(activity: Activity) {
-        foreground = null
-    }
-
-    override fun onActivityStopped(activity: Activity) {}
-
-    override fun onActivitySaveInstanceState(activity: Activity, bundle: Bundle) {}
-
-    override fun onActivityDestroyed(activity: Activity) {}
-    //endregion
-
-    private val Context.defaultPrefsName get() = "${packageName}_preferences"
-
-    companion object {
-
-        @SuppressLint("StaticFieldLeak")
-        @Deprecated("Use dependency injection")
-        @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
-
-        init {
-            AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
-            Shell.Config.setFlags(Shell.FLAG_MOUNT_MASTER or Shell.FLAG_USE_MAGISK_BUSYBOX)
-            Shell.Config.verboseLogging(BuildConfig.DEBUG)
-            Shell.Config.addInitializers(RootUtils::class.java)
-            Shell.Config.setTimeout(2)
-            THREAD_POOL = AsyncTask.THREAD_POOL_EXECUTOR as ThreadPoolExecutor
-            Room.setFactory {
-                when (it) {
-                    WorkDatabase::class.java -> WorkDatabase_Impl()
-                    else -> null
-                }
-            }
-        }
-
-        @Deprecated("")
-        @JvmStatic
-        fun foreground(): Activity? {
-            val app: App by inject()
-            return app.foreground
-        }
-    }
 }

app/src/main/java/com/topjohnwu/magisk/ClassMap.kt

@@ -1,6 +1,6 @@
 package com.topjohnwu.magisk
 
-import com.topjohnwu.magisk.model.download.DownloadModuleService
+import com.topjohnwu.magisk.model.download.DownloadService
 import com.topjohnwu.magisk.model.receiver.GeneralReceiver
 import com.topjohnwu.magisk.model.update.UpdateCheckService
 import com.topjohnwu.magisk.ui.MainActivity
@@ -16,11 +16,10 @@ object ClassMap {
         FlashActivity::class.java to a.f::class.java,
         UpdateCheckService::class.java to a.g::class.java,
         GeneralReceiver::class.java to a.h::class.java,
-        DownloadModuleService::class.java to a.j::class.java,
+        DownloadService::class.java to a.j::class.java,
         SuRequestActivity::class.java to a.m::class.java
     )
 
-    @JvmStatic
     operator fun <T : Class<*>>get(c: Class<*>): T {
         return map.getOrElse(c) { throw IllegalArgumentException() } as T
     }

app/src/main/java/com/topjohnwu/magisk/Config.kt

@@ -1,14 +1,20 @@
 package com.topjohnwu.magisk
 
 import android.content.Context
+import android.content.SharedPreferences
+import android.os.Environment
 import android.util.Xml
 import androidx.core.content.edit
 import com.topjohnwu.magisk.data.database.SettingsDao
 import com.topjohnwu.magisk.data.database.StringDao
 import com.topjohnwu.magisk.data.repository.DBConfig
 import com.topjohnwu.magisk.di.Protected
+import com.topjohnwu.magisk.extensions.get
+import com.topjohnwu.magisk.extensions.inject
+import com.topjohnwu.magisk.extensions.packageName
 import com.topjohnwu.magisk.model.preference.PreferenceModel
-import com.topjohnwu.magisk.utils.*
+import com.topjohnwu.magisk.utils.FingerprintHelper
+import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.io.SuFile
 import com.topjohnwu.superuser.io.SuFileInputStream
@@ -39,9 +45,9 @@ object Config : PreferenceModel, DBConfig {
         const val CUSTOM_CHANNEL = "custom_channel"
         const val LOCALE = "locale"
         const val DARK_THEME = "dark_theme"
-        const val ETAG_KEY = "ETag"
         const val REPO_ORDER = "repo_order"
         const val SHOW_SYSTEM_APP = "show_system"
+        const val DOWNLOAD_PATH = "download_path"
 
         // system state
         const val MAGISKHIDE = "magiskhide"
@@ -91,9 +97,10 @@ object Config : PreferenceModel, DBConfig {
     }
 
     private val defaultChannel =
-            if (Utils.isCanary) Value.CANARY_DEBUG_CHANNEL
-            else Value.DEFAULT_CHANNEL
+        if (Utils.isCanary) Value.CANARY_DEBUG_CHANNEL
+        else Value.DEFAULT_CHANNEL
 
+    var downloadPath by preference(Key.DOWNLOAD_PATH, Environment.DIRECTORY_DOWNLOADS)
     var repoOrder by preference(Key.REPO_ORDER, Value.ORDER_DATE)
 
     var suDefaultTimeout by preferenceStrInt(Key.SU_REQUEST_TIMEOUT, 10)
@@ -104,73 +111,26 @@ object Config : PreferenceModel, DBConfig {
     var darkTheme by preference(Key.DARK_THEME, true)
     var suReAuth by preference(Key.SU_REAUTH, false)
     var checkUpdate by preference(Key.CHECK_UPDATES, true)
-    @JvmStatic
     var magiskHide by preference(Key.MAGISKHIDE, true)
     var coreOnly by preference(Key.COREONLY, false)
     var showSystemApp by preference(Key.SHOW_SYSTEM_APP, false)
 
     var customChannelUrl by preference(Key.CUSTOM_CHANNEL, "")
     var locale by preference(Key.LOCALE, "")
-    @JvmStatic
-    var etagKey by preference(Key.ETAG_KEY, "")
 
     var rootMode by dbSettings(Key.ROOT_ACCESS, Value.ROOT_ACCESS_APPS_AND_ADB)
     var suMntNamespaceMode by dbSettings(Key.SU_MNT_NS, Value.NAMESPACE_MODE_REQUESTER)
     var suMultiuserMode by dbSettings(Key.SU_MULTIUSER_MODE, Value.MULTIUSER_MODE_OWNER_ONLY)
     var suFingerprint by dbSettings(Key.SU_FINGERPRINT, false)
-    @JvmStatic
-    var suManager by dbStrings(Key.SU_MANAGER, "")
+    var suManager by dbStrings(Key.SU_MANAGER, "", true)
+
+    // Always return a path in external storage where we can write
+    val downloadDirectory get() =
+        Utils.ensureDownloadPath(downloadPath) ?: get<Context>().getExternalFilesDir(null)!!
 
     fun initialize() = prefs.edit {
-        val config = SuFile.open("/data/adb", Const.MANAGER_CONFIGS)
-        if (config.exists()) runCatching {
-            val input = SuFileInputStream(config).buffered()
-            val parser = Xml.newPullParser()
-            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false)
-            parser.setInput(input, "UTF-8")
-            parser.nextTag()
-            parser.require(XmlPullParser.START_TAG, null, "map")
-            while (parser.next() != XmlPullParser.END_TAG) {
-                if (parser.eventType != XmlPullParser.START_TAG)
-                    continue
-                val key: String = parser.getAttributeValue(null, "name")
-                val value: String = parser.getAttributeValue(null, "value")
-                when (parser.name) {
-                    "string" -> {
-                        parser.require(XmlPullParser.START_TAG, null, "string")
-                        putString(key, parser.nextText())
-                        parser.require(XmlPullParser.END_TAG, null, "string")
-                    }
-                    "boolean" -> {
-                        parser.require(XmlPullParser.START_TAG, null, "boolean")
-                        putBoolean(key, value.toBoolean())
-                        parser.nextTag()
-                        parser.require(XmlPullParser.END_TAG, null, "boolean")
-                    }
-                    "int" -> {
-                        parser.require(XmlPullParser.START_TAG, null, "int")
-                        putInt(key, value.toInt())
-                        parser.nextTag()
-                        parser.require(XmlPullParser.END_TAG, null, "int")
-                    }
-                    "long" -> {
-                        parser.require(XmlPullParser.START_TAG, null, "long")
-                        putLong(key, value.toLong())
-                        parser.nextTag()
-                        parser.require(XmlPullParser.END_TAG, null, "long")
-                    }
-                    "float" -> {
-                        parser.require(XmlPullParser.START_TAG, null, "int")
-                        putFloat(key, value.toFloat())
-                        parser.nextTag()
-                        parser.require(XmlPullParser.END_TAG, null, "int")
-                    }
-                    else -> parser.next()
-                }
-            }
-            config.delete()
-        }
-        remove(Key.ETAG_KEY)
+        parsePrefs(this)
+
         if (!prefs.contains(Key.UPDATE_CHANNEL))
             putString(Key.UPDATE_CHANNEL, defaultChannel.toString())
 
@@ -184,12 +144,64 @@ object Config : PreferenceModel, DBConfig {
         putBoolean(Key.SU_FINGERPRINT, FingerprintHelper.useFingerprint())
     }
 
-    @JvmStatic
+    private fun parsePrefs(editor: SharedPreferences.Editor) = editor.apply {
+        val config = SuFile.open("/data/adb", Const.MANAGER_CONFIGS)
+        if (config.exists()) runCatching {
+            val input = SuFileInputStream(config).buffered()
+            val parser = Xml.newPullParser()
+            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false)
+            parser.setInput(input, "UTF-8")
+            parser.nextTag()
+            parser.require(XmlPullParser.START_TAG, null, "map")
+            while (parser.next() != XmlPullParser.END_TAG) {
+                if (parser.eventType != XmlPullParser.START_TAG)
+                    continue
+                val key: String = parser.getAttributeValue(null, "name")
+                fun value() = parser.getAttributeValue(null, "value")!!
+                when (parser.name) {
+                    "string" -> {
+                        parser.require(XmlPullParser.START_TAG, null, "string")
+                        putString(key, parser.nextText())
+                        parser.require(XmlPullParser.END_TAG, null, "string")
+                    }
+                    "boolean" -> {
+                        parser.require(XmlPullParser.START_TAG, null, "boolean")
+                        putBoolean(key, value().toBoolean())
+                        parser.nextTag()
+                        parser.require(XmlPullParser.END_TAG, null, "boolean")
+                    }
+                    "int" -> {
+                        parser.require(XmlPullParser.START_TAG, null, "int")
+                        putInt(key, value().toInt())
+                        parser.nextTag()
+                        parser.require(XmlPullParser.END_TAG, null, "int")
+                    }
+                    "long" -> {
+                        parser.require(XmlPullParser.START_TAG, null, "long")
+                        putLong(key, value().toLong())
+                        parser.nextTag()
+                        parser.require(XmlPullParser.END_TAG, null, "long")
+                    }
+                    "float" -> {
+                        parser.require(XmlPullParser.START_TAG, null, "int")
+                        putFloat(key, value().toFloat())
+                        parser.nextTag()
+                        parser.require(XmlPullParser.END_TAG, null, "int")
+                    }
+                    else -> parser.next()
+                }
+            }
+            config.delete()
+        }
+    }
+
     fun export() {
         // Flush prefs to disk
-        prefs.edit().apply()
-        val xml = File("${get<Context>(Protected).filesDir.parent}/shared_prefs",
-                "${packageName}_preferences.xml")
+        prefs.edit().commit()
+        val xml = File(
+            "${get<Context>(Protected).filesDir.parent}/shared_prefs",
+            "${packageName}_preferences.xml"
+        )
         Shell.su("cat $xml > /data/adb/${Const.MANAGER_CONFIGS}").exec()
     }
 

app/src/main/java/com/topjohnwu/magisk/Const.kt

@@ -1,39 +1,27 @@
 package com.topjohnwu.magisk
 
-import android.os.Environment
 import android.os.Process
-
 import java.io.File
 
 object Const {
 
-    const val DEBUG_TAG = "MagiskManager"
-
     // Paths
     const val MAGISK_PATH = "/sbin/.magisk/img"
-    @JvmField
-    val EXTERNAL_PATH = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)!!
-    @JvmField
     var MAGISK_DISABLE_FILE = File("xxx")
     const val TMP_FOLDER_PATH = "/dev/tmp"
     const val MAGISK_LOG = "/cache/magisk.log"
 
     // Versions
-    const val SNET_EXT_VER = 12
-    const val SNET_REVISION = "b66b1a914978e5f4c4bbfd74a59f4ad371bac107"
+    const val SNET_EXT_VER = 13
+    const val SNET_REVISION = "5adbc435ce93ded953c30ebe587edfd50b5503bc"
     const val BOOTCTL_REVISION = "9c5dfc1b8245c0b5b524901ef0ff0f8335757b77"
 
     // Misc
     const val ANDROID_MANIFEST = "AndroidManifest.xml"
     const val MAGISK_INSTALL_LOG_FILENAME = "magisk_install_log_%s.log"
     const val MANAGER_CONFIGS = ".tmp.magisk.config"
-    @JvmField
     val USER_ID = Process.myUid() / 100000
 
-    init {
-        EXTERNAL_PATH.mkdirs()
-    }
-
     object MagiskVersion {
         const val MIN_SUPPORT = 18000
     }
@@ -53,35 +41,28 @@ object Const {
     }
 
     object Url {
-        @Deprecated("This shouldn't be used. There's literally no need for it")
-        const val REPO_URL =
-            "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&sort=pushed&page=%d"
-        const val FILE_URL = "https://raw.githubusercontent.com/Magisk-Modules-Repo/%s/master/%s"
         const val ZIP_URL = "https://github.com/Magisk-Modules-Repo/%s/archive/master.zip"
-        const val MODULE_INSTALLER =
-            "https://raw.githubusercontent.com/topjohnwu/Magisk/master/scripts/module_installer.sh"
         const val PAYPAL_URL = "https://www.paypal.me/topjohnwu"
         const val PATREON_URL = "https://www.patreon.com/topjohnwu"
         const val TWITTER_URL = "https://twitter.com/topjohnwu"
         const val XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382"
         const val SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk"
-        @JvmField
-        val BOOTCTL_URL = getRaw("9c5dfc1b8245c0b5b524901ef0ff0f8335757b77", "bootctl")
-        const val GITHUB_RAW_API_URL = "https://raw.githubusercontent.com/"
 
-        private fun getRaw(where: String, name: String) =
-            "${GITHUB_RAW_API_URL}topjohnwu/magisk_files/$where/$name"
+        const val GITHUB_RAW_URL = "https://raw.githubusercontent.com/"
+        const val GITHUB_API_URL = "https://api.github.com/users/Magisk-Modules-Repo/"
     }
 
     object Key {
         // others
         const val LINK_KEY = "Link"
         const val IF_NONE_MATCH = "If-None-Match"
+        const val ETAG_KEY = "ETag"
         // intents
         const val OPEN_SECTION = "section"
-        const val INTENT_SET_NAME = "filename"
-        const val INTENT_SET_LINK = "link"
+        const val INTENT_SET_APP = "app_json"
         const val FLASH_ACTION = "action"
+        const val FLASH_DATA = "additional_data"
+        const val DISMISS_ID = "dismiss_id"
         const val BROADCAST_MANAGER_UPDATE = "manager_update"
         const val BROADCAST_REBOOT = "reboot"
     }
@@ -94,5 +75,4 @@ object Const {
         const val UNINSTALL = "uninstall"
     }
 
-
 }

app/src/main/java/com/topjohnwu/magisk/Info.java

@@ -1,30 +0,0 @@
-package com.topjohnwu.magisk;
-
-import androidx.annotation.NonNull;
-
-import com.topjohnwu.magisk.model.entity.UpdateInfo;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-
-public final class Info {
-
-    public static int magiskVersionCode = -1;
-
-    @NonNull
-    public static String magiskVersionString = "";
-
-    public static UpdateInfo remote = new UpdateInfo();
-
-    public static boolean keepVerity = false;
-    public static boolean keepEnc = false;
-    public static boolean recovery = false;
-
-    public static void loadMagiskInfo() {
-        try {
-            magiskVersionString = ShellUtils.fastCmd("magisk -v").split(":")[0];
-            magiskVersionCode = Integer.parseInt(ShellUtils.fastCmd("magisk -V"));
-            Config.setMagiskHide(Shell.su("magiskhide --status").exec().isSuccess());
-        } catch (NumberFormatException ignored) {
-        }
-    }
-}

app/src/main/java/com/topjohnwu/magisk/Info.kt

@@ -0,0 +1,26 @@
+package com.topjohnwu.magisk
+
+import com.topjohnwu.magisk.model.entity.UpdateInfo
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.ShellUtils
+
+object Info {
+
+    var magiskVersionCode = -1
+
+    var magiskVersionString = ""
+
+    var remote = UpdateInfo()
+
+    var keepVerity = false
+    var keepEnc = false
+    var recovery = false
+
+    fun loadMagiskInfo() {
+        runCatching {
+            magiskVersionString = ShellUtils.fastCmd("magisk -v").split(":".toRegex())[0]
+            magiskVersionCode = ShellUtils.fastCmd("magisk -V").toInt()
+            Config.magiskHide = Shell.su("magiskhide --status").exec().isSuccess
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/data/database/PolicyDao.kt

@@ -4,10 +4,10 @@ import android.content.Context
 import android.content.pm.PackageManager
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.data.database.base.*
+import com.topjohnwu.magisk.extensions.now
 import com.topjohnwu.magisk.model.entity.MagiskPolicy
 import com.topjohnwu.magisk.model.entity.toMap
 import com.topjohnwu.magisk.model.entity.toPolicy
-import com.topjohnwu.magisk.utils.now
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 
@@ -62,20 +62,14 @@ class PolicyDao(
 
 
     private fun Map<String, String>.toPolicySafe(): MagiskPolicy? {
-        val taskResult = runCatching { toPolicy(context.packageManager) }
-        val result = taskResult.getOrNull()
-        val exception = taskResult.exceptionOrNull()
-
-        Timber.e(exception)
-
-        when (exception) {
-            is PackageManager.NameNotFoundException -> {
+        return runCatching { toPolicy(context.packageManager) }.getOrElse {
+            Timber.e(it)
+            if (it is PackageManager.NameNotFoundException) {
                 val uid = getOrElse("uid") { null } ?: return null
                 delete(uid).subscribe()
             }
+            null
         }
-
-        return result
     }
 
 }

app/src/main/java/com/topjohnwu/magisk/data/database/RepoDao.kt

@@ -0,0 +1,72 @@
+package com.topjohnwu.magisk.data.database
+
+import androidx.room.*
+import com.topjohnwu.magisk.Config
+import com.topjohnwu.magisk.model.entity.module.Repo
+
+@Dao
+abstract class RepoDao {
+
+    val repoIDList get() = getRepoID().map { it.id }
+
+    val repos: List<Repo> get() = when (Config.repoOrder) {
+            Config.Value.ORDER_NAME -> getReposNameOrder()
+            else -> getReposDateOrder()
+        }
+
+    var etagKey: String
+        set(etag) = addEtagRaw(RepoEtag(0, etag))
+        get() = etagRaw()?.key.orEmpty()
+
+    fun clear() {
+        clearRepos()
+        clearEtag()
+    }
+
+    @Query("SELECT * FROM repos ORDER BY last_update DESC")
+    protected abstract fun getReposDateOrder(): List<Repo>
+
+    @Query("SELECT * FROM repos ORDER BY name COLLATE NOCASE")
+    protected abstract fun getReposNameOrder(): List<Repo>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun addRepo(repo: Repo)
+
+    @Query("SELECT * FROM repos WHERE id = :id")
+    abstract fun getRepo(id: String): Repo?
+
+    @Query("SELECT id FROM repos")
+    protected abstract fun getRepoID(): List<RepoID>
+
+    @Delete
+    abstract fun removeRepo(repo: Repo)
+
+    @Query("DELETE FROM repos WHERE id = :id")
+    abstract fun removeRepo(id: String)
+
+    @Query("DELETE FROM repos WHERE id IN (:idList)")
+    abstract fun removeRepos(idList: Collection<String>)
+
+    @Query("SELECT * FROM etag")
+    protected abstract fun etagRaw(): RepoEtag?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    protected abstract fun addEtagRaw(etag: RepoEtag)
+
+    @Query("DELETE FROM repos")
+    protected abstract fun clearRepos()
+
+    @Query("DELETE FROM etag")
+    protected abstract fun clearEtag()
+}
+
+data class RepoID(
+    @PrimaryKey val id: String
+)
+
+@Entity(tableName = "etag")
+data class RepoEtag(
+    @PrimaryKey val id: Int,
+    val key: String
+)
+

app/src/main/java/com/topjohnwu/magisk/data/database/RepoDatabase.kt

@@ -0,0 +1,11 @@
+package com.topjohnwu.magisk.data.database
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import com.topjohnwu.magisk.model.entity.module.Repo
+
+@Database(version = 6, entities = [Repo::class, RepoEtag::class])
+abstract class RepoDatabase : RoomDatabase() {
+
+    abstract fun repoDao() : RepoDao
+}

app/src/main/java/com/topjohnwu/magisk/data/database/RepoDatabaseHelper.kt

@@ -1,109 +0,0 @@
-package com.topjohnwu.magisk.data.database
-
-import android.content.Context
-import android.database.Cursor
-import android.database.sqlite.SQLiteDatabase
-import android.database.sqlite.SQLiteOpenHelper
-import androidx.core.content.edit
-import com.topjohnwu.magisk.Config
-import com.topjohnwu.magisk.model.entity.Repo
-import java.util.*
-
-@Deprecated("")
-class RepoDatabaseHelper
-constructor(context: Context) : SQLiteOpenHelper(context, "repo.db", null, DATABASE_VER) {
-
-    private val mDb: SQLiteDatabase = writableDatabase
-
-    val rawCursor: Cursor
-        @Deprecated("")
-        get() = mDb.query(TABLE_NAME, null, null, null, null, null, null)
-
-    val repoCursor: Cursor
-        @Deprecated("")
-        get() {
-            var orderBy: String? = null
-            when (Config.repoOrder) {
-                Config.Value.ORDER_NAME -> orderBy = "name COLLATE NOCASE"
-                Config.Value.ORDER_DATE -> orderBy = "last_update DESC"
-            }
-            return mDb.query(TABLE_NAME, null, null, null, null, null, orderBy)
-        }
-
-    val repoIDSet: Set<String>
-        @Deprecated("")
-        get() {
-            val set = HashSet<String>(300)
-            mDb.query(TABLE_NAME, null, null, null, null, null, null).use { c ->
-                while (c.moveToNext()) {
-                    set.add(c.getString(c.getColumnIndex("id")))
-                }
-            }
-            return set
-        }
-
-    override fun onCreate(db: SQLiteDatabase) {
-        onUpgrade(db, 0, DATABASE_VER)
-    }
-
-    override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
-        if (oldVersion != newVersion) {
-            // Nuke old DB and create new table
-            db.execSQL("DROP TABLE IF EXISTS $TABLE_NAME")
-            db.execSQL(
-                    "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " " +
-                            "(id TEXT, name TEXT, version TEXT, versionCode INT, " +
-                            "author TEXT, description TEXT, last_update INT, PRIMARY KEY(id))")
-            Config.prefs.edit {
-                remove(Config.Key.ETAG_KEY)
-            }
-        }
-    }
-
-    override fun onDowngrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
-        onUpgrade(db, 0, DATABASE_VER)
-    }
-
-    @Deprecated("")
-    fun clearRepo() {
-        mDb.delete(TABLE_NAME, null, null)
-    }
-
-
-    @Deprecated("")
-    fun removeRepo(id: String) {
-        mDb.delete(TABLE_NAME, "id=?", arrayOf(id))
-    }
-
-    @Deprecated("")
-    fun removeRepo(repo: Repo) {
-        removeRepo(repo.id)
-    }
-
-    @Deprecated("")
-    fun removeRepo(list: Iterable<String>) {
-        list.forEach {
-            mDb.delete(TABLE_NAME, "id=?", arrayOf(it))
-        }
-    }
-
-    @Deprecated("")
-    fun addRepo(repo: Repo) {
-        mDb.replace(TABLE_NAME, null, repo.contentValues)
-    }
-
-    @Deprecated("")
-    fun getRepo(id: String): Repo? {
-        mDb.query(TABLE_NAME, null, "id=?", arrayOf(id), null, null, null).use { c ->
-            if (c.moveToNext()) {
-                return Repo(c)
-            }
-        }
-        return null
-    }
-
-    companion object {
-        private val DATABASE_VER = 5
-        private val TABLE_NAME = "repos"
-    }
-}

app/src/main/java/com/topjohnwu/magisk/data/network/GithubServices.kt

@@ -2,15 +2,14 @@ package com.topjohnwu.magisk.data.network
 
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.model.entity.UpdateInfo
+import com.topjohnwu.magisk.tasks.GithubRepoInfo
+import io.reactivex.Flowable
 import io.reactivex.Single
 import okhttp3.ResponseBody
-import retrofit2.http.GET
-import retrofit2.http.Path
-import retrofit2.http.Streaming
-import retrofit2.http.Url
+import retrofit2.adapter.rxjava2.Result
+import retrofit2.http.*
 
-
-interface GithubRawApiServices {
+interface GithubRawServices {
 
     //region topjohnwu/magisk_files
 
@@ -29,7 +28,7 @@ interface GithubRawApiServices {
     @GET
     fun fetchCustomUpdate(@Url url: String): Single<UpdateInfo>
 
-    @GET("$MAGISK_FILES/{$REVISION}/snet.apk")
+    @GET("$MAGISK_FILES/{$REVISION}/snet.jar")
     @Streaming
     fun fetchSafetynet(@Path(REVISION) revision: String = Const.SNET_REVISION): Single<ResponseBody>
 
@@ -37,6 +36,13 @@ interface GithubRawApiServices {
     @Streaming
     fun fetchBootctl(@Path(REVISION) revision: String = Const.BOOTCTL_REVISION): Single<ResponseBody>
 
+    @GET("$MAGISK_MASTER/scripts/module_installer.sh")
+    @Streaming
+    fun fetchInstaller(): Single<ResponseBody>
+
+    @GET("$MAGISK_MODULES/{$MODULE}/master/{$FILE}")
+    fun fetchModuleInfo(@Path(MODULE) id: String, @Path(FILE) file: String): Single<String>
+
     //endregion
 
     /**
@@ -47,6 +53,9 @@ interface GithubRawApiServices {
     @Streaming
     fun fetchFile(@Url url: String): Single<ResponseBody>
 
+    @GET
+    fun fetchString(@Url url: String): Single<String>
+
 
     companion object {
         private const val REVISION = "revision"
@@ -59,4 +68,14 @@ interface GithubRawApiServices {
         private const val MAGISK_MODULES = "Magisk-Modules-Repo"
     }
 
+}
+
+interface GithubApiServices {
+
+    @GET("repos")
+    fun fetchRepos(@Query("page") page: Int,
+                   @Header(Const.Key.IF_NONE_MATCH) etag: String,
+                   @Query("sort") sort: String = "pushed",
+                   @Query("per_page") count: Int = 100): Flowable<Result<List<GithubRepoInfo>>>
+
 }

app/src/main/java/com/topjohnwu/magisk/data/repository/AppRepository.kt

@@ -1,15 +0,0 @@
-package com.topjohnwu.magisk.data.repository
-
-import com.topjohnwu.magisk.data.database.PolicyDao
-import com.topjohnwu.magisk.model.entity.MagiskPolicy
-
-class AppRepository(private val policyDao: PolicyDao) {
-
-    fun deleteOutdated() = policyDao.deleteOutdated()
-    fun delete(packageName: String) = policyDao.delete(packageName)
-    fun delete(uid: Int) = policyDao.delete(uid)
-    fun fetch(uid: Int) = policyDao.fetch(uid)
-    fun fetchAll() = policyDao.fetchAll()
-    fun update(policy: MagiskPolicy) = policyDao.update(policy)
-
-}

app/src/main/java/com/topjohnwu/magisk/data/repository/DBConfig.kt

@@ -2,7 +2,6 @@ package com.topjohnwu.magisk.data.repository
 
 import com.topjohnwu.magisk.data.database.SettingsDao
 import com.topjohnwu.magisk.data.database.StringDao
-import com.topjohnwu.magisk.utils.trimEmptyToNull
 import io.reactivex.schedulers.Schedulers
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
@@ -23,8 +22,9 @@ interface DBConfig {
 
     fun dbStrings(
         name: String,
-        default: String
-    ) = DBStringsValue(name, default)
+        default: String,
+        sync: Boolean = false
+    ) = DBStringsValue(name, default, sync)
 
 }
 
@@ -35,12 +35,10 @@ class DBSettingsValue(
 
     private var value: Int? = null
 
-    private fun getKey(property: KProperty<*>) = name.trimEmptyToNull() ?: property.name
-
     @Synchronized
     override fun getValue(thisRef: DBConfig, property: KProperty<*>): Int {
         if (value == null)
-            value = thisRef.settingsDao.fetch(getKey(property), default).blockingGet()
+            value = thisRef.settingsDao.fetch(name, default).blockingGet()
         return value!!
     }
 
@@ -48,7 +46,7 @@ class DBSettingsValue(
         synchronized(this) {
             this.value = value
         }
-        thisRef.settingsDao.put(getKey(property), value)
+        thisRef.settingsDao.put(name, value)
                 .subscribeOn(Schedulers.io())
                 .subscribe()
     }
@@ -70,17 +68,16 @@ class DBBoolSettings(
 
 class DBStringsValue(
         private val name: String,
-        private val default: String
+        private val default: String,
+        private val sync: Boolean
 ) : ReadWriteProperty<DBConfig, String> {
 
     private var value: String? = null
 
-    private fun getKey(property: KProperty<*>) = name.trimEmptyToNull() ?: property.name
-
     @Synchronized
     override fun getValue(thisRef: DBConfig, property: KProperty<*>): String {
         if (value == null)
-            value = thisRef.stringDao.fetch(getKey(property), default).blockingGet()
+            value = thisRef.stringDao.fetch(name, default).blockingGet()
         return value!!
     }
 
@@ -88,8 +85,22 @@ class DBStringsValue(
         synchronized(this) {
             this.value = value
         }
-        thisRef.stringDao.put(getKey(property), value)
-                .subscribeOn(Schedulers.io())
-                .subscribe()
+        if (value.isEmpty()) {
+            if (sync) {
+                thisRef.stringDao.delete(name).blockingAwait()
+            } else {
+                thisRef.stringDao.delete(name)
+                        .subscribeOn(Schedulers.io())
+                        .subscribe()
+            }
+        } else {
+            if (sync) {
+                thisRef.stringDao.put(name, value).blockingAwait()
+            } else {
+                thisRef.stringDao.put(name, value)
+                        .subscribeOn(Schedulers.io())
+                        .subscribe()
+            }
+        }
     }
 }

app/src/main/java/com/topjohnwu/magisk/data/repository/LogRepository.kt

@@ -3,9 +3,9 @@ package com.topjohnwu.magisk.data.repository
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.data.database.LogDao
 import com.topjohnwu.magisk.data.database.base.suRaw
+import com.topjohnwu.magisk.extensions.toSingle
 import com.topjohnwu.magisk.model.entity.MagiskLog
 import com.topjohnwu.magisk.model.entity.WrappedMagiskLog
-import com.topjohnwu.magisk.utils.toSingle
 import com.topjohnwu.superuser.Shell
 import java.util.concurrent.TimeUnit
 

app/src/main/java/com/topjohnwu/magisk/data/repository/MagiskRepository.kt

@@ -1,46 +1,25 @@
 package com.topjohnwu.magisk.data.repository
 
-import android.content.Context
 import android.content.pm.PackageManager
-import com.topjohnwu.magisk.App
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.Info
 import com.topjohnwu.magisk.data.database.base.su
-import com.topjohnwu.magisk.data.network.GithubRawApiServices
+import com.topjohnwu.magisk.data.network.GithubRawServices
+import com.topjohnwu.magisk.extensions.getLabel
+import com.topjohnwu.magisk.extensions.packageName
+import com.topjohnwu.magisk.extensions.toSingle
 import com.topjohnwu.magisk.model.entity.HideAppInfo
 import com.topjohnwu.magisk.model.entity.HideTarget
-import com.topjohnwu.magisk.utils.Utils
-import com.topjohnwu.magisk.utils.inject
-import com.topjohnwu.magisk.utils.toSingle
-import com.topjohnwu.magisk.utils.writeToFile
 import com.topjohnwu.superuser.Shell
 import io.reactivex.Single
 
 class MagiskRepository(
-    private val context: Context,
-    private val apiRaw: GithubRawApiServices,
-    private val packageManager: PackageManager
+        private val apiRaw: GithubRawServices,
+        private val packageManager: PackageManager
 ) {
 
-    fun fetchMagisk() = fetchUpdate()
-        .flatMap { apiRaw.fetchFile(it.magisk.link) }
-        .map { it.writeToFile(context, FILE_MAGISK_ZIP) }
-
-    fun fetchManager() = fetchUpdate()
-        .flatMap { apiRaw.fetchFile(it.app.link) }
-        .map { it.writeToFile(context, FILE_MAGISK_APK) }
-
-    fun fetchUninstaller() = fetchUpdate()
-        .flatMap { apiRaw.fetchFile(it.uninstaller.link) }
-        .map { it.writeToFile(context, FILE_UNINSTALLER_ZIP) }
-
     fun fetchSafetynet() = apiRaw.fetchSafetynet()
 
-    fun fetchBootctl() = apiRaw
-        .fetchBootctl()
-        .map { it.writeToFile(context, FILE_BOOTCTL_SH) }
-
-
     fun fetchUpdate() = when (Config.updateChannel) {
         Config.Value.DEFAULT_CHANNEL, Config.Value.STABLE_CHANNEL -> apiRaw.fetchStableUpdate()
         Config.Value.BETA_CHANNEL -> apiRaw.fetchBetaUpdate()
@@ -57,14 +36,14 @@ class MagiskRepository(
         } else {
             Single.just(it)
         }
-    }.map { Info.remote = it; it }
+    }.doOnSuccess { Info.remote = it }
 
     fun fetchApps() =
         Single.fromCallable { packageManager.getInstalledApplications(0) }
             .flattenAsFlowable { it }
             .filter { it.enabled && !blacklist.contains(it.packageName) }
             .map {
-                val label = Utils.getAppLabel(it, packageManager)
+                val label = it.getLabel(packageManager)
                 val icon = it.loadIcon(packageManager)
                 HideAppInfo(it, label, icon)
             }
@@ -83,14 +62,8 @@ class MagiskRepository(
     private val Boolean.state get() = if (this) "add" else "rm"
 
     companion object {
-        const val FILE_MAGISK_ZIP = "magisk.zip"
-        const val FILE_MAGISK_APK = "magisk.apk"
-        const val FILE_UNINSTALLER_ZIP = "uninstaller.zip"
-        const val FILE_SAFETY_NET_APK = "safetynet.apk"
-        const val FILE_BOOTCTL_SH = "bootctl"
-
-        private val blacklist = listOf(
-            let { val app: App by inject(); app }.packageName,
+        private val blacklist by lazy { listOf(
+            packageName,
             "android",
             "com.android.chrome",
             "com.chrome.beta",
@@ -98,7 +71,7 @@ class MagiskRepository(
             "com.chrome.canary",
             "com.android.webview",
             "com.google.android.webview"
-        )
+        ) }
     }
 
 }

app/src/main/java/com/topjohnwu/magisk/data/repository/StringRepository.kt

@@ -0,0 +1,15 @@
+package com.topjohnwu.magisk.data.repository
+
+import com.topjohnwu.magisk.data.network.GithubRawServices
+import com.topjohnwu.magisk.model.entity.module.Repo
+
+class StringRepository(
+    private val api: GithubRawServices
+) {
+
+    fun getString(url: String) = api.fetchString(url)
+
+    fun getMetadata(repo: Repo) = api.fetchModuleInfo(repo.id, "module.prop")
+
+    fun getReadme(repo: Repo) = api.fetchModuleInfo(repo.id, "README.md")
+}

app/src/main/java/com/topjohnwu/magisk/di/ApplicationModule.kt

@@ -1,18 +1,61 @@
 package com.topjohnwu.magisk.di
 
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.app.Application
 import android.content.Context
+import android.os.Build
+import android.os.Bundle
 import androidx.preference.PreferenceManager
 import com.skoumal.teanity.rxbus.RxBus
-import com.topjohnwu.magisk.App
+import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
+val SUTimeout = named("su_timeout")
+val Protected = named("protected")
 
 val applicationModule = module {
     single { RxBus() }
     factory { get<Context>().resources }
-    factory { get<Context>() as App }
     factory { get<Context>().packageManager }
-    factory(Protected) { get<App>().protectedContext }
+    factory(Protected) { createDEContext(get()) }
     single(SUTimeout) { get<Context>(Protected).getSharedPreferences("su_timeout", 0) }
     single { PreferenceManager.getDefaultSharedPreferences(get<Context>(Protected)) }
-}
+    single { ActivityTracker() }
+    factory { get<ActivityTracker>().foreground ?: NullActivity }
+}
+
+private fun createDEContext(context: Context): Context {
+    return if (Build.VERSION.SDK_INT >= 24)
+        context.createDeviceProtectedStorageContext()
+    else context
+}
+
+class ActivityTracker : Application.ActivityLifecycleCallbacks {
+
+    @Volatile
+    var foreground: Activity? = null
+
+    override fun onActivityCreated(activity: Activity, bundle: Bundle?) {}
+
+    override fun onActivityStarted(activity: Activity) {}
+
+    @Synchronized
+    override fun onActivityResumed(activity: Activity) {
+        foreground = activity
+    }
+
+    @Synchronized
+    override fun onActivityPaused(activity: Activity) {
+        foreground = null
+    }
+
+    override fun onActivityStopped(activity: Activity) {}
+
+    override fun onActivitySaveInstanceState(activity: Activity, bundle: Bundle) {}
+
+    override fun onActivityDestroyed(activity: Activity) {}
+}
+
+@SuppressLint("Registered")
+object NullActivity : Activity()

app/src/main/java/com/topjohnwu/magisk/di/DatabaseModule.kt

@@ -1,7 +1,9 @@
 package com.topjohnwu.magisk.di
 
+import android.content.Context
+import androidx.room.Room
 import com.topjohnwu.magisk.data.database.*
-import com.topjohnwu.magisk.tasks.UpdateRepos
+import com.topjohnwu.magisk.tasks.RepoUpdater
 import org.koin.dsl.module
 
 
@@ -10,6 +12,12 @@ val databaseModule = module {
     single { PolicyDao(get()) }
     single { SettingsDao() }
     single { StringDao() }
-    single { RepoDatabaseHelper(get()) }
-    single { UpdateRepos(get()) }
+    single { createRepoDatabase(get()) }
+    single { get<RepoDatabase>().repoDao() }
+    single { RepoUpdater(get(), get()) }
 }
+
+fun createRepoDatabase(context: Context) =
+        Room.databaseBuilder(context, RepoDatabase::class.java, "repo.db")
+            .fallbackToDestructiveMigration()
+            .build()

app/src/main/java/com/topjohnwu/magisk/di/MiscModule.kt

@@ -1,10 +0,0 @@
-package com.topjohnwu.magisk.di
-
-import org.koin.dsl.module
-
-
-val miscModule = module {
-
-    // define miscs here
-
-}

app/src/main/java/com/topjohnwu/magisk/di/Modules.kt

@@ -5,6 +5,5 @@ val koinModules = listOf(
     networkingModule,
     databaseModule,
     repositoryModule,
-    viewModelModules,
-    miscModule
+    viewModelModules
 )

app/src/main/java/com/topjohnwu/magisk/di/NamedInjection.kt

@@ -1,6 +0,0 @@
-package com.topjohnwu.magisk.di
-
-import org.koin.core.qualifier.named
-
-val SUTimeout = named("su_timeout")
-val Protected = named("protected")

app/src/main/java/com/topjohnwu/magisk/di/NetworkingModule.kt

@@ -4,23 +4,23 @@ import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.Const
-import com.topjohnwu.magisk.data.network.GithubRawApiServices
+import com.topjohnwu.magisk.data.network.GithubApiServices
+import com.topjohnwu.magisk.data.network.GithubRawServices
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.koin.dsl.module
-import retrofit2.CallAdapter
-import retrofit2.Converter
 import retrofit2.Retrofit
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.converter.scalars.ScalarsConverterFactory
 import se.ansman.kotshi.KotshiJsonAdapterFactory
 
 val networkingModule = module {
     single { createOkHttpClient() }
-    single { createConverterFactory() }
-    single { createCallAdapterFactory() }
-    single { createRetrofit(get(), get(), get()) }
-    single { createApiService<GithubRawApiServices>(get(), Const.Url.GITHUB_RAW_API_URL) }
+    single { createMoshiConverterFactory() }
+    single { createRetrofit(get(), get()) }
+    single { createApiService<GithubRawServices>(get(), Const.Url.GITHUB_RAW_URL) }
+    single { createApiService<GithubApiServices>(get(), Const.Url.GITHUB_API_URL) }
 }
 
 fun createOkHttpClient(): OkHttpClient {
@@ -28,7 +28,7 @@ fun createOkHttpClient(): OkHttpClient {
 
     if (BuildConfig.DEBUG) {
         val httpLoggingInterceptor = HttpLoggingInterceptor().apply {
-            level = HttpLoggingInterceptor.Level.BODY
+            level = HttpLoggingInterceptor.Level.HEADERS
         }
         builder.addInterceptor(httpLoggingInterceptor)
     }
@@ -36,34 +36,26 @@ fun createOkHttpClient(): OkHttpClient {
     return builder.build()
 }
 
-fun createConverterFactory(): Converter.Factory {
+fun createMoshiConverterFactory(): MoshiConverterFactory {
     val moshi = Moshi.Builder()
-            .add(JsonAdapterFactory.INSTANCE)
+            .add(KotshiJsonAdapterFactory)
             .build()
     return MoshiConverterFactory.create(moshi)
 }
 
-fun createCallAdapterFactory(): CallAdapter.Factory {
-    return RxJava2CallAdapterFactory.create()
-}
-
 fun createRetrofit(
     okHttpClient: OkHttpClient,
-    converterFactory: Converter.Factory,
-    callAdapterFactory: CallAdapter.Factory
+    converterFactory: MoshiConverterFactory
 ): Retrofit.Builder {
     return Retrofit.Builder()
+        .addConverterFactory(ScalarsConverterFactory.create())
         .addConverterFactory(converterFactory)
-        .addCallAdapterFactory(callAdapterFactory)
+        .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
         .client(okHttpClient)
 }
 
 @KotshiJsonAdapterFactory
-abstract class JsonAdapterFactory : JsonAdapter.Factory {
-    companion object {
-        val INSTANCE: JsonAdapterFactory = KotshiJsonAdapterFactory
-    }
-}
+abstract class JsonAdapterFactory : JsonAdapter.Factory
 
 inline fun <reified T> createApiService(retrofitBuilder: Retrofit.Builder, baseUrl: String): T {
     return retrofitBuilder

app/src/main/java/com/topjohnwu/magisk/di/RepositoryModule.kt

@@ -1,13 +1,13 @@
 package com.topjohnwu.magisk.di
 
-import com.topjohnwu.magisk.data.repository.AppRepository
 import com.topjohnwu.magisk.data.repository.LogRepository
 import com.topjohnwu.magisk.data.repository.MagiskRepository
+import com.topjohnwu.magisk.data.repository.StringRepository
 import org.koin.dsl.module
 
 
 val repositoryModule = module {
-    single { MagiskRepository(get(), get(), get()) }
+    single { MagiskRepository(get(), get()) }
     single { LogRepository(get()) }
-    single { AppRepository(get()) }
+    single { StringRepository(get()) }
 }

app/src/main/java/com/topjohnwu/magisk/di/ViewModelsModule.kt

@@ -20,6 +20,8 @@ val viewModelModules = module {
     viewModel { HideViewModel(get(), get()) }
     viewModel { ModuleViewModel(get(), get(), get()) }
     viewModel { LogViewModel(get(), get()) }
-    viewModel { (action: String, uri: Uri?) -> FlashViewModel(action, uri, get()) }
+    viewModel { (action: String, file: Uri, additional: Uri) ->
+        FlashViewModel(action, file, additional, get())
+    }
     viewModel { SuRequestViewModel(get(), get(), get(SUTimeout), get()) }
 }