TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-08-25 10:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

App migration minor refactoring

Browse Source
This commit is contained in:
topjohnwu
2024-07-11 16:28:56 -07:00
parent fe9ec3bc6d
commit 881d3b5221
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/apk/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
View File

@@ -14,7 +14,7 @@ import com.topjohnwu.magisk.core.base.relaunch
import com.topjohnwu.magisk.core.initializeOnSplashScreen
import com.topjohnwu.magisk.core.isRunningAsStub
import com.topjohnwu.magisk.core.ktx.toast
import com.topjohnwu.magisk.core.tasks.HideAPK
import com.topjohnwu.magisk.core.tasks.AppMigration
import com.topjohnwu.magisk.ui.theme.Theme
import com.topjohnwu.magisk.view.MagiskDialog
import com.topjohnwu.superuser.Shell
@@ -91,7 +91,7 @@ abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Bi
showInvalidStateMessage()
} else {
lifecycleScope.launch {
HideAPK.restore(this@SplashActivity)
AppMigration.restore(this@SplashActivity)
}
}
}

4
app/apk/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
View File

@@ -13,7 +13,7 @@ import com.topjohnwu.magisk.core.Config
import com.topjohnwu.magisk.core.Const
import com.topjohnwu.magisk.core.Info
import com.topjohnwu.magisk.core.ktx.activity
import com.topjohnwu.magisk.core.tasks.HideAPK
import com.topjohnwu.magisk.core.tasks.AppMigration
import com.topjohnwu.magisk.core.utils.LocaleSetting
import com.topjohnwu.magisk.core.utils.MediaStoreUtils
import com.topjohnwu.magisk.databinding.DialogSettingsAppNameBinding
@@ -81,7 +81,7 @@ object Hide : BaseSettingsItem.Input() {
set(value) = set(value, field, { field = it }, BR.result, BR.error)
val maxLength
get() = HideAPK.MAX_LABEL_LENGTH
get() = AppMigration.MAX_LABEL_LENGTH
@get:Bindable
val isError

6
app/apk/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
View File

@@ -19,7 +19,7 @@ import com.topjohnwu.magisk.core.R
import com.topjohnwu.magisk.core.isRunningAsStub
import com.topjohnwu.magisk.core.ktx.activity
import com.topjohnwu.magisk.core.ktx.toast
import com.topjohnwu.magisk.core.tasks.HideAPK
import com.topjohnwu.magisk.core.tasks.AppMigration
import com.topjohnwu.magisk.core.utils.LocaleSetting
import com.topjohnwu.magisk.databinding.bindExtra
import com.topjohnwu.magisk.events.AddHomeIconEvent
@@ -105,8 +105,8 @@ class SettingsViewModel : BaseViewModel(), BaseSettingsItem.Handler {
SystemlessHosts -> createHosts()
DenyListConfig -> SettingsFragmentDirections.actionSettingsFragmentToDenyFragment().navigate()
UpdateChannel -> openUrlIfNecessary(view)
is Hide -> viewModelScope.launch { HideAPK.hide(view.activity, item.value) }
Restore -> viewModelScope.launch { HideAPK.restore(view.activity) }
is Hide -> viewModelScope.launch { AppMigration.hide(view.activity, item.value) }
Restore -> viewModelScope.launch { AppMigration.restore(view.activity) }
Zygisk -> if (Zygisk.mismatch) SnackbarEvent(R.string.reboot_apply_change).publish()
else -> Unit
}