TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-23 17:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
vvb2060 2021-01-23 18:10:26 -08:00 committed by topjohnwu
parent 06773235da
commit dbd13a2019
4 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/topjohnwu/magisk/core/model/UpdateInfo.kt
View File

@ -7,16 +7,10 @@ import kotlinx.parcelize.Parcelize
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
data class UpdateInfo( data class UpdateInfo(
val app: ManagerJson = ManagerJson(), val app: ManagerJson = ManagerJson(),
val uninstaller: UninstallerJson = UninstallerJson(),
val magisk: MagiskJson = MagiskJson(), val magisk: MagiskJson = MagiskJson(),
val stub: StubJson = StubJson() val stub: StubJson = StubJson()
) )
@JsonClass(generateAdapter = true)
data class UninstallerJson(
val link: String = ""
)
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
data class MagiskJson( data class MagiskJson(
val version: String = "", val version: String = "",

2
app/src/main/java/com/topjohnwu/magisk/data/repository/NetworkService.kt
View File

@ -50,13 +50,11 @@ class NetworkService(
fun ManagerJson.updateCopy() = copy(link = genCDNUrl(link), note = genCDNUrl(note)) fun ManagerJson.updateCopy() = copy(link = genCDNUrl(link), note = genCDNUrl(note))
fun MagiskJson.updateCopy() = copy(link = genCDNUrl(link), note = genCDNUrl(note)) fun MagiskJson.updateCopy() = copy(link = genCDNUrl(link), note = genCDNUrl(note))
fun StubJson.updateCopy() = copy(link = genCDNUrl(link)) fun StubJson.updateCopy() = copy(link = genCDNUrl(link))
fun UninstallerJson.updateCopy() = copy(link = genCDNUrl(link))
return info.copy( return info.copy(
app = info.app.updateCopy(), app = info.app.updateCopy(),
magisk = info.magisk.updateCopy(), magisk = info.magisk.updateCopy(),
stub = info.stub.updateCopy(), stub = info.stub.updateCopy(),
uninstaller = info.uninstaller.updateCopy()
) )
} }

5
app/src/main/java/com/topjohnwu/magisk/events/dialog/UninstallDialog.kt
View File

@ -3,7 +3,6 @@ package com.topjohnwu.magisk.events.dialog
import android.app.ProgressDialog import android.app.ProgressDialog
import android.widget.Toast import android.widget.Toast
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.core.Info
import com.topjohnwu.magisk.ui.flash.FlashFragment import com.topjohnwu.magisk.ui.flash.FlashFragment
import com.topjohnwu.magisk.utils.Utils import com.topjohnwu.magisk.utils.Utils
import com.topjohnwu.magisk.view.MagiskDialog import com.topjohnwu.magisk.view.MagiskDialog
@ -18,13 +17,11 @@ class UninstallDialog : DialogEvent() {
titleRes = R.string.restore_img titleRes = R.string.restore_img
onClick { restore() } onClick { restore() }
} }
if (Info.remote.uninstaller.link.isNotEmpty()) { .applyButton(MagiskDialog.ButtonType.NEGATIVE) {
dialog.applyButton(MagiskDialog.ButtonType.NEGATIVE) {
titleRes = R.string.complete_uninstall titleRes = R.string.complete_uninstall
onClick { completeUninstall() } onClick { completeUninstall() }
} }
} }
}
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
private fun restore() { private fun restore() {

2
app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt
View File

@ -45,8 +45,8 @@ import androidx.interpolator.view.animation.FastOutSlowInInterpolator
import androidx.transition.AutoTransition import androidx.transition.AutoTransition
import androidx.transition.TransitionManager import androidx.transition.TransitionManager
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.core.Const
import com.topjohnwu.magisk.core.AssetHack import com.topjohnwu.magisk.core.AssetHack
import com.topjohnwu.magisk.core.Const
import com.topjohnwu.magisk.core.utils.currentLocale import com.topjohnwu.magisk.core.utils.currentLocale
import com.topjohnwu.magisk.utils.DynamicClassLoader import com.topjohnwu.magisk.utils.DynamicClassLoader
import com.topjohnwu.magisk.utils.Utils import com.topjohnwu.magisk.utils.Utils