TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-02 14:35:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Postpone showMainUI when activity has stopped

Browse Source 
Co-authored-by: topjohnwu <topjohnwu@gmail.com>
This commit is contained in:
LoveSy 2023-03-08 13:04:04 +08:00 committed by GitHub
parent e14f7b6908
commit d52ea1b068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ import android.os.Bundle
import android.widget.Toast import android.widget.Toast
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import androidx.databinding.ViewDataBinding import androidx.databinding.ViewDataBinding
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.topjohnwu.magisk.BuildConfig.APPLICATION_ID import com.topjohnwu.magisk.BuildConfig.APPLICATION_ID
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R
@ -29,13 +30,15 @@ import kotlinx.coroutines.launch
abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Binding>() { abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Binding>() {
companion object { companion object {
private var skipSplash = false private var splashShown = false
} }
private var needShowMainUI = false
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
setTheme(Theme.selected.themeRes) setTheme(Theme.selected.themeRes)
if (isRunningAsStub && !skipSplash) { if (isRunningAsStub && !splashShown) {
// Manually apply splash theme for stub // Manually apply splash theme for stub
theme.applyStyle(R.style.StubSplashTheme, true) theme.applyStyle(R.style.StubSplashTheme, true)
} }
@ -44,11 +47,11 @@ abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Bi
if (!isRunningAsStub) { if (!isRunningAsStub) {
val splashScreen = installSplashScreen() val splashScreen = installSplashScreen()
splashScreen.setKeepOnScreenCondition { !skipSplash } splashScreen.setKeepOnScreenCondition { !splashShown }
} }
if (skipSplash) { if (splashShown) {
showMainUI(savedInstanceState) doShowMainUI(savedInstanceState)
} else { } else {
Shell.getShell(Shell.EXECUTOR) { Shell.getShell(Shell.EXECUTOR) {
if (isRunningAsStub && !it.isRoot) { if (isRunningAsStub && !it.isRoot) {
@ -60,6 +63,11 @@ abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Bi
} }
} }
private fun doShowMainUI(savedInstanceState: Bundle?) {
needShowMainUI = false
showMainUI(savedInstanceState)
}
abstract fun showMainUI(savedInstanceState: Bundle?) abstract fun showMainUI(savedInstanceState: Bundle?)
@SuppressLint("InlinedApi") @SuppressLint("InlinedApi")
@ -87,6 +95,13 @@ abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Bi
} }
} }
override fun onResume() {
super.onResume()
if (needShowMainUI) {
doShowMainUI(null)
}
}
private fun preLoad(savedState: Bundle?) { private fun preLoad(savedState: Bundle?) {
val prevPkg = intent.getStringExtra(Const.Key.PREV_PKG)?.let { val prevPkg = intent.getStringExtra(Const.Key.PREV_PKG)?.let {
// Make sure the calling package matches (prevent DoS) // Make sure the calling package matches (prevent DoS)
@ -116,12 +131,16 @@ abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Bi
RootUtils.Connection.await() RootUtils.Connection.await()
runOnUiThread { runOnUiThread {
skipSplash = true splashShown = true
if (isRunningAsStub) { if (isRunningAsStub) {
// Re-launch main activity without splash theme // Re-launch main activity without splash theme
relaunch() relaunch()
} else { } else {
showMainUI(savedState) if (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
doShowMainUI(savedState)
} else {
needShowMainUI = true
}
} }
} }
} }
@ -140,5 +159,4 @@ abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Bi
Shell.cmd("(pm uninstall $pkg)& >/dev/null 2>&1").exec() Shell.cmd("(pm uninstall $pkg)& >/dev/null 2>&1").exec()
} }
} }
} }