From a02e4acca0cb541571772ff2740c8026b20b3694 Mon Sep 17 00:00:00 2001
From: BinTianqi <bintianqi512@gmail.com>
Date: Thu, 18 Jul 2024 09:34:01 +0800
Subject: [PATCH] Revert "app installer: reject self-update"

This reverts commit 4ebb9b48f095f9dd94ef8093d5c5d46bf5dda801.
---
 .../com/bintianqi/owndroid/InstallAppActivity.kt | 16 +++++-----------
 app/src/main/res/values-tr/strings.xml           |  1 -
 app/src/main/res/values-zh-rCN/strings.xml       |  1 -
 app/src/main/res/values/strings.xml              |  1 -
 4 files changed, 5 insertions(+), 14 deletions(-)

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 @@
 
     <string name="version_name">Version name</string> <!--TODO-->
     <string name="version_code">Version code</string> <!--TODO-->
-    <string name="update_using_system_installer">Please update OwnDroid with system installer.</string> <!--TODO-->
     <string name="parsing_apk_info" tools:ignore="TypographyEllipsis">Parsing APK info...</string>
 </resources>
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 @@
 
     <string name="version_name">版本名</string>
     <string name="version_code">版本号</string>
-    <string name="update_using_system_installer">请使用系统的应用安装器更新OwnDroid。</string>
     <string name="parsing_apk_info" tools:ignore="TypographyEllipsis">解析APK信息中...</string>
 </resources>
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 @@
 
     <string name="version_name">Version name</string>
     <string name="version_code">Version code</string>
-    <string name="update_using_system_installer">Please update OwnDroid with system installer.</string>
     <string name="parsing_apk_info" tools:ignore="TypographyEllipsis">Parsing APK info...</string>
 </resources>