Rewrite configs with Kotlin delagate properties

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/Policy.java

@@ -4,10 +4,10 @@ import android.content.ContentValues;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 
-import com.topjohnwu.magisk.utils.Utils;
-
 import androidx.annotation.NonNull;
 
+import com.topjohnwu.magisk.utils.Utils;
+
 
 public class Policy implements Comparable<Policy>{
     public static final int INTERACTIVE = 0;
@@ -27,7 +27,7 @@ public class Policy implements Comparable<Policy>{
         this.uid = uid;
         packageName = pkgs[0];
         info = pm.getApplicationInfo(packageName, 0);
-        appName = Utils.getAppLabel(info, pm);
+        appName = Utils.INSTANCE.getAppLabel(info, pm);
     }
 
     public Policy(ContentValues values, PackageManager pm) throws PackageManager.NameNotFoundException {

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

@@ -54,7 +54,7 @@ public class Repo extends BaseModule {
     }
 
     public void update() throws IllegalRepoException {
-        String[] props = Utils.dlString(getPropUrl()).split("\\n");
+        String[] props = Utils.INSTANCE.dlString(getPropUrl()).split("\\n");
         try {
             parseProps(props);
         } catch (NumberFormatException e) {
@@ -103,7 +103,7 @@ public class Repo extends BaseModule {
     }
 
     public String getDownloadFilename() {
-        return Utils.getLegalFilename(getName() + "-" + getVersion() + ".zip");
+        return Utils.INSTANCE.getLegalFilename(getName() + "-" + getVersion() + ".zip");
     }
 
     public class IllegalRepoException extends Exception {

app/src/main/java/com/topjohnwu/magisk/model/preference/PreferenceModel.kt

@@ -2,6 +2,8 @@ package com.topjohnwu.magisk.model.preference
 
 import android.content.Context
 import android.content.SharedPreferences
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
 
 interface PreferenceModel {
 
@@ -14,6 +16,20 @@ interface PreferenceModel {
     val prefs: SharedPreferences
         get() = context.getSharedPreferences(fileName, Context.MODE_PRIVATE)
 
+    fun preferenceStrInt(
+        name: String,
+        default: Int,
+        writeDefault: Boolean = false,
+        commit: Boolean = commitPrefs
+    ) = object: ReadWriteProperty<PreferenceModel, Int> {
+        val base = StringProperty(name, default.toString(), commit)
+        override fun getValue(thisRef: PreferenceModel, property: KProperty<*>): Int =
+                base.getValue(thisRef, property).toInt()
+
+        override fun setValue(thisRef: PreferenceModel, property: KProperty<*>, value: Int) =
+                base.setValue(thisRef, property, value.toString())
+    }
+
     fun preference(
         name: String,
         default: Boolean,

app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt

@@ -6,6 +6,7 @@ import android.content.Intent
 import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.Info
 import com.topjohnwu.magisk.data.database.base.su
 import com.topjohnwu.magisk.data.repository.AppRepository
 import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
@@ -13,7 +14,6 @@ import com.topjohnwu.magisk.utils.DownloadApp
 import com.topjohnwu.magisk.utils.RootUtils
 import com.topjohnwu.magisk.utils.SuLogger
 import com.topjohnwu.magisk.utils.inject
-import com.topjohnwu.magisk.utils.get
 import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.magisk.view.Shortcuts
 import com.topjohnwu.superuser.Shell
@@ -64,9 +64,8 @@ open class GeneralReceiver : BroadcastReceiver() {
             }
             Intent.ACTION_PACKAGE_REPLACED ->
                 // This will only work pre-O
-                if (Config.get<Boolean>(Config.Key.SU_REAUTH)!!) {
+                if (Config.suReAuth)
                     appRepo.delete(getPkg(intent)).blockingGet()
-                }
             Intent.ACTION_PACKAGE_FULLY_REMOVED -> {
                 val pkg = getPkg(intent)
                 appRepo.delete(pkg).blockingGet()
@@ -74,7 +73,7 @@ open class GeneralReceiver : BroadcastReceiver() {
             }
             Intent.ACTION_LOCALE_CHANGED -> Shortcuts.setup(context)
             Const.Key.BROADCAST_MANAGER_UPDATE -> {
-                Config.managerLink = intent.getStringExtra(Const.Key.INTENT_SET_LINK)
+                Info.managerLink = intent.getStringExtra(Const.Key.INTENT_SET_LINK)
                 DownloadApp.upgrade(intent.getStringExtra(Const.Key.INTENT_SET_NAME))
             }
             Const.Key.BROADCAST_REBOOT -> RootUtils.reboot()

app/src/main/java/com/topjohnwu/magisk/model/update/UpdateCheckService.kt

@@ -2,7 +2,7 @@ package com.topjohnwu.magisk.model.update
 
 import androidx.work.ListenableWorker
 import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.Config
+import com.topjohnwu.magisk.Info
 import com.topjohnwu.magisk.data.repository.MagiskRepository
 import com.topjohnwu.magisk.model.worker.DelegateWorker
 import com.topjohnwu.magisk.utils.inject
@@ -14,10 +14,10 @@ class UpdateCheckService : DelegateWorker() {
 
     override fun doWork(): ListenableWorker.Result {
         return runCatching {
-            magiskRepo.fetchConfig().blockingGet()
-            if (BuildConfig.VERSION_CODE < Config.remoteManagerVersionCode)
+            magiskRepo.fetchUpdate().blockingGet()
+            if (BuildConfig.VERSION_CODE < Info.remoteManagerVersionCode)
                 Notifications.managerUpdate()
-            else if (Config.magiskVersionCode < Config.remoteManagerVersionCode)
+            else if (Info.magiskVersionCode < Info.remoteManagerVersionCode)
                 Notifications.magiskUpdate()
             ListenableWorker.Result.success()
         }.getOrElse {

app/src/main/java/com/topjohnwu/magisk/model/worker/DelegateWorker.java

@@ -4,12 +4,6 @@ import android.content.Context;
 import android.net.Network;
 import android.net.Uri;
 
-import com.google.common.util.concurrent.ListenableFuture;
-
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -17,6 +11,12 @@ import androidx.annotation.RequiresApi;
 import androidx.work.Data;
 import androidx.work.ListenableWorker;
 
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
 public abstract class DelegateWorker {
 
     private ListenableWorker worker;