awfixer/OwnDroid
1
0
Fork 0
mirror of https://github.com/awfixers-stuff/OwnDroid.git synced 2026-03-23 19:15:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "app installer: reject self-update"

Browse Source 
This reverts commit 4ebb9b48f0.
This commit is contained in:
BinTianqi
2024-07-18 09:34:01 +08:00
parent 35aafddc8e
commit a02e4acca0
4 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/bintianqi/owndroid/InstallAppActivity.kt
View File

@@ -58,34 +58,28 @@ class InstallAppActivity: FragmentActivity() {
)
fd?.close()
withContext(Dispatchers.Main) {
status = "waiting"
apkInfoText = "${context.getString(R.string.package_name)}: ${apkInfo.packageName}\n"
apkInfoText += "${context.getString(R.string.version_name)}: ${apkInfo.versionName}\n"
apkInfoText += "${context.getString(R.string.version_code)}: ${apkInfo.versionCode}"
if(apkInfo.packageName == packageName) {
status = "self_update"
apkInfoText += "\n" + context.getString(R.string.update_using_system_installer)
} else {
status = "waiting"
}
}
}
setContent {
val canExit = status == "waiting" || status == "self_update"
OwnDroidTheme(
sharedPref.getBoolean("material_you", true),
sharedPref.getBoolean("black_theme", false)
) {
AlertDialog(
properties = DialogProperties(dismissOnBackPress = canExit, dismissOnClickOutside = canExit),
properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false),
title = {
Text(stringResource(R.string.install_app))
},
onDismissRequest = {
if(canExit) finish()
if(status != "installing") finish()
},
text = {
Column {
AnimatedVisibility(status != "waiting" && status != "self_update") {
AnimatedVisibility(status != "waiting") {
LinearProgressIndicator(modifier = Modifier.fillMaxWidth())
}
Text(text = apkInfoText, modifier = Modifier.padding(top = 4.dp))
@@ -105,7 +99,7 @@ class InstallAppActivity: FragmentActivity() {
status = "installing"
uriToStream(applicationContext, this.intent.data) { stream -> installPackage(applicationContext, stream) }
},
enabled = status == "waiting"
enabled = status != "installing"
) {
Text(stringResource(R.string.install))
}