Add 7.3.0 changelog

Update wordings to improve readability.

app/build.gradle

@@ -43,6 +43,10 @@ android {
         exclude '/kotlin/**'
         exclude '/kotlinx/**'
     }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 androidExtensions {
@@ -74,12 +78,12 @@ dependencies {
     implementation "org.koin:koin-android:${vKoin}"
     implementation "org.koin:koin-androidx-viewmodel:${vKoin}"
 
-    def vRetrofit = "2.5.0"
+    def vRetrofit = "2.6.0"
     implementation "com.squareup.retrofit2:retrofit:${vRetrofit}"
     implementation "com.squareup.retrofit2:converter-moshi:${vRetrofit}"
     implementation "com.squareup.retrofit2:adapter-rxjava2:${vRetrofit}"
 
-    def vOkHttp = "3.12.0"
+    def vOkHttp = "3.12.3"
     implementation "com.squareup.okhttp3:okhttp:${vOkHttp}"
     implementation "com.squareup.okhttp3:logging-interceptor:${vOkHttp}"
 
@@ -90,13 +94,21 @@ dependencies {
     implementation "se.ansman.kotshi:api:${vKotshi}"
     kapt "se.ansman.kotshi:compiler:${vKotshi}"
 
+    modules {
+        module('androidx.room:room-runtime') {
+            replacedBy('com.github.topjohnwu:room-runtime')
+        }
+    }
+    def vRoom = "2.1.0"
+    implementation "com.github.topjohnwu:room-runtime:${vRoom}"
+
     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-alpha05'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha06'
     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.multidex:multidex:2.0.1'
-    implementation 'com.google.android.material:material:1.1.0-alpha06'
+    implementation 'com.google.android.material:material:1.1.0-alpha07'
 }

app/proguard-rules.pro

@@ -16,9 +16,6 @@
 #   public *;
 #}
 
-# Retrofit classes
--keep,allowobfuscation class com.topjohnwu.magisk.data.network.*
-
 # Snet
 -keepclassmembers class com.topjohnwu.magisk.utils.ISafetyNetHelper { *; }
 -keep,allowobfuscation interface com.topjohnwu.magisk.utils.ISafetyNetHelper$Callback

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

@@ -10,6 +10,9 @@ 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.di.koinModules
 import com.topjohnwu.magisk.utils.LocaleManager
 import com.topjohnwu.magisk.utils.RootUtils
@@ -107,6 +110,12 @@ open class App : Application(), Application.ActivityLifecycleCallbacks {
             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("")

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

@@ -21,7 +21,7 @@ object ClassMap {
     )
 
     @JvmStatic
-    operator fun get(c: Class<*>): Class<*>? {
-        return map.getOrElse(c) { null } //as? Class<T>
+    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

@@ -0,0 +1,196 @@
+package com.topjohnwu.magisk
+
+import android.content.Context
+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.model.preference.PreferenceModel
+import com.topjohnwu.magisk.utils.*
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.io.SuFile
+import com.topjohnwu.superuser.io.SuFileInputStream
+import org.xmlpull.v1.XmlPullParser
+import java.io.File
+
+object Config : PreferenceModel, DBConfig {
+
+    override val stringDao: StringDao by inject()
+    override val settingsDao: SettingsDao by inject()
+    override val context: Context by inject(Protected)
+
+    object Key {
+        // db configs
+        const val ROOT_ACCESS = "root_access"
+        const val SU_MULTIUSER_MODE = "multiuser_mode"
+        const val SU_MNT_NS = "mnt_ns"
+        const val SU_MANAGER = "requester"
+        const val SU_FINGERPRINT = "su_fingerprint"
+
+        // prefs
+        const val SU_REQUEST_TIMEOUT = "su_request_timeout"
+        const val SU_AUTO_RESPONSE = "su_auto_response"
+        const val SU_NOTIFICATION = "su_notification"
+        const val SU_REAUTH = "su_reauth"
+        const val CHECK_UPDATES = "check_update"
+        const val UPDATE_CHANNEL = "update_channel"
+        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"
+
+        // system state
+        const val MAGISKHIDE = "magiskhide"
+        const val COREONLY = "disable"
+    }
+
+    object Value {
+        // Update channels
+        const val DEFAULT_CHANNEL = -1
+        const val STABLE_CHANNEL = 0
+        const val BETA_CHANNEL = 1
+        const val CUSTOM_CHANNEL = 2
+        const val CANARY_CHANNEL = 3
+        const val CANARY_DEBUG_CHANNEL = 4
+
+        // root access mode
+        const val ROOT_ACCESS_DISABLED = 0
+        const val ROOT_ACCESS_APPS_ONLY = 1
+        const val ROOT_ACCESS_ADB_ONLY = 2
+        const val ROOT_ACCESS_APPS_AND_ADB = 3
+
+        // su multiuser
+        const val MULTIUSER_MODE_OWNER_ONLY = 0
+        const val MULTIUSER_MODE_OWNER_MANAGED = 1
+        const val MULTIUSER_MODE_USER = 2
+
+        // su mnt ns
+        const val NAMESPACE_MODE_GLOBAL = 0
+        const val NAMESPACE_MODE_REQUESTER = 1
+        const val NAMESPACE_MODE_ISOLATE = 2
+
+        // su notification
+        const val NO_NOTIFICATION = 0
+        const val NOTIFICATION_TOAST = 1
+
+        // su auto response
+        const val SU_PROMPT = 0
+        const val SU_AUTO_DENY = 1
+        const val SU_AUTO_ALLOW = 2
+
+        // su timeout
+        val TIMEOUT_LIST = intArrayOf(0, -1, 10, 20, 30, 60)
+
+        // repo order
+        const val ORDER_NAME = 0
+        const val ORDER_DATE = 1
+    }
+
+    private val defaultChannel =
+            if (Utils.isCanary) Value.CANARY_DEBUG_CHANNEL
+            else Value.DEFAULT_CHANNEL
+
+    var repoOrder by preference(Key.REPO_ORDER, Value.ORDER_DATE)
+
+    var suDefaultTimeout by preferenceStrInt(Key.SU_REQUEST_TIMEOUT, 10)
+    var suAutoReponse by preferenceStrInt(Key.SU_AUTO_RESPONSE, Value.SU_PROMPT)
+    var suNotification by preferenceStrInt(Key.SU_NOTIFICATION, Value.NOTIFICATION_TOAST)
+    var updateChannel by preferenceStrInt(Key.UPDATE_CHANNEL, defaultChannel)
+
+    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, "")
+
+    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)
+        if (!prefs.contains(Key.UPDATE_CHANNEL))
+            putString(Key.UPDATE_CHANNEL, defaultChannel.toString())
+
+        // Get actual state
+        putBoolean(Key.COREONLY, Const.MAGISK_DISABLE_FILE.exists())
+
+        // Write database configs
+        putString(Key.ROOT_ACCESS, rootMode.toString())
+        putString(Key.SU_MNT_NS, suMntNamespaceMode.toString())
+        putString(Key.SU_MULTIUSER_MODE, suMultiuserMode.toString())
+        putBoolean(Key.SU_FINGERPRINT, FingerprintHelper.useFingerprint())
+    }
+
+    @JvmStatic
+    fun export() {
+        // Flush prefs to disk
+        prefs.edit().apply()
+        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/ConfigLeanback.kt

@@ -1,52 +0,0 @@
-package com.topjohnwu.magisk
-
-import android.content.Context
-import android.content.SharedPreferences
-import androidx.annotation.AnyThread
-import androidx.annotation.WorkerThread
-import com.skoumal.teanity.extensions.subscribeK
-import com.topjohnwu.magisk.data.repository.SettingRepository
-import com.topjohnwu.magisk.data.repository.StringRepository
-import com.topjohnwu.magisk.di.Protected
-import com.topjohnwu.magisk.utils.inject
-
-object ConfigLeanback {
-
-    @JvmStatic
-    val protectedContext: Context by inject(Protected)
-    @JvmStatic
-    val prefs: SharedPreferences by inject()
-
-    private val settingRepo: SettingRepository by inject()
-    private val stringRepo: StringRepository by inject()
-
-    @JvmStatic
-    @AnyThread
-    fun put(key: String, value: Int) {
-        settingRepo.put(key, value).subscribeK()
-    }
-
-    @JvmStatic
-    @WorkerThread
-    fun get(key: String, defaultValue: Int): Int =
-        settingRepo.fetch(key, defaultValue).blockingGet()
-
-    @JvmStatic
-    @AnyThread
-    fun put(key: String, value: String?) {
-        val task = value?.let { stringRepo.put(key, it) } ?: stringRepo.delete(key)
-        task.subscribeK()
-    }
-
-    @JvmStatic
-    @WorkerThread
-    fun get(key: String, defaultValue: String?): String =
-        stringRepo.fetch(key, defaultValue.orEmpty()).blockingGet()
-
-    @JvmStatic
-    @AnyThread
-    fun delete(key: String) {
-        settingRepo.delete(key).subscribeK()
-    }
-
-}

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

@@ -9,33 +9,27 @@ object Const {
 
     const val DEBUG_TAG = "MagiskManager"
 
-    // APK content
-    const val ANDROID_MANIFEST = "AndroidManifest.xml"
-
-    const val SU_KEYSTORE_KEY = "su_key"
-
     // Paths
     const val MAGISK_PATH = "/sbin/.magisk/img"
     @JvmField
-    val EXTERNAL_PATH: File =
-        Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+    val EXTERNAL_PATH = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)!!
     @JvmField
-    var MAGISK_DISABLE_FILE: File = File("xxx")
-
+    var MAGISK_DISABLE_FILE = File("xxx")
     const val TMP_FOLDER_PATH = "/dev/tmp"
     const val MAGISK_LOG = "/cache/magisk.log"
-    const val MANAGER_CONFIGS = ".tmp.magisk.config"
 
     // Versions
-    const val UPDATE_SERVICE_VER = 1
     const val SNET_EXT_VER = 12
+    const val SNET_REVISION = "b66b1a914978e5f4c4bbfd74a59f4ad371bac107"
+    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
 
-    // Generic
-    const val MAGISK_INSTALL_LOG_FILENAME = "magisk_install_log_%s.log"
-
     init {
         EXTERNAL_PATH.mkdirs()
     }
@@ -72,12 +66,11 @@ object Const {
         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 SNET_URL = getRaw("b66b1a914978e5f4c4bbfd74a59f4ad371bac107", "snet.apk")
-        @JvmField
         val BOOTCTL_URL = getRaw("9c5dfc1b8245c0b5b524901ef0ff0f8335757b77", "bootctl")
+        const val GITHUB_RAW_API_URL = "https://raw.githubusercontent.com/"
 
         private fun getRaw(where: String, name: String) =
-            "https://raw.githubusercontent.com/topjohnwu/magisk_files/%s/%s".format(where, name)
+            "${GITHUB_RAW_API_URL}topjohnwu/magisk_files/$where/$name"
     }
 
     object Key {

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

@@ -1,20 +0,0 @@
-package com.topjohnwu.magisk
-
-import android.os.Process
-
-object Constants {
-
-    // Paths
-    val MAGISK_PATH = "/sbin/.magisk/img"
-    val MAGISK_LOG = "/cache/magisk.log"
-
-    val USER_ID get() = Process.myUid() / 100000
-
-    const val SNET_REVISION = "b66b1a914978e5f4c4bbfd74a59f4ad371bac107"
-    const val BOOTCTL_REVISION = "9c5dfc1b8245c0b5b524901ef0ff0f8335757b77"
-
-    const val GITHUB_URL = "https://github.com/"
-    const val GITHUB_API_URL = "https://api.github.com/"
-    const val GITHUB_RAW_API_URL = "https://raw.githubusercontent.com/"
-
-}

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

@@ -0,0 +1,36 @@
+package com.topjohnwu.magisk;
+
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+
+public final class Info {
+
+    public static int magiskVersionCode = -1;
+    // Current status
+    public static String magiskVersionString = "";
+    // Update Info
+    public static String remoteMagiskVersionString = "";
+    public static int remoteMagiskVersionCode = -1;
+    public static String magiskLink = "";
+    public static String magiskNoteLink = "";
+    public static String magiskMD5 = "";
+    public static String remoteManagerVersionString = "";
+    public static int remoteManagerVersionCode = -1;
+    public static String managerLink = "";
+    public static String managerNoteLink = "";
+    public static String uninstallerLink = "";
+
+    // Install flags
+    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/KConfig.kt

@@ -1,47 +0,0 @@
-package com.topjohnwu.magisk
-
-import android.content.Context
-import com.topjohnwu.magisk.KConfig.UpdateChannel.STABLE
-import com.topjohnwu.magisk.di.Protected
-import com.topjohnwu.magisk.model.preference.PreferenceModel
-import com.topjohnwu.magisk.utils.inject
-
-object KConfig : PreferenceModel() {
-
-    override val context: Context by inject(Protected)
-    override val fileName: String = "${context.packageName}_preferences"
-
-    private var internalUpdateChannel by preference(Config.Key.UPDATE_CHANNEL, STABLE.id.toString())
-    var useCustomTabs by preference("useCustomTabs", true)
-    @JvmStatic
-    var customUpdateChannel by preference(Config.Key.CUSTOM_CHANNEL, "")
-
-    @JvmStatic
-    var updateChannel: UpdateChannel
-        get() = UpdateChannel.byId(internalUpdateChannel.toIntOrNull() ?: STABLE.id)
-        set(value) {
-            internalUpdateChannel = value.id.toString()
-        }
-
-    internal const val DEFAULT_CHANNEL = "topjohnwu/magisk_files"
-
-    enum class UpdateChannel(val id: Int) {
-
-        STABLE(Config.Value.STABLE_CHANNEL),
-        BETA(Config.Value.BETA_CHANNEL),
-        CANARY(Config.Value.CANARY_CHANNEL),
-        CANARY_DEBUG(Config.Value.CANARY_DEBUG_CHANNEL),
-        CUSTOM(Config.Value.CUSTOM_CHANNEL);
-
-        companion object {
-            fun byId(id: Int) = when (id) {
-                Config.Value.STABLE_CHANNEL -> STABLE
-                Config.Value.BETA_CHANNEL -> BETA
-                Config.Value.CUSTOM_CHANNEL -> CUSTOM
-                Config.Value.CANARY_CHANNEL -> CANARY
-                Config.Value.CANARY_DEBUG_CHANNEL -> CANARY_DEBUG
-                else -> STABLE
-            }
-        }
-    }
-}

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

@@ -1,6 +1,5 @@
 package com.topjohnwu.magisk.data.database
 
-import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.data.database.base.*
 import com.topjohnwu.magisk.model.entity.MagiskLog
 import com.topjohnwu.magisk.model.entity.toLog
@@ -12,7 +11,7 @@ class LogDao : BaseDao() {
     override val table = DatabaseDefinition.Table.LOG
 
     fun deleteOutdated(
-        suTimeout: Long = Config.suLogTimeout * TimeUnit.DAYS.toMillis(1)
+        suTimeout: Long = TimeUnit.DAYS.toMillis(14)
     ) = query<Delete> {
         condition {
             lessThan("time", suTimeout.toString())

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

@@ -2,7 +2,7 @@ package com.topjohnwu.magisk.data.database
 
 import android.content.Context
 import android.content.pm.PackageManager
-import com.topjohnwu.magisk.Constants
+import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.data.database.base.*
 import com.topjohnwu.magisk.model.entity.MagiskPolicy
 import com.topjohnwu.magisk.model.entity.toMap
@@ -60,7 +60,7 @@ class PolicyDao(
 
     fun fetchAll() = query<Select> {
         condition {
-            equals("uid/100000", Constants.USER_ID)
+            equals("uid/100000", Const.USER_ID)
         }
     }.flattenAsFlowable { it }
         .map { it.toPolicy(context.packageManager) }

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

@@ -1,118 +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 com.topjohnwu.magisk.Config;
-import com.topjohnwu.magisk.model.entity.Repo;
-
-import java.util.HashSet;
-import java.util.Set;
-
-@Deprecated
-public class RepoDatabaseHelper extends SQLiteOpenHelper {
-
-    private static final int DATABASE_VER = 5;
-    private static final String TABLE_NAME = "repos";
-
-    private final SQLiteDatabase mDb;
-
-    @Deprecated
-    public RepoDatabaseHelper(Context context) {
-        super(context, "repo.db", null, DATABASE_VER);
-        mDb = getWritableDatabase();
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        onUpgrade(db, 0, DATABASE_VER);
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        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.remove(Config.Key.ETAG_KEY);
-        }
-    }
-
-    @Override
-    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        onUpgrade(db, 0, DATABASE_VER);
-    }
-
-    @Deprecated
-    public void clearRepo() {
-        mDb.delete(TABLE_NAME, null, null);
-    }
-
-
-    @Deprecated
-    public void removeRepo(String id) {
-        mDb.delete(TABLE_NAME, "id=?", new String[]{id});
-    }
-
-    @Deprecated
-    public void removeRepo(Repo repo) {
-        removeRepo(repo.getId());
-    }
-
-    @Deprecated
-    public void removeRepo(Iterable<String> list) {
-        for (String id : list) {
-            if (id == null) continue;
-            mDb.delete(TABLE_NAME, "id=?", new String[]{id});
-        }
-    }
-
-    @Deprecated
-    public void addRepo(Repo repo) {
-        mDb.replace(TABLE_NAME, null, repo.getContentValues());
-    }
-
-    @Deprecated
-    public Repo getRepo(String id) {
-        try (Cursor c = mDb.query(TABLE_NAME, null, "id=?", new String[]{id}, null, null, null)) {
-            if (c.moveToNext()) {
-                return new Repo(c);
-            }
-        }
-        return null;
-    }
-
-    @Deprecated
-    public Cursor getRawCursor() {
-        return mDb.query(TABLE_NAME, null, null, null, null, null, null);
-    }
-
-    @Deprecated
-    public Cursor getRepoCursor() {
-        String orderBy = null;
-        switch ((int) Config.get(Config.Key.REPO_ORDER)) {
-            case Config.Value.ORDER_NAME:
-                orderBy = "name COLLATE NOCASE";
-                break;
-            case Config.Value.ORDER_DATE:
-                orderBy = "last_update DESC";
-        }
-        return mDb.query(TABLE_NAME, null, null, null, null, null, orderBy);
-    }
-
-    @Deprecated
-    public Set<String> getRepoIDSet() {
-        HashSet<String> set = new HashSet<>(300);
-        try (Cursor c = mDb.query(TABLE_NAME, null, null, null, null, null, null)) {
-            while (c.moveToNext()) {
-                set.add(c.getString(c.getColumnIndex("id")));
-            }
-        }
-        return set;
-    }
-}

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

@@ -0,0 +1,109 @@
+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/database/SettingsDao.kt

@@ -10,11 +10,12 @@ class SettingsDao : BaseDao() {
         condition { equals("key", key) }
     }.ignoreElement()
 
-    fun put(key: String, value: Int) = query<Insert> {
-        values(key to value.toString())
+    fun put(key: String, value: Int) = query<Replace> {
+        values("key" to key, "value" to value)
     }.ignoreElement()
 
     fun fetch(key: String, default: Int = -1) = query<Select> {
+        fields("value")
         condition { equals("key", key) }
     }.map { it.firstOrNull()?.values?.firstOrNull()?.toIntOrNull() ?: default }
 

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

@@ -10,8 +10,8 @@ class StringDao : BaseDao() {
         condition { equals("key", key) }
     }.ignoreElement()
 
-    fun put(key: String, value: String) = query<Insert> {
-        values(key to value)
+    fun put(key: String, value: String) = query<Replace> {
+        values("key" to key, "value" to value)
     }.ignoreElement()
 
     fun fetch(key: String, default: String = "") = query<Select> {

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

@@ -32,11 +32,7 @@ class Delete : MagiskQueryBuilder {
     }
 
     override fun toString(): String {
-        return StringBuilder()
-            .appendln(requestType)
-            .appendln(table)
-            .appendln(condition)
-            .toString()
+        return listOf(requestType, table, condition).joinToString(" ")
     }
 }
 
@@ -65,13 +61,7 @@ class Select : MagiskQueryBuilder {
     }
 
     override fun toString(): String {
-        return StringBuilder()
-            .appendln(requestType)
-            .appendln(table)
-            .appendln(condition)
-            .appendln(orderField)
-            .toString()
-            .replace("\n", " ")
+        return listOf(requestType, table, condition, orderField).joinToString(" ")
     }
 }
 
@@ -84,23 +74,25 @@ open class Insert : MagiskQueryBuilder {
     override lateinit var table: String
 
     private val keys get() = _values.keys.joinToString(",")
-    private val values get() = _values.values.joinToString(",") { "\"$it\"" }
-    private var _values: Map<String, String> = mapOf()
+    private val values get() = _values.values.joinToString(",") {
+        when (it) {
+            is Boolean -> if (it) "1" else "0"
+            is Number -> it.toString()
+            else -> "\"$it\""
+        }
+    }
+    private var _values: Map<String, Any> = mapOf()
 
-    fun values(vararg pairs: Pair<String, String>) {
+    fun values(vararg pairs: Pair<String, Any>) {
         _values = pairs.toMap()
     }
 
-    fun values(values: Map<String, String>) {
+    fun values(values: Map<String, Any>) {
         _values = values
     }
 
     override fun toString(): String {
-        return StringBuilder()
-            .appendln(requestType)
-            .appendln(table)
-            .appendln("($keys) VALUES($values)")
-            .toString()
+        return listOf(requestType, table, "($keys) VALUES($values)").joinToString(" ")
     }
 }
 

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

@@ -1,7 +1,6 @@
 package com.topjohnwu.magisk.data.network
 
-import com.topjohnwu.magisk.Constants
-import com.topjohnwu.magisk.KConfig
+import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.model.entity.MagiskConfig
 import io.reactivex.Single
 import okhttp3.ResponseBody
@@ -16,27 +15,27 @@ interface GithubRawApiServices {
     //region topjohnwu/magisk_files
 
     @GET("$MAGISK_FILES/master/stable.json")
-    fun fetchConfig(): Single<MagiskConfig>
+    fun fetchStableUpdate(): Single<MagiskConfig>
 
     @GET("$MAGISK_FILES/master/beta.json")
-    fun fetchBetaConfig(): Single<MagiskConfig>
+    fun fetchBetaUpdate(): Single<MagiskConfig>
 
     @GET("$MAGISK_FILES/master/canary_builds/release.json")
-    fun fetchCanaryConfig(): Single<MagiskConfig>
+    fun fetchCanaryUpdate(): Single<MagiskConfig>
 
     @GET("$MAGISK_FILES/master/canary_builds/canary.json")
-    fun fetchCanaryDebugConfig(): Single<MagiskConfig>
+    fun fetchCanaryDebugUpdate(): Single<MagiskConfig>
 
     @GET
-    fun fetchCustomConfig(@Url url: String): Single<MagiskConfig>
+    fun fetchCustomUpdate(@Url url: String): Single<MagiskConfig>
 
     @GET("$MAGISK_FILES/{$REVISION}/snet.apk")
     @Streaming
-    fun fetchSafetynet(@Path(REVISION) revision: String = Constants.SNET_REVISION): Single<ResponseBody>
+    fun fetchSafetynet(@Path(REVISION) revision: String = Const.SNET_REVISION): Single<ResponseBody>
 
     @GET("$MAGISK_FILES/{$REVISION}/bootctl")
     @Streaming
-    fun fetchBootctl(@Path(REVISION) revision: String = Constants.BOOTCTL_REVISION): Single<ResponseBody>
+    fun fetchBootctl(@Path(REVISION) revision: String = Const.BOOTCTL_REVISION): Single<ResponseBody>
 
     //endregion
 
@@ -55,7 +54,7 @@ interface GithubRawApiServices {
         private const val FILE = "file"
 
 
-        private const val MAGISK_FILES = KConfig.DEFAULT_CHANNEL
+        private const val MAGISK_FILES = "topjohnwu/magisk_files"
         private const val MAGISK_MASTER = "topjohnwu/Magisk/master"
         private const val MAGISK_MODULES = "Magisk-Modules-Repo"
     }

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

@@ -0,0 +1,95 @@
+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
+
+interface DBConfig {
+    val settingsDao: SettingsDao
+    val stringDao: StringDao
+
+    fun dbSettings(
+        name: String,
+        default: Int
+    ) = DBSettingsValue(name, default)
+
+    fun dbSettings(
+        name: String,
+        default: Boolean
+    ) = DBBoolSettings(name, default)
+
+    fun dbStrings(
+        name: String,
+        default: String
+    ) = DBStringsValue(name, default)
+
+}
+
+class DBSettingsValue(
+        private val name: String,
+        private val default: Int
+) : ReadWriteProperty<DBConfig, Int> {
+
+    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()
+        return value!!
+    }
+
+    override fun setValue(thisRef: DBConfig, property: KProperty<*>, value: Int) {
+        synchronized(this) {
+            this.value = value
+        }
+        thisRef.settingsDao.put(getKey(property), value)
+                .subscribeOn(Schedulers.io())
+                .subscribe()
+    }
+}
+
+class DBBoolSettings(
+        name: String,
+        default: Boolean
+) : ReadWriteProperty<DBConfig, Boolean> {
+
+    val base = DBSettingsValue(name, if (default) 1 else 0)
+
+    override fun getValue(thisRef: DBConfig, property: KProperty<*>): Boolean
+            = base.getValue(thisRef, property) != 0
+
+    override fun setValue(thisRef: DBConfig, property: KProperty<*>, value: Boolean) =
+            base.setValue(thisRef, property, if (value) 1 else 0)
+}
+
+class DBStringsValue(
+        private val name: String,
+        private val default: String
+) : 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()
+        return value!!
+    }
+
+    override fun setValue(thisRef: DBConfig, property: KProperty<*>, value: String) {
+        synchronized(this) {
+            this.value = value
+        }
+        thisRef.stringDao.put(getKey(property), value)
+                .subscribeOn(Schedulers.io())
+                .subscribe()
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.topjohnwu.magisk.data.repository
 
 import com.topjohnwu.magisk.Const
-import com.topjohnwu.magisk.Constants
 import com.topjohnwu.magisk.data.database.LogDao
 import com.topjohnwu.magisk.data.database.base.suRaw
 import com.topjohnwu.magisk.model.entity.MagiskLog
@@ -20,7 +19,7 @@ class LogRepository(
         .map { it.sortByDescending { it.date.time }; it }
         .map { it.wrap() }
 
-    fun fetchMagiskLogs() = "tail -n 5000 ${Constants.MAGISK_LOG}".suRaw()
+    fun fetchMagiskLogs() = "tail -n 5000 ${Const.MAGISK_LOG}".suRaw()
         .filter { it.isNotEmpty() }
         .map { Timber.i(it.toString()); it }
 

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

@@ -4,20 +4,17 @@ import android.content.Context
 import android.content.pm.PackageManager
 import com.topjohnwu.magisk.App
 import com.topjohnwu.magisk.Config
-import com.topjohnwu.magisk.KConfig
+import com.topjohnwu.magisk.Info
 import com.topjohnwu.magisk.data.database.base.su
-import com.topjohnwu.magisk.data.database.base.suRaw
 import com.topjohnwu.magisk.data.network.GithubRawApiServices
 import com.topjohnwu.magisk.model.entity.HideAppInfo
 import com.topjohnwu.magisk.model.entity.HideTarget
-import com.topjohnwu.magisk.model.entity.Version
 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
-import io.reactivex.functions.BiFunction
 
 class MagiskRepository(
     private val context: Context,
@@ -25,55 +22,55 @@ class MagiskRepository(
     private val packageManager: PackageManager
 ) {
 
-    fun fetchMagisk() = fetchConfig()
+    fun fetchMagisk() = fetchUpdate()
         .flatMap { apiRaw.fetchFile(it.magisk.link) }
         .map { it.writeToFile(context, FILE_MAGISK_ZIP) }
 
-    fun fetchManager() = fetchConfig()
+    fun fetchManager() = fetchUpdate()
         .flatMap { apiRaw.fetchFile(it.app.link) }
         .map { it.writeToFile(context, FILE_MAGISK_APK) }
 
-    fun fetchUninstaller() = fetchConfig()
+    fun fetchUninstaller() = fetchUpdate()
         .flatMap { apiRaw.fetchFile(it.uninstaller.link) }
         .map { it.writeToFile(context, FILE_UNINSTALLER_ZIP) }
 
-    fun fetchSafetynet() = apiRaw
-        .fetchSafetynet()
-        .map { it.writeToFile(context, FILE_SAFETY_NET_APK) }
+    fun fetchSafetynet() = apiRaw.fetchSafetynet()
 
     fun fetchBootctl() = apiRaw
         .fetchBootctl()
         .map { it.writeToFile(context, FILE_BOOTCTL_SH) }
 
 
-    fun fetchConfig() = when (KConfig.updateChannel) {
-        KConfig.UpdateChannel.STABLE -> apiRaw.fetchConfig()
-        KConfig.UpdateChannel.BETA -> apiRaw.fetchBetaConfig()
-        KConfig.UpdateChannel.CANARY -> apiRaw.fetchCanaryConfig()
-        KConfig.UpdateChannel.CANARY_DEBUG -> apiRaw.fetchCanaryDebugConfig()
-        KConfig.UpdateChannel.CUSTOM -> apiRaw.fetchCustomConfig(KConfig.customUpdateChannel)
-    }
-    .doOnSuccess {
-        Config.remoteMagiskVersionCode = it.magisk.versionCode.toIntOrNull() ?: -1
-        Config.magiskLink = it.magisk.link
-        Config.magiskNoteLink = it.magisk.note
-        Config.magiskMD5 = it.magisk.hash
-        Config.remoteManagerVersionCode = it.app.versionCode.toIntOrNull() ?: -1
-        Config.remoteManagerVersionString = it.app.version
-        Config.managerLink = it.app.link
-        Config.managerNoteLink = it.app.note
-        Config.uninstallerLink = it.uninstaller.link
-    }
-
-
-    fun fetchMagiskVersion(): Single<Version> = Single.zip(
-        fetchMagiskVersionName(),
-        fetchMagiskVersionCode(),
-        BiFunction { versionName, versionCode ->
-            Version(versionName, versionCode)
+    fun fetchUpdate() = when (Config.updateChannel) {
+        Config.Value.DEFAULT_CHANNEL, Config.Value.STABLE_CHANNEL -> apiRaw.fetchStableUpdate()
+        Config.Value.BETA_CHANNEL -> apiRaw.fetchBetaUpdate()
+        Config.Value.CANARY_CHANNEL -> apiRaw.fetchCanaryUpdate()
+        Config.Value.CANARY_DEBUG_CHANNEL -> apiRaw.fetchCanaryDebugUpdate()
+        Config.Value.CUSTOM_CHANNEL -> apiRaw.fetchCustomUpdate(Config.customChannelUrl)
+        else -> throw IllegalArgumentException()
+    }.flatMap {
+        // If remote version is lower than current installed, try switching to beta
+        if (it.magisk.versionCode.toIntOrNull() ?: -1 < Info.magiskVersionCode
+                && Config.updateChannel == Config.Value.DEFAULT_CHANNEL) {
+            Config.updateChannel = Config.Value.BETA_CHANNEL
+            apiRaw.fetchBetaUpdate()
+        } else {
+            Single.just(it)
         }
-    )
+    }.doOnSuccess {
+        Info.remoteMagiskVersionString = it.magisk.version
+        Info.remoteMagiskVersionCode = it.magisk.versionCode.toIntOrNull() ?: -1
+        Info.magiskLink = it.magisk.link
+        Info.magiskNoteLink = it.magisk.note
+        Info.magiskMD5 = it.magisk.hash
 
+        Info.remoteManagerVersionString = it.app.version
+        Info.remoteManagerVersionCode = it.app.versionCode.toIntOrNull() ?: -1
+        Info.managerLink = it.app.link
+        Info.managerNoteLink = it.app.note
+
+        Info.uninstallerLink = it.uninstaller.link
+    }
 
     fun fetchApps() =
         Single.fromCallable { packageManager.getInstalledApplications(0) }
@@ -93,16 +90,6 @@ class MagiskRepository(
         .map { HideTarget(it) }
         .toList()
 
-    private fun fetchMagiskVersionName() = "magisk -v".suRaw()
-        .map { it.first() }
-        .map { it.substring(0 until it.indexOf(":")) }
-        .onErrorReturn { "Unknown" }
-
-    private fun fetchMagiskVersionCode() = "magisk -V".suRaw()
-        .map { it.first() }
-        .map { it.toIntOrNull() ?: -1 }
-        .onErrorReturn { -1 }
-
     fun toggleHide(isEnabled: Boolean, packageName: String, process: String) =
         "magiskhide --%s %s %s".format(isEnabled.state, packageName, process).su().ignoreElement()
 

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

@@ -1,11 +0,0 @@
-package com.topjohnwu.magisk.data.repository
-
-import com.topjohnwu.magisk.data.database.SettingsDao
-
-class SettingRepository(private val settingsDao: SettingsDao) {
-
-    fun fetch(key: String, default: Int) = settingsDao.fetch(key, default)
-    fun put(key: String, value: Int) = settingsDao.put(key, value)
-    fun delete(key: String) = settingsDao.delete(key)
-
-}

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

@@ -1,11 +0,0 @@
-package com.topjohnwu.magisk.data.repository
-
-import com.topjohnwu.magisk.data.database.StringDao
-
-class StringRepository(private val stringDao: StringDao) {
-
-    fun fetch(key: String, default: String) = stringDao.fetch(key, default)
-    fun put(key: String, value: String) = stringDao.put(key, value)
-    fun delete(key: String) = stringDao.delete(key)
-
-}

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

@@ -2,7 +2,8 @@ package com.topjohnwu.magisk.di
 
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
-import com.topjohnwu.magisk.Constants
+import com.topjohnwu.magisk.BuildConfig
+import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.data.network.GithubRawApiServices
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
@@ -19,17 +20,20 @@ val networkingModule = module {
     single { createConverterFactory() }
     single { createCallAdapterFactory() }
     single { createRetrofit(get(), get(), get()) }
-    single { createApiService<GithubRawApiServices>(get(), Constants.GITHUB_RAW_API_URL) }
+    single { createApiService<GithubRawApiServices>(get(), Const.Url.GITHUB_RAW_API_URL) }
 }
 
 fun createOkHttpClient(): OkHttpClient {
-    val httpLoggingInterceptor = HttpLoggingInterceptor().apply {
-        level = HttpLoggingInterceptor.Level.BODY
+    val builder = OkHttpClient.Builder()
+
+    if (BuildConfig.DEBUG) {
+        val httpLoggingInterceptor = HttpLoggingInterceptor().apply {
+            level = HttpLoggingInterceptor.Level.BODY
+        }
+        builder.addInterceptor(httpLoggingInterceptor)
     }
 
-    return OkHttpClient.Builder()
-        .addInterceptor(httpLoggingInterceptor)
-        .build()
+    return builder.build()
 }
 
 fun createConverterFactory(): Converter.Factory {

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

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

app/src/main/java/com/topjohnwu/magisk/model/binding/BindingAdapter.kt

@@ -0,0 +1,37 @@
+package com.topjohnwu.magisk.model.binding
+
+import androidx.databinding.ViewDataBinding
+import androidx.recyclerview.widget.RecyclerView
+import com.skoumal.teanity.databinding.ComparableRvItem
+import com.topjohnwu.magisk.model.entity.recycler.LenientRvItem
+import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
+
+class BindingAdapter : BindingRecyclerViewAdapter<ComparableRvItem<*>>() {
+
+    private var recyclerView: RecyclerView? = null
+
+    override fun onBindBinding(
+        binding: ViewDataBinding,
+        variableId: Int,
+        layoutRes: Int,
+        position: Int,
+        item: ComparableRvItem<*>
+    ) {
+        super.onBindBinding(binding, variableId, layoutRes, position, item)
+
+        when (item) {
+            is LenientRvItem -> {
+                val recycler = recyclerView ?: return
+                item.onBindingBound(binding)
+                item.onBindingBound(binding, recycler)
+            }
+            else -> item.onBindingBound(binding)
+        }
+    }
+
+    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
+        super.onAttachedToRecyclerView(recyclerView)
+        this.recyclerView = recyclerView
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/model/download/DownloadModuleService.java

@@ -6,6 +6,8 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.IBinder;
 
+import androidx.annotation.Nullable;
+
 import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.ClassMap;
 import com.topjohnwu.magisk.Const;
@@ -29,8 +31,6 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
-import androidx.annotation.Nullable;
-
 public class DownloadModuleService extends Service {
 
     private List<ProgressNotification> notifications;

app/src/main/java/com/topjohnwu/magisk/model/entity/BaseModule.java

@@ -5,10 +5,10 @@ import android.database.Cursor;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import java.util.List;
-
 import androidx.annotation.NonNull;
 
+import java.util.List;
+
 public abstract class BaseModule implements Comparable<BaseModule>, Parcelable {
 
     private String mId, mName, mVersion, mAuthor, mDescription;

app/src/main/java/com/topjohnwu/magisk/model/entity/MagiskLog.kt

@@ -38,7 +38,6 @@ fun Map<String, String>.toLog(): MagiskLog {
 
 fun Long.toDate() = Date(this)
 
-
 fun MagiskLog.toMap() = mapOf(
     "from_uid" to fromUid,
     "to_uid" to toUid,
@@ -47,8 +46,8 @@ fun MagiskLog.toMap() = mapOf(
     "app_name" to appName,
     "command" to command,
     "action" to action,
-    "time" to date
-).mapValues { it.toString() }
+    "time" to date.time
+)
 
 fun MagiskPolicy.toLog(
     toUid: Int,

app/src/main/java/com/topjohnwu/magisk/model/entity/MagiskModule.kt

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull
 import androidx.annotation.WorkerThread
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.topjohnwu.magisk.Constants
+import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.data.database.base.su
 import io.reactivex.Single
 import kotlinx.android.parcel.Parcelize
@@ -48,7 +48,7 @@ data class Module(
 
 @AnyThread
 fun File.toModule(): Single<Module> {
-    val path = "${Constants.MAGISK_PATH}/$name"
+    val path = "${Const.MAGISK_PATH}/$name"
     return "dos2unix < $path/module.prop".su()
         .map { it.first().toModule(path) }
 }

app/src/main/java/com/topjohnwu/magisk/model/entity/MagiskPolicy.kt

@@ -24,42 +24,14 @@ data class MagiskPolicy(
 
 }
 
-/*@Throws(PackageManager.NameNotFoundException::class)
-fun ContentValues.toPolicy(pm: PackageManager): MagiskPolicy {
-    val uid = getAsInteger("uid")
-    val packageName = getAsString("package_name")
-    val info = pm.getApplicationInfo(packageName, 0)
-    if (info.uid != uid)
-        throw PackageManager.NameNotFoundException()
-    return MagiskPolicy(
-        uid = uid,
-        packageName = packageName,
-        policy = getAsInteger("policy"),
-        until = getAsInteger("until").toLong(),
-        logging = getAsInteger("logging") != 0,
-        notification = getAsInteger("notification") != 0,
-        applicationInfo = info,
-        appName = info.loadLabel(pm).toString()
-    )
-}
-fun MagiskPolicy.toContentValues() = ContentValues().apply {
-    put("uid", uid)
-    put("uid", uid)
-    put("package_name", packageName)
-    put("policy", policy)
-    put("until", until)
-    put("logging", if (logging) 1 else 0)
-    put("notification", if (notification) 1 else 0)
-}*/
-
 fun MagiskPolicy.toMap() = mapOf(
     "uid" to uid,
     "package_name" to packageName,
     "policy" to policy,
     "until" to until,
-    "logging" to if (logging) 1 else 0,
-    "notification" to if (notification) 1 else 0
-).mapValues { it.value.toString() }
+    "logging" to logging,
+    "notification" to notification
+)
 
 @Throws(PackageManager.NameNotFoundException::class)
 fun Map<String, String>.toPolicy(pm: PackageManager): MagiskPolicy {