Merge pull request #279 from rainxchzed/android-external-install

rainxchzed · web-flow · commit 5a60d469fe89 · 2026-03-01T16:00:32.000+05:00
diff --git a/core/data/src/androidMain/kotlin/zed/rainxch/core/data/services/AndroidInstaller.kt b/core/data/src/androidMain/kotlin/zed/rainxch/core/data/services/AndroidInstaller.kt
@@ -212,6 +212,29 @@ class AndroidInstaller(
         }
     }
 
+    override fun openWithExternalInstaller(filePath: String) {
+        val file = File(filePath)
+        if (!file.exists()) {
+            throw IllegalStateException("APK file not found: $filePath")
+        }
+
+        Logger.d { "Opening APK with external installer: $filePath" }
+
+        val authority = "${context.packageName}.fileprovider"
+        val fileUri: Uri = FileProvider.getUriForFile(context, authority, file)
+
+        val intent = Intent(Intent.ACTION_VIEW).apply {
+            setDataAndType(fileUri, "application/vnd.android.package-archive")
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+
+        val chooser = Intent.createChooser(intent, null).apply {
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+        context.startActivity(chooser)
+    }
+
     override fun openInAppManager(
         filePath: String,
         onOpenInstaller: () -> Unit
diff --git a/core/data/src/jvmMain/kotlin/zed/rainxch/core/data/services/DesktopInstaller.kt b/core/data/src/jvmMain/kotlin/zed/rainxch/core/data/services/DesktopInstaller.kt
@@ -62,6 +62,10 @@ class DesktopInstaller(
         return false
     }
 
+    override fun openWithExternalInstaller(filePath: String) {
+        // Not applicable on desktop
+    }
+
     override fun isAssetInstallable(assetName: String): Boolean {
         val name = assetName.lowercase()
 
diff --git a/core/domain/src/commonMain/kotlin/zed/rainxch/core/domain/system/Installer.kt b/core/domain/src/commonMain/kotlin/zed/rainxch/core/domain/system/Installer.kt
@@ -30,4 +30,6 @@ interface Installer {
     fun getApkInfoExtractor(): InstallerInfoExtractor
 
     fun openApp(packageName: String): Boolean
+
+    fun openWithExternalInstaller(filePath: String)
 }
diff --git a/core/presentation/src/commonMain/composeResources/values-bn/strings-bn.xml b/core/presentation/src/commonMain/composeResources/values-bn/strings-bn.xml
@@ -209,6 +209,12 @@
     <!-- External tools -->
     <string name="log_prepare_appmanager">AppManager-এর জন্য প্রস্তুত করা হচ্ছে</string>
     <string name="log_opened_appmanager">AppManager-এ খোলা হয়েছে</string>
+    <string name="log_permission_blocked">ডিভাইস নীতি দ্বারা ইনস্টল অনুমতি অবরুদ্ধ</string>
+    <string name="log_opened_external_installer">বাহ্যিক ইনস্টলারে খোলা হয়েছে</string>
+    <string name="install_permission_unavailable">ইনস্টল অনুমতি অনুপলব্ধ</string>
+    <string name="install_permission_blocked_message">APK সফলভাবে ডাউনলোড হয়েছে কিন্তু এই ডিভাইসে সরাসরি ইনস্টল করার অনুমতি নেই। আপনি কি এটি বাহ্যিক ইনস্টলার দিয়ে খুলতে চান?</string>
+    <string name="open_with_external_installer">বাহ্যিক ইনস্টলার দিয়ে খুলুন</string>
+    <string name="external_installer_description">APK ইনস্টল করতে তৃতীয় পক্ষের অ্যাপ ব্যবহার করুন</string>
 
     <!-- Errors -->
     <string name="error_generic">ত্রুটি: %1$s</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-es/strings-es.xml b/core/presentation/src/commonMain/composeResources/values-es/strings-es.xml
@@ -157,6 +157,12 @@
 
     <string name="log_prepare_appmanager">Preparando para AppManager</string>
     <string name="log_opened_appmanager">Abierto en AppManager</string>
+    <string name="log_permission_blocked">Permiso de instalación bloqueado por política del dispositivo</string>
+    <string name="log_opened_external_installer">Abierto en instalador externo</string>
+    <string name="install_permission_unavailable">Permiso de instalación no disponible</string>
+    <string name="install_permission_blocked_message">El APK se descargó correctamente pero este dispositivo no permite la instalación directa. ¿Desea abrirlo con un instalador externo?</string>
+    <string name="open_with_external_installer">Abrir con instalador externo</string>
+    <string name="external_installer_description">Usar una aplicación de terceros para instalar el APK</string>
 
     <string name="error_generic">Error: %1$s</string>
     <string name="error_asset_not_supported">Tipo de archivo .%1$s no compatible</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-fr/strings-fr.xml b/core/presentation/src/commonMain/composeResources/values-fr/strings-fr.xml
@@ -157,6 +157,12 @@
 
     <string name="log_prepare_appmanager">Préparation pour AppManager</string>
     <string name="log_opened_appmanager">Ouvert dans AppManager</string>
+    <string name="log_permission_blocked">Permission d\'installation bloquée par la politique de l\'appareil</string>
+    <string name="log_opened_external_installer">Ouvert dans l\'installateur externe</string>
+    <string name="install_permission_unavailable">Permission d\'installation indisponible</string>
+    <string name="install_permission_blocked_message">L\'APK a été téléchargé avec succès mais cet appareil n\'autorise pas l\'installation directe. Voulez-vous l\'ouvrir avec un installateur externe ?</string>
+    <string name="open_with_external_installer">Ouvrir avec un installateur externe</string>
+    <string name="external_installer_description">Utiliser une application tierce pour installer l\'APK</string>
 
     <string name="error_generic">Erreur : %1$s</string>
     <string name="error_asset_not_supported">Type de fichier .%1$s non pris en charge</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-hi/strings-hi.xml b/core/presentation/src/commonMain/composeResources/values-hi/strings-hi.xml
@@ -209,6 +209,12 @@
     <!-- External tools -->
     <string name="log_prepare_appmanager">ऐपमैनेजर के लिए तैयारी कर रहा है</string>
     <string name="log_opened_appmanager">ऐप मैनेजर में खोला गया</string>
+    <string name="log_permission_blocked">डिवाइस नीति द्वारा इंस्टॉल अनुमति अवरुद्ध</string>
+    <string name="log_opened_external_installer">बाहरी इंस्टॉलर में खोला गया</string>
+    <string name="install_permission_unavailable">इंस्टॉल अनुमति उपलब्ध नहीं</string>
+    <string name="install_permission_blocked_message">APK सफलतापूर्वक डाउनलोड हो गया लेकिन यह डिवाइस सीधे इंस्टॉल करने की अनुमति नहीं देता। क्या आप इसे बाहरी इंस्टॉलर से खोलना चाहेंगे?</string>
+    <string name="open_with_external_installer">बाहरी इंस्टॉलर से खोलें</string>
+    <string name="external_installer_description">APK इंस्टॉल करने के लिए तृतीय-पक्ष ऐप का उपयोग करें</string>
 
     <!-- Errors -->
     <string name="error_generic">गलती: %1$s</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-it/strings-it.xml b/core/presentation/src/commonMain/composeResources/values-it/strings-it.xml
@@ -209,6 +209,12 @@
     <!-- External tools -->
     <string name="log_prepare_appmanager">Preparazione dell'AppManager</string>
     <string name="log_opened_appmanager">Aperto nell'AppManager</string>
+    <string name="log_permission_blocked">Permesso di installazione bloccato dalla policy del dispositivo</string>
+    <string name="log_opened_external_installer">Aperto nell\'installatore esterno</string>
+    <string name="install_permission_unavailable">Permesso di installazione non disponibile</string>
+    <string name="install_permission_blocked_message">L\'APK è stato scaricato con successo ma questo dispositivo non consente l\'installazione diretta. Vuoi aprirlo con un installatore esterno?</string>
+    <string name="open_with_external_installer">Apri con installatore esterno</string>
+    <string name="external_installer_description">Usa un\'app di terze parti per installare l\'APK</string>
 
     <!-- Errors -->
     <string name="error_generic">Errore: %1$s</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-ja/strings-ja.xml b/core/presentation/src/commonMain/composeResources/values-ja/strings-ja.xml
@@ -157,6 +157,12 @@
 
     <string name="log_prepare_appmanager">AppManager 用に準備中</string>
     <string name="log_opened_appmanager">AppManager で開きました</string>
+    <string name="log_permission_blocked">デバイスポリシーによりインストール権限がブロックされました</string>
+    <string name="log_opened_external_installer">外部インストーラーで開きました</string>
+    <string name="install_permission_unavailable">インストール権限が利用できません</string>
+    <string name="install_permission_blocked_message">APKは正常にダウンロードされましたが、このデバイスでは直接インストールが許可されていません。外部インストーラーで開きますか？</string>
+    <string name="open_with_external_installer">外部インストーラーで開く</string>
+    <string name="external_installer_description">サードパーティアプリを使用してAPKをインストール</string>
 
     <string name="error_generic">エラー: %1$s</string>
     <string name="error_asset_not_supported">ファイル形式 .%1$s は未対応です</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-ko/strings-ko.xml b/core/presentation/src/commonMain/composeResources/values-ko/strings-ko.xml
@@ -207,6 +207,12 @@
     <!-- External tools -->
     <string name="log_prepare_appmanager">AppManager 준비 중</string>
     <string name="log_opened_appmanager">AppManager에서 열림</string>
+    <string name="log_permission_blocked">기기 정책에 의해 설치 권한이 차단됨</string>
+    <string name="log_opened_external_installer">외부 설치 프로그램에서 열림</string>
+    <string name="install_permission_unavailable">설치 권한을 사용할 수 없음</string>
+    <string name="install_permission_blocked_message">APK가 성공적으로 다운로드되었지만 이 기기에서는 직접 설치가 허용되지 않습니다. 외부 설치 프로그램으로 열까요?</string>
+    <string name="open_with_external_installer">외부 설치 프로그램으로 열기</string>
+    <string name="external_installer_description">타사 앱을 사용하여 APK 설치</string>
 
     <!-- Errors -->
     <string name="error_generic">오류: %1$s</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-pl/strings-pl.xml b/core/presentation/src/commonMain/composeResources/values-pl/strings-pl.xml
@@ -174,6 +174,12 @@
 
     <string name="log_prepare_appmanager">Przygotowywanie dla AppManager</string>
     <string name="log_opened_appmanager">Otwarto w AppManager</string>
+    <string name="log_permission_blocked">Uprawnienie do instalacji zablokowane przez politykę urządzenia</string>
+    <string name="log_opened_external_installer">Otwarto w zewnętrznym instalatorze</string>
+    <string name="install_permission_unavailable">Uprawnienie do instalacji niedostępne</string>
+    <string name="install_permission_blocked_message">APK został pomyślnie pobrany, ale to urządzenie nie pozwala na bezpośrednią instalację. Czy chcesz otworzyć go za pomocą zewnętrznego instalatora?</string>
+    <string name="open_with_external_installer">Otwórz za pomocą zewnętrznego instalatora</string>
+    <string name="external_installer_description">Użyj aplikacji innej firmy do zainstalowania APK</string>
 
     <string name="error_generic">Błąd: %1$s</string>
     <string name="error_asset_not_supported">Typ pliku .%1$s nie jest obsługiwany</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-ru/strings-ru.xml b/core/presentation/src/commonMain/composeResources/values-ru/strings-ru.xml
@@ -175,6 +175,12 @@
 
     <string name="log_prepare_appmanager">Подготовка для AppManager</string>
     <string name="log_opened_appmanager">Открыто в AppManager</string>
+    <string name="log_permission_blocked">Разрешение на установку заблокировано политикой устройства</string>
+    <string name="log_opened_external_installer">Открыто во внешнем установщике</string>
+    <string name="install_permission_unavailable">Разрешение на установку недоступно</string>
+    <string name="install_permission_blocked_message">APK был успешно загружен, но это устройство не разрешает прямую установку. Хотите открыть его с помощью внешнего установщика?</string>
+    <string name="open_with_external_installer">Открыть во внешнем установщике</string>
+    <string name="external_installer_description">Использовать стороннее приложение для установки APK</string>
 
     <string name="error_generic">Ошибка: %1$s</string>
     <string name="error_asset_not_supported">Тип файла .%1$s не поддерживается</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-tr/strings-tr.xml b/core/presentation/src/commonMain/composeResources/values-tr/strings-tr.xml
@@ -207,7 +207,13 @@
 
     <!-- External tools -->
     <string name="log_prepare_appmanager">AppManager için hazırlanıyor</string>
-    <string name="log_opened_appmanager">AppManager'da açıldı</string>
+    <string name="log_opened_appmanager">AppManager\'da açıldı</string>
+    <string name="log_permission_blocked">Yükleme izni cihaz politikası tarafından engellendi</string>
+    <string name="log_opened_external_installer">Harici yükleyicide açıldı</string>
+    <string name="install_permission_unavailable">Yükleme izni kullanılamıyor</string>
+    <string name="install_permission_blocked_message">APK başarıyla indirildi ancak bu cihaz doğrudan yüklemeye izin vermiyor. Harici bir yükleyici ile açmak ister misiniz?</string>
+    <string name="open_with_external_installer">Harici yükleyici ile aç</string>
+    <string name="external_installer_description">APK\'yı yüklemek için üçüncü taraf bir uygulama kullanın</string>
 
     <!-- Errors -->
     <string name="error_generic">Hata: %1$s</string>
diff --git a/core/presentation/src/commonMain/composeResources/values-zh-rCN/strings-zh-rCN.xml b/core/presentation/src/commonMain/composeResources/values-zh-rCN/strings-zh-rCN.xml
@@ -158,6 +158,12 @@
 
     <string name="log_prepare_appmanager">正在为 AppManager 准备</string>
     <string name="log_opened_appmanager">已在 AppManager 中打开</string>
+    <string name="log_permission_blocked">安装权限被设备策略阻止</string>
+    <string name="log_opened_external_installer">已在外部安装器中打开</string>
+    <string name="install_permission_unavailable">安装权限不可用</string>
+    <string name="install_permission_blocked_message">APK已成功下载，但此设备不允许直接安装。是否使用外部安装器打开？</string>
+    <string name="open_with_external_installer">使用外部安装器打开</string>
+    <string name="external_installer_description">使用第三方应用安装APK</string>
 
     <string name="error_generic">错误：%1$s</string>
     <string name="error_asset_not_supported">不支持的文件类型 .%1$s</string>
diff --git a/core/presentation/src/commonMain/composeResources/values/strings.xml b/core/presentation/src/commonMain/composeResources/values/strings.xml
@@ -241,6 +241,14 @@
     <!-- External tools -->
     <string name="log_prepare_appmanager">Preparing for AppManager</string>
     <string name="log_opened_appmanager">Opened in AppManager</string>
+    <string name="log_permission_blocked">Install permission blocked by device policy</string>
+    <string name="log_opened_external_installer">Opened in external installer</string>
+
+    <!-- External installer -->
+    <string name="install_permission_unavailable">Install permission unavailable</string>
+    <string name="install_permission_blocked_message">The APK was downloaded successfully but this device doesn\'t allow direct installation. Would you like to open it with an external installer?</string>
+    <string name="open_with_external_installer">Open with external installer</string>
+    <string name="external_installer_description">Use a third-party app to install the APK</string>
 
     <!-- Errors -->
     <string name="error_generic">Error: %1$s</string>
diff --git a/feature/details/presentation/src/commonMain/kotlin/zed/rainxch/details/presentation/DetailsAction.kt b/feature/details/presentation/src/commonMain/kotlin/zed/rainxch/details/presentation/DetailsAction.kt
@@ -22,6 +22,9 @@ sealed interface DetailsAction {
 
     data object OpenInObtainium : DetailsAction
     data object OpenInAppManager : DetailsAction
+    data object InstallWithExternalApp : DetailsAction
+    data object OpenWithExternalInstaller : DetailsAction
+    data object DismissExternalInstallerPrompt : DetailsAction
     data object OnToggleInstallDropdown : DetailsAction
 
     data object OnNavigateBackClick : DetailsAction
diff --git a/feature/details/presentation/src/commonMain/kotlin/zed/rainxch/details/presentation/DetailsRoot.kt b/feature/details/presentation/src/commonMain/kotlin/zed/rainxch/details/presentation/DetailsRoot.kt
@@ -146,6 +146,38 @@ fun DetailsRoot(
         )
     }
 
+    if (state.showExternalInstallerPrompt) {
+        AlertDialog(
+            onDismissRequest = {
+                viewModel.onAction(DetailsAction.DismissExternalInstallerPrompt)
+            },
+            title = {
+                Text(text = stringResource(Res.string.install_permission_unavailable))
+            },
+            text = {
+                Text(text = stringResource(Res.string.install_permission_blocked_message))
+            },
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        viewModel.onAction(DetailsAction.OpenWithExternalInstaller)
+                    }
+                ) {
+                    Text(text = stringResource(Res.string.open_with_external_installer))
+                }
+            },
+            dismissButton = {
+                TextButton(
+                    onClick = {
+                        viewModel.onAction(DetailsAction.DismissExternalInstallerPrompt)
+                    }
+                ) {
+                    Text(text = stringResource(Res.string.dismiss))
+                }
+            }
+        )
+    }
+
     DetailsScreen(
         state = state,
         snackbarHostState = snackbarHostState,
diff --git a/feature/details/presentation/src/commonMain/kotlin/zed/rainxch/details/presentation/DetailsState.kt b/feature/details/presentation/src/commonMain/kotlin/zed/rainxch/details/presentation/DetailsState.kt
@@ -66,6 +66,9 @@ data class DetailsState(
     val deviceLanguageCode: String = "en",
 
     val isComingFromUpdate: Boolean = false,
+
+    val showExternalInstallerPrompt: Boolean = false,
+    val pendingInstallFilePath: String? = null,
 ) {
     val filteredReleases: List<GithubRelease>
         get() = when (selectedReleaseCategory) {
diff --git a/feature/details/presentation/src/commonMain/kotlin/zed/rainxch/details/presentation/DetailsViewModel.kt b/feature/details/presentation/src/commonMain/kotlin/zed/rainxch/details/presentation/DetailsViewModel.kt
diff --git a/feature/details/presentation/src/commonMain/kotlin/zed/rainxch/details/presentation/components/sections/Header.kt b/feature/details/presentation/src/commonMain/kotlin/zed/rainxch/details/presentation/components/sections/Header.kt
diff --git a/feature/details/presentation/src/commonMain/kotlin/zed/rainxch/details/presentation/model/LogResult.kt b/feature/details/presentation/src/commonMain/kotlin/zed/rainxch/details/presentation/model/LogResult.kt
diff --git a/feature/details/presentation/src/commonMain/kotlin/zed/rainxch/details/presentation/utils/LogResultAsText.kt b/feature/details/presentation/src/commonMain/kotlin/zed/rainxch/details/presentation/utils/LogResultAsText.kt
diff --git a/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileRoot.kt b/feature/profile/presentation/src/commonMain/kotlin/zed/rainxch/profile/presentation/ProfileRoot.kt

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,10 @@ class DesktopInstaller(`
`62`	`62`	`return false`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ override fun openWithExternalInstaller(filePath: String) {`
	`66`	`+ // Not applicable on desktop`
	`67`	`+ }`
	`68`	`+`
`65`	`69`	`override fun isAssetInstallable(assetName: String): Boolean {`
`66`	`70`	`val name = assetName.lowercase()`
`67`	`71`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,6 @@ interface Installer {`
`30`	`30`	`fun getApkInfoExtractor(): InstallerInfoExtractor`
`31`	`31`
`32`	`32`	`fun openApp(packageName: String): Boolean`
	`33`	`+`
	`34`	`+ fun openWithExternalInstaller(filePath: String)`
`33`	`35`	`}`