From 24ad510d3dfac1e04d3677179a5dc12629e8571e Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Fri, 16 Apr 2021 14:04:17 -0700
Subject: [PATCH] Fix a crash if the app is restarted while the edit bookmarks
 folder database view dialog is open. https://redmine.stoutner.com/issues/669

---
 .../activities/MainWebViewActivity.java       |  2 +-
 .../dialogs/EditBookmarkDatabaseViewDialog.kt |  2 +-
 .../EditBookmarkFolderDatabaseViewDialog.kt   | 19 +++++++++++--------
 app/src/main/res/values-de/strings.xml        |  5 +++++
 app/src/main/res/values-es/strings.xml        |  5 +++++
 app/src/main/res/values-it/strings.xml        |  5 +++++
 app/src/main/res/values-ru/strings.xml        |  5 +++++
 7 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
index 676c4d48..d7a74231 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -2055,7 +2055,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
 
                     // Make it so.
                     startActivity(genericFileManagerIntent);
-                } catch (Exception gengericFileManagerException) {
+                } catch (Exception genericFileManagerException) {
                     // Try an alternate file manager.
                     try {
                         // Create an alternate file manager intent.
diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt
index 542c4632..577e1a39 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt
@@ -365,7 +365,7 @@ class EditBookmarkDatabaseViewDialog : DialogFragment() {
                     updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder)
                 }
 
-                override fun onNothingSelected(parent: AdapterView<*>?) {
+                override fun onNothingSelected(parent: AdapterView<*>) {
                     // Do nothing.
                 }
             }
diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.kt
index e15e29ef..ba538f59 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.kt
@@ -349,15 +349,18 @@ class EditBookmarkFolderDatabaseViewDialog : DialogFragment() {
             }
         })
 
-        // Update the save button if the parent folder changes.
-        parentFolderSpinner.onItemSelectedListener = object: OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
-                // Update the save button.
-                updateSaveButton(bookmarksDatabaseHelper, currentFolderName, currentParentFolderDatabaseId, currentDisplayOrder)
-            }
+        // Wait to set the on item selected listener until the spinner has been inflated.  Otherwise the dialog will crash on restart.
+        parentFolderSpinner.post {
+            // Update the save button if the parent folder changes.
+            parentFolderSpinner.onItemSelectedListener = object: OnItemSelectedListener {
+                override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
+                    // Update the save button.
+                    updateSaveButton(bookmarksDatabaseHelper, currentFolderName, currentParentFolderDatabaseId, currentDisplayOrder)
+                }
 
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-                // Do nothing.
+                override fun onNothingSelected(parent: AdapterView<*>) {
+                    // Do nothing.
+                }
             }
         }
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 69479eef..f654e158 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -121,6 +121,7 @@
         <string name="clear_history">Verlauf löschen</string>
     <string name="open">Öffnen</string>
     <string name="downloads">Downloads</string>
+        <string name="no_file_manager_detected">Das System konnte keinen kompatiblen Datei-Manager ermitteln.</string>
     <string name="settings">Einstellungen</string>
     <string name="import_export">Importieren/Exportieren</string>
     <string name="logcat">Logcat</string>
@@ -189,6 +190,10 @@
     <string name="previous">Vorheriges</string>
     <string name="next">Nächstes</string>
 
+    <!-- Open Dialog. -->
+    <string name="file_is_mht">Die Datei ist ein MHT-Web-Archiv.</string>
+    <string name="mht_checkbox_explanation">Manchmal müssen MIME-gekapselte HTML-Web-Archive (MHT) manuell festgelegt werden, um korrekt geöffnet zu werden.</string>
+
     <!-- Save Dialogs. -->
     <string name="save_url">URL speichern</string>
     <string name="save_archive">Archiv speichern</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d6de2211..bd828d57 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -117,6 +117,7 @@
         <string name="clear_history">Borrar historial</string>
     <string name="open">Abrir</string>
     <string name="downloads">Descargas</string>
+        <string name="no_file_manager_detected">El sistema no puede detectar un gestor de archivos compatible.</string>
     <string name="settings">Configuración</string>
     <string name="import_export">Importar/Exportar</string>
     <string name="logcat">Logcat</string>
@@ -185,6 +186,10 @@
     <string name="previous">Anterior</string>
     <string name="next">Siguiente</string>
 
+    <!-- Open Dialog. -->
+    <string name="file_is_mht">El archivo es un archivo de web MHT.</string>
+    <string name="mht_checkbox_explanation">A veces se necesita especificar manualmente los archivos web MIME Encapsulated HTML (MHT) para que se abran correctamente.</string>
+
     <!-- Save Dialogs. -->
     <string name="save_url">Guardar URL</string>
     <string name="save_archive">Guardar archivo</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index de01192d..7e8fc479 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -117,6 +117,7 @@
         <string name="clear_history">Elimina cronologia</string>
     <string name="open">Apri</string>
     <string name="downloads">Download</string>
+        <string name="no_file_manager_detected">Il sistema non riesce a trovare un file manager compatibile.</string>
     <string name="settings">Impostazioni</string>
     <string name="import_export">Importa/Esporta</string>
     <string name="logcat">Logcat</string>
@@ -185,6 +186,10 @@
     <string name="previous">Precedente</string>
     <string name="next">Successivo</string>
 
+    <!-- Open Dialog. -->
+    <string name="file_is_mht">Questo file è un archivio web MHT.</string>
+    <string name="mht_checkbox_explanation">Talvolta gli archivi web del tipo MIME Encapsulated HTML (MHT) devono essere specificati manualmente per essere aperti correttamente.</string>
+
     <!-- Save Dialogs. -->
     <string name="save_url">Salva URL</string>
     <string name="save_archive">Salva Archivio</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c95de474..a2de6373 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -114,6 +114,7 @@
         <string name="clear_history">Очистить историю</string>
     <string name="open">Открыть</string>
     <string name="downloads">Загрузки</string>
+        <string name="no_file_manager_detected">Система не может обнаружить совместимый файловый менеджер.</string>
     <string name="settings">Настройки</string>
     <string name="import_export">Импорт/Экспорт</string>
     <string name="logcat">Logcat</string>
@@ -182,6 +183,10 @@
     <string name="previous">Предыдущий</string>
     <string name="next">Следующий</string>
 
+    <!-- Open Dialog. -->
+    <string name="file_is_mht">Файл представляет собой веб-архив MHT.</string>
+    <string name="mht_checkbox_explanation">Иногда для корректного открытия веб-архивов MIME Encapsulated HTML (MHT) необходимо указать вручную.</string>
+
     <!-- Save Dialogs. -->
     <string name="save_url">Сохранить URL</string>
     <string name="save_archive">Сохранить архив</string>
-- 
2.45.2