Cleanup UpdateInfo

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

@@ -1,11 +0,0 @@
-package com.topjohnwu.magisk.model.entity
-
-import se.ansman.kotshi.JsonSerializable
-
-@JsonSerializable
-data class MagiskApp(
-    val version: String,
-    val versionCode: String,
-    val link: String,
-    val note: String
-)

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

@@ -1,10 +0,0 @@
-package com.topjohnwu.magisk.model.entity
-
-import se.ansman.kotshi.JsonSerializable
-
-@JsonSerializable
-data class MagiskConfig(
-    val app: MagiskApp,
-    val uninstaller: MagiskLink,
-    val magisk: MagiskFlashable
-)

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

@@ -1,13 +0,0 @@
-package com.topjohnwu.magisk.model.entity
-
-import com.squareup.moshi.Json
-import se.ansman.kotshi.JsonSerializable
-
-@JsonSerializable
-data class MagiskFlashable(
-    val version: String,
-    val versionCode: String,
-    val link: String,
-    val note: String,
-    @Json(name = "md5") val hash: String
-)

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

@@ -1,8 +0,0 @@
-package com.topjohnwu.magisk.model.entity
-
-import se.ansman.kotshi.JsonSerializable
-
-@JsonSerializable
-data class MagiskLink(
-    val link: String
-)

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

@@ -0,0 +1,33 @@
+package com.topjohnwu.magisk.model.entity
+
+import com.squareup.moshi.Json
+import se.ansman.kotshi.JsonSerializable
+
+@JsonSerializable
+data class UpdateInfo(
+    val app: ManagerJson = ManagerJson(),
+    val uninstaller: UninstallerJson = UninstallerJson(),
+    val magisk: MagiskJson = MagiskJson()
+)
+
+@JsonSerializable
+data class UninstallerJson(
+    val link: String = ""
+)
+
+@JsonSerializable
+data class MagiskJson(
+    val version: String = "",
+    val versionCode: Int = -1,
+    val link: String = "",
+    val note: String = "",
+    @Json(name = "md5") val hash: String = ""
+)
+
+@JsonSerializable
+data class ManagerJson(
+    val version: String = "",
+    val versionCode: Int = -1,
+    val link: String = "",
+    val note: String = ""
+)

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

@@ -73,7 +73,8 @@ open class GeneralReceiver : BroadcastReceiver() {
             }
             Intent.ACTION_LOCALE_CHANGED -> Shortcuts.setup(context)
             Const.Key.BROADCAST_MANAGER_UPDATE -> {
-                Info.managerLink = intent.getStringExtra(Const.Key.INTENT_SET_LINK)
+                Info.remote = Info.remote.copy(app = Info.remote.app.copy(
+                        link = intent.getStringExtra(Const.Key.INTENT_SET_LINK) ?: ""))
                 DownloadApp.upgrade(intent.getStringExtra(Const.Key.INTENT_SET_NAME))
             }
             Const.Key.BROADCAST_REBOOT -> reboot()

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

@@ -18,9 +18,9 @@ class UpdateCheckService : DelegateWorker() {
         Shell.getShell()
         return runCatching {
             magiskRepo.fetchUpdate().blockingGet()
-            if (BuildConfig.VERSION_CODE < Info.remoteManagerVersionCode)
+            if (BuildConfig.VERSION_CODE < Info.remote.app.versionCode)
                 Notifications.managerUpdate()
-            else if (Info.magiskVersionCode < Info.remoteMagiskVersionCode)
+            else if (Info.magiskVersionCode < Info.remote.magisk.versionCode)
                 Notifications.magiskUpdate()
             ListenableWorker.Result.success()
         }.getOrElse {