diff --git a/app/src/main/java/com/bintianqi/owndroid/InstallAppActivity.kt b/app/src/main/java/com/bintianqi/owndroid/InstallAppActivity.kt
index 9e9a8d8..f1bdef1 100644
--- a/app/src/main/java/com/bintianqi/owndroid/InstallAppActivity.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/InstallAppActivity.kt
@@ -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))
}
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 59b3829..b9d15eb 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -581,6 +581,5 @@
Version name
Version code
- Please update OwnDroid with system installer.
Parsing APK info...
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ea3eab4..f0456df 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -572,6 +572,5 @@
版本名
版本号
- 请使用系统的应用安装器更新OwnDroid。
解析APK信息中...
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 96e2e3a..66e01d6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -588,6 +588,5 @@
Version name
Version code
- Please update OwnDroid with system installer.
Parsing APK info...