#88

* Speed-up app installation/update by not requiring to press a button" This reverts commit 991c7d8"

CHANGELOG.md

@@ -1,5 +1,6 @@
 # 2021-10-?? Version 74.4.7 (86)
  * Fix "Permission Denial" bug on Android devices (Tobiwan/ffupdater#86)
+ * Speed-up app installation/update by not requiring to press a button
 
 # 2021-10-25 Version 74.4.6 (85)
  * Download only "Firefox Focus/Klar" and not "Firefox Focus/Klar Beta" (Tobi823/ffupdater#89)

ffupdater/src/main/java/de/marmaro/krt/ffupdater/InstallActivity.kt

@@ -96,8 +96,8 @@ class InstallActivity : AppCompatActivity() {
                 restartStateMachine(FAILURE_APP_INSTALLATION)
             })
         apkCache = ApkCache(app, this)
-        findViewById<View>(R.id.installConfirmationButton).setOnClickListener {
-            restartStateMachine(USER_TRIGGERS_INSTALLATION_PROCESS)
+        findViewById<View>(R.id.install_activity__retrigger_installation__button).setOnClickListener {
+            restartStateMachine(TRIGGER_INSTALLATION_PROCESS)
         }
 
         //make sure that the ViewModel is correct for the current app
@@ -191,7 +191,7 @@ class InstallActivity : AppCompatActivity() {
         DOWNLOAD_WAS_SUCCESSFUL(InstallActivity::downloadWasSuccessful),
         USE_CACHED_DOWNLOADED_APK(InstallActivity::useCachedDownloadedApk),
         FINGERPRINT_OF_DOWNLOADED_FILE_OK(InstallActivity::fingerprintOfDownloadedFileOk),
-        USER_TRIGGERS_INSTALLATION_PROCESS(InstallActivity::userTriggersInstallationProcess),
+        TRIGGER_INSTALLATION_PROCESS(InstallActivity::triggerInstallationProcess),
         USER_HAS_INSTALLED_APP_SUCCESSFUL(InstallActivity::userHasInstalledAppSuccessful),
         APP_INSTALLATION_HAS_BEEN_REGISTERED(InstallActivity::appInstallationHasBeenRegistered),
         FINGERPRINT_OF_INSTALLED_APP_OK(InstallActivity::fingerprintOfInstalledAppOk),
@@ -381,24 +381,24 @@ class InstallActivity : AppCompatActivity() {
         fun fingerprintOfDownloadedFileOk(ia: InstallActivity): State {
             ia.hide(R.id.verifyDownloadFingerprint)
             ia.show(R.id.fingerprintDownloadGood)
-            ia.show(R.id.installConfirmation)
+            ia.show(R.id.install_activity__retrigger_installation)
             ia.setText(R.id.fingerprintDownloadGoodHash, ia.fileFingerprint.hexString)
-            return SUCCESS_PAUSE
+            return TRIGGER_INSTALLATION_PROCESS
         }
 
         @MainThread
-        fun userTriggersInstallationProcess(ia: InstallActivity): State {
+        fun triggerInstallationProcess(ia: InstallActivity): State {
             ia.show(R.id.installingApplication)
             val installationFile = ia.apkCache.getCacheFile()
-            require(installationFile.exists())
+            require(installationFile.exists()) { "Cached file does not exists" }
             ia.appInstaller.install(ia, installationFile)
             return SUCCESS_PAUSE
         }
 
         @MainThread
         fun userHasInstalledAppSuccessful(ia: InstallActivity): State {
             ia.hide(R.id.installingApplication)
-            ia.hide(R.id.installConfirmation)
+            ia.hide(R.id.install_activity__retrigger_installation)
             ia.show(R.id.installerSuccess)
             ia.viewModel.downloadId?.let { ia.downloadManager.remove(it) }
             return APP_INSTALLATION_HAS_BEEN_REGISTERED
@@ -474,7 +474,7 @@ class InstallActivity : AppCompatActivity() {
         @MainThread
         fun failureAppInstallation(ia: InstallActivity): State {
             ia.hide(R.id.installingApplication)
-            ia.hide(R.id.installConfirmation)
+            ia.hide(R.id.install_activity__retrigger_installation)
             ia.show(R.id.installerFailed)
             var error = ia.appInstallationFailedErrorMessage
             if (error != null) {

ffupdater/src/main/java/de/marmaro/krt/ffupdater/dialog/InstallNewAppDialog.kt

@@ -25,7 +25,7 @@ class InstallNewAppDialog : DialogFragment() {
         }
         val names = apps.map { context.getString(it.detail.displayTitle) }.toTypedArray()
         return AlertDialog.Builder(activity)
-                .setTitle(R.string.install_new_app_dialog__title)
+                .setTitle(R.string.install_activity__retrigger_installation__button_title)
                 .setItems(names) { _: DialogInterface, which: Int ->
                     triggerAppInstallation(apps[which])
                 }

ffupdater/src/main/res/layout/install_activity.xml

@@ -206,17 +206,6 @@
 
         </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/installConfirmation"
-            style="@style/DownloadActivitySegment">
-
-            <Button
-                android:id="@+id/installConfirmationButton"
-                style="@style/DefaultButton"
-                android:text="@string/install_new_app_dialog__title" />
-
-        </LinearLayout>
-
         <LinearLayout
             android:id="@+id/fingerprintDownloadBad"
             style="@style/DownloadActivitySegment"
@@ -262,6 +251,16 @@
                 android:layout_gravity="center" />
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/install_activity__retrigger_installation"
+            style="@style/DownloadActivitySegment">
+
+            <Button
+                android:id="@+id/install_activity__retrigger_installation__button"
+                style="@style/DefaultButton"
+                android:text="@string/install_activity__retrigger_installation__button_title" />
+
+        </LinearLayout>
 
         <LinearLayout
             android:id="@+id/verifyInstalledFingerprint"

ffupdater/src/main/res/values-bg/strings.xml

@@ -82,7 +82,7 @@
     <string name="install_activity_label">Инсталиране</string>
     <string name="install_app">инсталирай приложението</string>
     <string name="install_new_app">Инсталирайте ново приложение</string>
-    <string name="install_new_app_dialog__title">Инсталиране</string>
+    <string name="install_activity__retrigger_installation__button_title">Повторете инсталирането на приложението</string>
     <string name="install_same_version_dialog__message">Най-новата версия на това приложение вече е инсталирана. Искате ли да изтеглите и инсталирате отново последната версия?</string>
     <string name="install_same_version_dialog__title">Инсталирана е същата версия</string>
     <string name="installed_app_is_not_verified">Инсталираното приложение е НЕпроверено</string>

ffupdater/src/main/res/values-de/strings.xml

@@ -82,7 +82,7 @@
     <string name="install_activity_label">Anwendung installieren</string>
     <string name="install_app">App installieren</string>
     <string name="install_new_app">Neue Anwendung installieren</string>
-    <string name="install_new_app_dialog__title">Anwendung installieren</string>
+    <string name="install_activity__retrigger_installation__button_title">App-Installation wiederholen</string>
     <string name="install_same_version_dialog__message">Die neueste Version dieser App ist bereits installiert. Möchten Sie die neueste Version erneut herunterladen und installieren?</string>
     <string name="install_same_version_dialog__title">Gleiche Version installiert</string>
     <string name="installed_app_is_not_verified">Installierte Anwendung ist NICHT verifiziert</string>

ffupdater/src/main/res/values-fr/strings.xml

@@ -82,7 +82,7 @@
     <string name="install_activity_label">Installer l\'application</string>
     <string name="install_app">installer l\'application</string>
     <string name="install_new_app">Installer une nouvelle application</string>
-    <string name="install_new_app_dialog__title">Installer l\'application</string>
+    <string name="install_activity__retrigger_installation__button_title">Réessayer l\'installation de l\'application</string>
     <string name="install_same_version_dialog__message">La dernière version de cette application est déjà installée. Voulez-vous télécharger et installer à nouveau la dernière version ?</string>
     <string name="install_same_version_dialog__title">Même version installée</string>
     <string name="installed_app_is_not_verified">L\'application installée n\'est PAS vérifiée</string>

ffupdater/src/main/res/values-ja/strings.xml

@@ -82,7 +82,7 @@
     <string name="install_activity_label">アプリをインストール</string>
     <string name="install_app">アプリをインストール</string>
     <string name="install_new_app">新規アプリをインストール</string>
-    <string name="install_new_app_dialog__title">アプリをインストール</string>
+    <string name="install_activity__retrigger_installation__button_title">アプリのインストールを再試行する</string>
     <string name="install_same_version_dialog__message">このアプリの最新版はすでにインストールされています。再度、最新版をダウンロードしてインストールしますか？</string>
     <string name="install_same_version_dialog__title">同じバージョンがインストール済み</string>
     <string name="installed_app_is_not_verified">インストールしたアプリが検証できませんでした</string>

ffupdater/src/main/res/values-pl/strings.xml

@@ -82,7 +82,7 @@
     <string name="install_activity_label">Zainstaluj aplikację</string>
     <string name="install_app">Zainstaluj aplikację</string>
     <string name="install_new_app">Zainstaluj nową aplikację</string>
-    <string name="install_new_app_dialog__title">Zainstaluj Aplikację</string>
+    <string name="install_activity__retrigger_installation__button_title">Ponów próbę instalacji aplikacji</string>
     <string name="install_same_version_dialog__message">Najnowsza wersja tej aplikacji jest już zainstalowana. Czy chcesz ponownie pobrać i zainstalować najnowszą wersję?</string>
     <string name="install_same_version_dialog__title">Ta sama wersja jest już zainstalowana</string>
     <string name="installed_app_is_not_verified">Zainstalowana aplikacja NIE została zweryfikowana</string>

ffupdater/src/main/res/values-pt-rBR/strings.xml

@@ -82,7 +82,7 @@
     <string name="install_activity_label">Instalar o navegador</string>
     <string name="install_app">Instalar o navegador</string>
     <string name="install_new_app">Instalar o outro navegador</string>
-    <string name="install_new_app_dialog__title">Instalar o navegador</string>
+    <string name="install_activity__retrigger_installation__button_title">Instalação de nova aplicação</string>
     <string name="install_same_version_dialog__message">A última versão deste navegador já está instalada. Você quer baixar e instalar a versão mais recente outra vez?</string>
     <string name="install_same_version_dialog__title">Mesma versão instalada</string>
     <string name="installed_app_is_not_verified">O navegador instalado NÃO foi verificado</string>

ffupdater/src/main/res/values-ru/strings.xml

@@ -82,7 +82,7 @@
     <string name="install_activity_label">Установить приложение</string>
     <string name="install_app">установочное приложение</string>
     <string name="install_new_app">Установить новое приложение</string>
-    <string name="install_new_app_dialog__title">Установить приложение</string>
+    <string name="install_activity__retrigger_installation__button_title">Повторите установку приложения</string>
     <string name="install_same_version_dialog__message">Последняя версия этого приложения уже установлена. Вы хотите снова загрузить и установить ее?</string>
     <string name="install_same_version_dialog__title">Установлена та же версия</string>
     <string name="installed_app_is_not_verified">Установленное приложение НЕ проверено</string>

ffupdater/src/main/res/values-uk/strings.xml

@@ -82,7 +82,7 @@
     <string name="install_activity_label">Встановити програму</string>
     <string name="install_app">встановити додаток</string>
     <string name="install_new_app">Встановіть новий додаток</string>
-    <string name="install_new_app_dialog__title">Встановити програму</string>
+    <string name="install_activity__retrigger_installation__button_title">Повторіть установку програми</string>
     <string name="install_same_version_dialog__message">Останню версію цього додатка вже встановлено. Завантажити та встановити останню версію знову?</string>
     <string name="install_same_version_dialog__title">Встановлена та сама версія</string>
     <string name="installed_app_is_not_verified">Встановлений додаток НЕ підтверджений</string>

ffupdater/src/main/res/values/strings.xml

@@ -84,7 +84,7 @@
     <string name="install_activity_label">Install Application</string>
     <string name="install_app">Install app</string>
     <string name="install_new_app">Install new app</string>
-    <string name="install_new_app_dialog__title">Install Application</string>
+    <string name="install_activity__retrigger_installation__button_title">Retry App Installation</string>
     <string name="install_same_version_dialog__message">The latest version of this app is already installed. Do you want to download and install the latest version again?</string>
     <string name="install_same_version_dialog__title">Same version installed</string>
     <string name="installed_app_is_not_verified">Installed app is NOT verified</string>