From c6dbd16598906207cb5058e380da126185fd0006 Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Fri, 9 Oct 2020 09:56:15 -0700
Subject: [PATCH] Eliminate loading of some duplicate tabs on restart. 
 https://redmine.stoutner.com/issues/610

---
 app/src/main/AndroidManifest.xml                  |  4 ++--
 .../activities/MainWebViewActivity.java           |  6 ++++++
 app/src/main/res/values-de/strings.xml            |  5 +++++
 app/src/main/res/values-es/strings.xml            |  2 ++
 app/src/main/res/values-fr/strings.xml            | 15 +++++++++++++++
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b4998dd3..9f99ed17 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -145,8 +145,8 @@
 
                 <data android:host="*" />
 
-                <!-- This pattern matches any file that starts with a `/`, has at least one character, followed by any number of other characters, terminating with `.mht`. -->
-                <data android:pathPattern="/.*\.mht" />
+                <!-- In the path pattern syntax, `.*` is a wildcard.  Hence, this matches any file path that ends in `.mht`.  <https://developer.android.com/guide/topics/manifest/data-element#path>  -->
+                <data android:pathPattern=".*.mht" />
                 <data android:mimeType="*/*" />
             </intent-filter>
 
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 eff9c68d..78629e55 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -4757,6 +4757,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
             // Get the intent that started the app.
             Intent intent = getIntent();
 
+            // Reset the intent.  This prevents a duplicate tab from being created on restart.
+            setIntent(new Intent());
+
             // Get the information from the intent.
             String intentAction = intent.getAction();
             Uri intentUriData = intent.getData();
@@ -6452,6 +6455,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
             // Get the intent that started the app.
             Intent launchingIntent = getIntent();
 
+            // Reset the intent.  This prevents a duplicate tab from being created on restart.
+            setIntent(new Intent());
+
             // Get the information from the intent.
             String launchingIntentAction = launchingIntent.getAction();
             Uri launchingIntentUriData = launchingIntent.getData();
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3b1555c3..dbd8f44d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -193,18 +193,22 @@
     <!-- Save Dialogs. -->
     <string name="save_url">URL speichern</string>
     <string name="save_archive">Archiv speichern</string>
+    <string name="save_text">Text speichern</string>
     <string name="save_image">Grafik speichern</string>
     <string name="save_logcat">Logcat speichern</string>
     <string name="file_name">Dateiname</string>
     <string name="webpage_mht">Webseite.mht</string>
     <string name="webpage_png">Webseite.png</string>
     <string name="privacy_browser_logcat_txt">Privacy Browser Logcat.txt</string>
+    <string name="privacy_browser_version_txt">Privacy Browser Version.txt</string>
+    <string name="privacy_browser_version_png">Privacy Browser Version.png</string>
     <string name="file">Datei</string>
     <string name="bytes">Bytes</string>
     <string name="unknown_size">Unbekannte Größe</string>
     <string name="invalid_url">Ungültige URL</string>
     <string name="ok">OK</string>
     <string name="saving_file">Speichere Datei:</string>
+    <string name="processing_image">Bild wird bearbeitet… :</string>
     <string name="file_saved">Datei gespeichert:</string>
     <string name="error_saving_file">Fehler beim Speichern der Datei:</string>
 
@@ -438,6 +442,7 @@
             <string name="certificate_version">Zertifikat-Version:</string>
             <string name="serial_number">Seriennummer:</string>
             <string name="signature_algorithm">Signaturalgorithmus:</string>
+        <string name="version_info_copied">Versions-Information wurde kopiert.</string>
     <string name="permissions">Berechtigungen</string>
     <string name="privacy_policy">Datenschutzrichtlinie</string>
     <string name="changelog">Changelog</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f1bdbab9..4a8ab0a0 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -196,6 +196,8 @@
     <string name="webpage_mht">PaginaWeb.mht</string>
     <string name="webpage_png">PaginaWeb.png</string>
     <string name="privacy_browser_logcat_txt">Navegador Privado Logcat.txt</string>
+    <string name="privacy_browser_version_txt">Versión de Navegador Privado.txt</string>
+    <string name="privacy_browser_version_png">Versiótoutnern de Navegador Privado.png</string>
     <string name="file">Archivo</string>
     <string name="bytes">bytes</string>
     <string name="unknown_size">Tamaño desconocido</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 41d5b2b2..0a424c3e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -158,6 +158,7 @@
         <string name="swipe_to_refresh_options_menu">Glisser pour actualiser</string>
         <string name="wide_viewport">Fenêtre large</string>
         <string name="display_images">Afficher les images</string>
+        <string name="dark_webview">WebView sombre</string>
         <string name="font_size">Police</string>
         <string name="find_on_page">Chercher sur la page</string>
         <string name="print">Imprimer</string>
@@ -189,18 +190,22 @@
     <!-- Save Dialogs. -->
     <string name="save_url">Enregistrer l\'URL</string>
     <string name="save_archive">Enregistrer l\'archive</string>
+    <string name="save_text">Sauvegarder le texte</string>
     <string name="save_image">Sauvegarder en tant qu\'image</string>
     <string name="save_logcat">Sauvegarder le journal système</string>
     <string name="file_name">Nom du fichier</string>
     <string name="webpage_mht">PageWeb.mht</string>
     <string name="webpage_png">PageWeb.png</string>
     <string name="privacy_browser_logcat_txt">Privacy Browser Logcat.txt</string>
+    <string name="privacy_browser_version_txt">Privacy Browser Version.txt</string>
+    <string name="privacy_browser_version_png">Privacy Browser Version.png</string>
     <string name="file">Fichier</string>
     <string name="bytes">octets</string>
     <string name="unknown_size">taille inconnue</string>
     <string name="invalid_url">URL invalide</string>
     <string name="ok">OK</string>
     <string name="saving_file">Enregistrement du fichier:</string>
+    <string name="processing_image">Traitement de l\'image… :</string>
     <string name="file_saved">Fichier enregistré:</string>
     <string name="error_saving_file">Erreur lors de l\'enregistrement du fichier:</string>
 
@@ -414,6 +419,15 @@
             <string name="orbot">Orbot :</string>
             <string name="i2p">I2P :</string>
             <string name="openkeychain">OpenKeychain :</string>
+        <string name="memory_usage">Utilisation de la mémoire</string>
+            <string name="app_consumed_memory">Mémoire consommée par l\'application :</string>
+            <string name="app_available_memory">Mémoire disponible de l\'application :</string>
+            <string name="app_total_memory">Mémoire totale de l\'application :</string>
+            <string name="app_maximum_memory">Mémoire maximale de l\'application :</string>
+            <string name="system_consumed_memory">Mémoire consommée par le système :</string>
+            <string name="system_available_memory">Mémoire système disponible :</string>
+            <string name="system_total_memory">Mémoire totale du système :</string>
+            <string name="mebibyte">Mio</string>
             <string name="easylist_label">EasyList :</string>
             <string name="easyprivacy_label">EasyPrivacy :</string>
             <string name="fanboy_annoyance_label">Fanboy’s Annoyance List :</string>
@@ -426,6 +440,7 @@
             <string name="certificate_version">Version du certificat :</string>
             <string name="serial_number">Numéro de série :</string>
             <string name="signature_algorithm">Algorithme de chiffrement :</string>
+        <string name="version_info_copied">Informations de version copiées.</string>
     <string name="permissions">Permissions</string>
     <string name="privacy_policy">Politique de confidentialité</string>
     <string name="changelog">Journal des changements</string>
-- 
2.43.0