Bump the minimum API to 24 (Android 7).

author Soren Stoutner <soren@stoutner.com>

Mon, 20 Mar 2023 22:05:32 +0000 (15:05 -0700)

committer Soren Stoutner <soren@stoutner.com>

Mon, 20 Mar 2023 22:05:32 +0000 (15:05 -0700)
author Soren Stoutner <soren@stoutner.com>
Mon, 20 Mar 2023 22:05:32 +0000 (15:05 -0700)
committer Soren Stoutner <soren@stoutner.com>
Mon, 20 Mar 2023 22:05:32 +0000 (15:05 -0700)
diff --git a/app/build.gradle b/app/build.gradle

index fe17b07a683b2d8f3962dab68a7a007054501434..2b9ae72b38dc2e2d884691f787c3e6fddd5b389b 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,7 +26,7 @@ android {
      compileSdk 33
  
      defaultConfig {
      compileSdk 33
  
      defaultConfig {
-        minSdk 23
+        minSdk 24
          targetSdk 33
          versionCode 67
          versionName "3.13.3"
          targetSdk 33
          versionCode 67
          versionName "3.13.3"
diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html

index 5ab37a96676f36d895a4c64ae86c6c421f53d893..a15bd0525d275b7ff20b7029c03a1afc103b719f 100644 (file)
--- a/app/src/main/assets/de/about_changelog.html
+++ b/app/src/main/assets/de/about_changelog.html
@@ -33,8 +33,8 @@
      </head>
  
      <body>
      </head>
  
      <body>
-        <h3>3.13.3 (Version Code 67)</h3>
-        <p>2. März 2023 - Mindest-API 23, Ziel-API 33</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-android-3-13-3/">3.13.3</a> (Version Code 67)</h3>
+        <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=c5359b173d559fc154bf7e4bd8fd65c951c529b3">13. März 2023</a> - Mindest-API 23, Ziel-API 33</p>
          <ul>
              <li>Fehler behoben, durch welchen der <a href="https://redmine.stoutner.com/issues/963">aktuelle Tab manchmal nicht der aktive Tab war</a>.</li>
          </ul>
          <ul>
              <li>Fehler behoben, durch welchen der <a href="https://redmine.stoutner.com/issues/963">aktuelle Tab manchmal nicht der aktive Tab war</a>.</li>
          </ul>
diff --git a/app/src/main/assets/de/about_licenses.html b/app/src/main/assets/de/about_licenses.html

index ee8b1b0aa81bd978c11e1055d9eaff3d5f46399b..8604329274d09e8bcae89bbbbc23a25c17769e84 100644 (file)
--- a/app/src/main/assets/de/about_licenses.html
+++ b/app/src/main/assets/de/about_licenses.html
@@ -66,7 +66,7 @@
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              are derived from <code>security</code> and <code>language</code>, which are part of the <a href="https://fonts.google.com/icons">Android Material icon set</a> and are released under the
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              are derived from <code>security</code> and <code>language</code>, which are part of the <a href="https://fonts.google.com/icons">Android Material icon set</a> and are released under the
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
-            The full text of the license is below. Modifications copyright 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The full text of the license is below. Modifications copyright 2016-2017,2021-2022 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
              The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> is derived from elements of <code>folder</code> and <code>exit_to_app</code>,
              which are part of the <a href="https://fonts.google.com/icons">Android Material icon set</a>
              The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> is derived from elements of <code>folder</code> and <code>exit_to_app</code>,
              which are part of the <a href="https://fonts.google.com/icons">Android Material icon set</a>
diff --git a/app/src/main/assets/en/about_changelog.html b/app/src/main/assets/en/about_changelog.html

index 2d0075bf92efe0d5ab92ac256eb81878b3049270..5111cb93fe49e1aa5eed330ec24aa6f7213d094d 100644 (file)
--- a/app/src/main/assets/en/about_changelog.html
+++ b/app/src/main/assets/en/about_changelog.html
@@ -27,8 +27,8 @@
      </head>
  
      <body>
      </head>
  
      <body>
-        <h3>3.13.3 (version code 67)</h3>
-        <p>2 March 2023 - minimum API 23, target API 33</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-android-3-13-3/">3.13.3</a> (version code 67)</h3>
+        <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=c5359b173d559fc154bf7e4bd8fd65c951c529b3">13 March 2023</a> - minimum API 23, target API 33</p>
          <ul>
              <li>Fix a race condition that sometimes caused the <a href="https://redmine.stoutner.com/issues/963">current tab to not be the active tab</a>.</li>
          </ul>
          <ul>
              <li>Fix a race condition that sometimes caused the <a href="https://redmine.stoutner.com/issues/963">current tab to not be the active tab</a>.</li>
          </ul>
diff --git a/app/src/main/assets/en/about_licenses.html b/app/src/main/assets/en/about_licenses.html

index e5453f9a4a651f4190bc3525edd2c2e3beab1723..efa8d3a11d805fc7cc49226ec2a322f19736247f 100644 (file)
--- a/app/src/main/assets/en/about_licenses.html
+++ b/app/src/main/assets/en/about_licenses.html
@@ -63,7 +63,7 @@
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              are derived from <code>security</code> and <code>language</code>, which are part of the <a href="https://fonts.google.com/icons">Android Material icon set</a> and are released under the
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              are derived from <code>security</code> and <code>language</code>, which are part of the <a href="https://fonts.google.com/icons">Android Material icon set</a> and are released under the
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
-            The full text of the license is below. Modifications copyright 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The full text of the license is below. Modifications copyright 2016-2017,2021-2022 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
              The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> is derived from elements of <code>folder</code> and <code>exit_to_app</code>,
              which are part of the <a href="https://fonts.google.com/icons">Android Material icon set</a>
              The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> is derived from elements of <code>folder</code> and <code>exit_to_app</code>,
              which are part of the <a href="https://fonts.google.com/icons">Android Material icon set</a>
diff --git a/app/src/main/assets/es/about_changelog.html b/app/src/main/assets/es/about_changelog.html

index c69e6389bb44af08862c1ab612f3f037a8fdf20b..c83a5808dc32da0b2f3df78e8ca59f9669f620d0 100644 (file)
--- a/app/src/main/assets/es/about_changelog.html
+++ b/app/src/main/assets/es/about_changelog.html
@@ -29,8 +29,8 @@
      </head>
  
      <body>
      </head>
  
      <body>
-        <h3>3.13.3 (código de versión 67)</h3>
-        <p>2 de marzo de 2023 - API mínimo 23, API objetivo 33</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-android-3-13-3/">3.13.3</a> (código de versión 67)</h3>
+        <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=c5359b173d559fc154bf7e4bd8fd65c951c529b3">13 de marzo de 2023</a> - API mínimo 23, API objetivo 33</p>
          <ul>
              <li>Corregir una condición de carrera que a veces provocaba que la <a href="https://redmine.stoutner.com/issues/963">pestaña actual no fuera la pestaña activa</a>.</li>
          </ul>
          <ul>
              <li>Corregir una condición de carrera que a veces provocaba que la <a href="https://redmine.stoutner.com/issues/963">pestaña actual no fuera la pestaña activa</a>.</li>
          </ul>
diff --git a/app/src/main/assets/es/about_licenses.html b/app/src/main/assets/es/about_licenses.html

index 0e7173553cea4039e278d1e8a2ccaa12bf60b278..732872ec46299ff2c72cb763cbd326edb3f964a3 100644 (file)
--- a/app/src/main/assets/es/about_licenses.html
+++ b/app/src/main/assets/es/about_licenses.html
@@ -65,7 +65,7 @@
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              derivan de <code>security</code> y de <code>language</code>, que son parte del <a href="https://fonts.google.com/icons">conjunto de iconos Android Material</a> y son liberados bajo la
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              derivan de <code>security</code> y de <code>language</code>, que son parte del <a href="https://fonts.google.com/icons">conjunto de iconos Android Material</a> y son liberados bajo la
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
-            El texto completo de la licencia se encuentra debajo. Copyright de modificaciones 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            El texto completo de la licencia se encuentra debajo. Copyright de modificaciones 2016-2017,2021-2022 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
              Las imágenes resultantes se liberan bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> deriva de elementos de <code>folder</code> y <code>exit_to_app</code>, que son parte del
              <a href="https://fonts.google.com/icons">conjunto de iconos Android Material</a> y son liberados bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
              Las imágenes resultantes se liberan bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> deriva de elementos de <code>folder</code> y <code>exit_to_app</code>, que son parte del
              <a href="https://fonts.google.com/icons">conjunto de iconos Android Material</a> y son liberados bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
diff --git a/app/src/main/assets/fr/about_changelog.html b/app/src/main/assets/fr/about_changelog.html

index 66e40d08f0863b65c3a6b6d3f1ceb58305c8b9da..ed00cd59ed70ff80c5e83138e9488ba8ee1dfe37 100644 (file)
--- a/app/src/main/assets/fr/about_changelog.html
+++ b/app/src/main/assets/fr/about_changelog.html
@@ -29,8 +29,8 @@
      </head>
  
      <body>
      </head>
  
      <body>
-        <h3>3.13.3 (version du code 67)</h3>
-        <p>2 Mars 2023 - API minimale : 23, API optimale : 33</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-android-3-13-3/">3.13.3</a> (version du code 67)</h3>
+        <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=c5359b173d559fc154bf7e4bd8fd65c951c529b3">13 Mars 2023</a> - API minimale : 23, API optimale : 33</p>
          <ul>
              <li>Fix a race condition that sometimes caused the <a href="https://redmine.stoutner.com/issues/963">current tab to not be the active tab</a>.</li>
          </ul>
          <ul>
              <li>Fix a race condition that sometimes caused the <a href="https://redmine.stoutner.com/issues/963">current tab to not be the active tab</a>.</li>
          </ul>
diff --git a/app/src/main/assets/fr/about_licenses.html b/app/src/main/assets/fr/about_licenses.html

index 2c27098d13a2133f42137fd3bf0c62e4d57e1e71..38e1cf36d776442985fa20858c40e198233e0d76 100644 (file)
--- a/app/src/main/assets/fr/about_licenses.html
+++ b/app/src/main/assets/fr/about_licenses.html
@@ -65,7 +65,7 @@
          <p><img class="left" src="../shared_images/privacy_browser.svg"> <img class="left" src="../shared_images/warning.svg"> <img class="left" src="../shared_images/javascript_enabled.svg"> sont dérivés de
              <code>security</code> et de <code>language</code>, qui font partie de <a href="https://fonts.google.com/icons">l'ensemble d'icônes Matériel Android</a> et sont publiés sous la
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licence Apache 2.0</a>.
          <p><img class="left" src="../shared_images/privacy_browser.svg"> <img class="left" src="../shared_images/warning.svg"> <img class="left" src="../shared_images/javascript_enabled.svg"> sont dérivés de
              <code>security</code> et de <code>language</code>, qui font partie de <a href="https://fonts.google.com/icons">l'ensemble d'icônes Matériel Android</a> et sont publiés sous la
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licence Apache 2.0</a>.
-            Le texte complet de la licence est ci-dessous. Modifications copyright 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            Le texte complet de la licence est ci-dessous. Modifications copyright 2016-2017,2021-2022 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
              Les images résultantes sont publiées sous la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licence GPLv3+</a>.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> est dérivé des éléments <code>folder</code> et <code>exit_to_app</code>,
              qui font partie de <a href="https://fonts.google.com/icons">l'ensemble d'icônes Matériel Android</a>
              Les images résultantes sont publiées sous la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licence GPLv3+</a>.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> est dérivé des éléments <code>folder</code> et <code>exit_to_app</code>,
              qui font partie de <a href="https://fonts.google.com/icons">l'ensemble d'icônes Matériel Android</a>
diff --git a/app/src/main/assets/it/about_changelog.html b/app/src/main/assets/it/about_changelog.html

index c22514d9b09b10e04ad8dfc3033c255c9c9a6b36..fd4789c5c0d87eae0bd8d11269da54a90f459631 100644 (file)
--- a/app/src/main/assets/it/about_changelog.html
+++ b/app/src/main/assets/it/about_changelog.html
@@ -29,8 +29,8 @@
      </head>
  
      <body>
      </head>
  
      <body>
-        <h3>3.13.3 (versione codice 67)</h3>
-        <p>2 Marzo 2023 - minima API 23, target API 33</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-android-3-13-3/">3.13.3</a> (versione codice 67)</h3>
+        <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=c5359b173d559fc154bf7e4bd8fd65c951c529b3">13 Marzo 2023</a> - minima API 23, target API 33</p>
          <ul>
              <li>Correzione di una "situazione di corsa" che talvolta faceva in modo che la <a href="https://redmine.stoutner.com/issues/963">scheda in uso non fosse la scheda attiva</a>.</li>
          </ul>
          <ul>
              <li>Correzione di una "situazione di corsa" che talvolta faceva in modo che la <a href="https://redmine.stoutner.com/issues/963">scheda in uso non fosse la scheda attiva</a>.</li>
          </ul>
diff --git a/app/src/main/assets/it/about_licenses.html b/app/src/main/assets/it/about_licenses.html

index 4b0c6d9210f93f031638b47560dc438fc77f89de..619128b57abf9b84ce258c2203cd8707497f8e68 100644 (file)
--- a/app/src/main/assets/it/about_licenses.html
+++ b/app/src/main/assets/it/about_licenses.html
@@ -70,7 +70,7 @@
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              sono state derivate da <code>security</code> e <code>language</code>, che fanno parte dell'<a href="https://fonts.google.com/icons">Android Material icon set</a> e sono state rilasciate sotto
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              sono state derivate da <code>security</code> e <code>language</code>, che fanno parte dell'<a href="https://fonts.google.com/icons">Android Material icon set</a> e sono state rilasciate sotto
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
-            Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche 2016-2017,2021-2022 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
              Le immagini risultanti sono rilasciate sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> è stata derivata da elementi di <code>folder</code> e di <code>exit_to_app</code>, che fanno parte
              dell'<a href="https://fonts.google.com/icons">Android Material icon set</a> e sono state rilasciate sotto <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
              Le immagini risultanti sono rilasciate sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> è stata derivata da elementi di <code>folder</code> e di <code>exit_to_app</code>, che fanno parte
              dell'<a href="https://fonts.google.com/icons">Android Material icon set</a> e sono state rilasciate sotto <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
diff --git a/app/src/main/assets/pt-rBR/about_changelog.html b/app/src/main/assets/pt-rBR/about_changelog.html

index f9a97112ae142086ae382672796fa198d5a8ee49..be0fce9a0902f901c03f30619a47d804f2e11222 100644 (file)
--- a/app/src/main/assets/pt-rBR/about_changelog.html
+++ b/app/src/main/assets/pt-rBR/about_changelog.html
@@ -29,8 +29,8 @@
      </head>
  
      <body>
      </head>
  
      <body>
-        <h3>3.13.3 (código de versão 67)</h3>
-        <p>2 March 2023 - API mínimo 23, API alvo 33</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-android-3-13-3/">3.13.3</a> (código de versão 67)</h3>
+        <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=c5359b173d559fc154bf7e4bd8fd65c951c529b3">13 March 2023</a> - API mínimo 23, API alvo 33</p>
          <ul>
              <li>Fix a race condition that sometimes caused the <a href="https://redmine.stoutner.com/issues/963">current tab to not be the active tab</a>.</li>
          </ul>
          <ul>
              <li>Fix a race condition that sometimes caused the <a href="https://redmine.stoutner.com/issues/963">current tab to not be the active tab</a>.</li>
          </ul>
diff --git a/app/src/main/assets/pt-rBR/about_licenses.html b/app/src/main/assets/pt-rBR/about_licenses.html

index 21135069cd8d08bc358a018d8f0e2093ec9878d5..e2a2ea451285ea4e88ad209a9f210123eddc5c9a 100644 (file)
--- a/app/src/main/assets/pt-rBR/about_licenses.html
+++ b/app/src/main/assets/pt-rBR/about_licenses.html
@@ -65,7 +65,7 @@
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              are derived from <code>security</code> and <code>language</code>, which are part of the <a href="https://fonts.google.com/icons">Android Material icon set</a> and are released under the
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              are derived from <code>security</code> and <code>language</code>, which are part of the <a href="https://fonts.google.com/icons">Android Material icon set</a> and are released under the
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
-            The full text of the license is below. Modifications copyright 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The full text of the license is below. Modifications copyright 2016-2017,2021-2022 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
              The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> is derived from elements of <code>folder</code> and <code>exit_to_app</code>,
              which are part of the <a href="https://fonts.google.com/icons">Android Material icon set</a>
              The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> is derived from elements of <code>folder</code> and <code>exit_to_app</code>,
              which are part of the <a href="https://fonts.google.com/icons">Android Material icon set</a>
diff --git a/app/src/main/assets/ru/about_changelog.html b/app/src/main/assets/ru/about_changelog.html

index 16c173645697a6ebdc0d44cebe6747163de05ab6..cb401427d1f5ab1649f6a1650e4bd973d8caa8ed 100644 (file)
--- a/app/src/main/assets/ru/about_changelog.html
+++ b/app/src/main/assets/ru/about_changelog.html
@@ -27,8 +27,8 @@
      </head>
  
      <body>
      </head>
  
      <body>
-        <h3>3.13.3 (код версии 67)</h3>
-        <p>2 мая 2023 года - минимальный API 23, целевой API 33</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-android-3-13-3/">3.13.3</a> (код версии 67)</h3>
+        <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=c5359b173d559fc154bf7e4bd8fd65c951c529b3">13 мая 2023 года</a> - минимальный API 23, целевой API 33</p>
          <ul>
              <li>Исправлена ошибка, из-за которой <a href="https://redmine.stoutner.com/issues/963">текущая вкладка иногда не становилась активной</a>.</li>
          </ul>
          <ul>
              <li>Исправлена ошибка, из-за которой <a href="https://redmine.stoutner.com/issues/963">текущая вкладка иногда не становилась активной</a>.</li>
          </ul>
diff --git a/app/src/main/assets/ru/about_licenses.html b/app/src/main/assets/ru/about_licenses.html

index b0b91fddea85f0223f93b9a1ed380ff65bb2ad5e..8cf527f6b84f74b73ec73b2f5d91ebcd5b1bdbba 100644 (file)
--- a/app/src/main/assets/ru/about_licenses.html
+++ b/app/src/main/assets/ru/about_licenses.html
@@ -63,7 +63,7 @@
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              являются производными от <code>security</code> и <code>language</code>, которые являются частью <a href="https://fonts.google.com/icons">Android Material icon set</a> и выпущены под
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Полный текст лицензии приведен ниже.
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              являются производными от <code>security</code> и <code>language</code>, которые являются частью <a href="https://fonts.google.com/icons">Android Material icon set</a> и выпущены под
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Полный текст лицензии приведен ниже.
-            Модификации авторских прав 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            Модификации авторских прав 2016-2017,2021-2022 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
              Полученные изображения выпущены под <a href="https://www.gnu.org/licenses/gpl-3.0.html">лицензией GPLv3+</a>.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> являются производными от <code>folder</code> и <code>exit_to_app</code>, которые являются частью
              <a href="https://fonts.google.com/icons">Android Material icon set</a> и выпущены под <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
              Полученные изображения выпущены под <a href="https://www.gnu.org/licenses/gpl-3.0.html">лицензией GPLv3+</a>.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> являются производными от <code>folder</code> и <code>exit_to_app</code>, которые являются частью
              <a href="https://fonts.google.com/icons">Android Material icon set</a> и выпущены под <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
diff --git a/app/src/main/assets/tr/about_changelog.html b/app/src/main/assets/tr/about_changelog.html

index 4c0621ad9b9b06964da6b45543dd3911751cca0f..056a76c92cdff2f866eeb836ea8310f2ebfa823a 100644 (file)
--- a/app/src/main/assets/tr/about_changelog.html
+++ b/app/src/main/assets/tr/about_changelog.html
@@ -27,8 +27,8 @@
      </head>
  
      <body>
      </head>
  
      <body>
-        <h3>3.13.3 (version code 67)</h3>
-        <p>2 Mart 2023 - minimum API 23, target API 33</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-android-3-13-3/">3.13.3</a> (version code 67)</h3>
+        <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=c5359b173d559fc154bf7e4bd8fd65c951c529b3">13 Mart 2023</a> - minimum API 23, target API 33</p>
          <ul>
              <li>Fix a race condition that sometimes caused the <a href="https://redmine.stoutner.com/issues/963">current tab to not be the active tab</a>.</li>
          </ul>
          <ul>
              <li>Fix a race condition that sometimes caused the <a href="https://redmine.stoutner.com/issues/963">current tab to not be the active tab</a>.</li>
          </ul>
diff --git a/app/src/main/assets/tr/about_licenses.html b/app/src/main/assets/tr/about_licenses.html

index 9786536510718d165fce067d8ecb4f9993474561..8ffaee4bec26ff1955d985d53e550a50d0805f48 100644 (file)
--- a/app/src/main/assets/tr/about_licenses.html
+++ b/app/src/main/assets/tr/about_licenses.html
@@ -64,7 +64,7 @@
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a> altında yayınlanan ve
              <a href="https://fonts.google.com/icons">Android Material</a> simge setinin bir parçası olan <code>security</code> ve <code>language</code>'den elde edilmiştir.
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a> altında yayınlanan ve
              <a href="https://fonts.google.com/icons">Android Material</a> simge setinin bir parçası olan <code>security</code> ve <code>language</code>'den elde edilmiştir.
-            Lisansın tüm metni aşağıdadır. Değişikliklerin telif hakkı 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            Lisansın tüm metni aşağıdadır. Değişikliklerin telif hakkı 2016-2017,2021-2022 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
              Ortaya çıkan görüntüler <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+</a> lisansı altında yayınlandı.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a> altında yayınlanan ve
              <a href="https://fonts.google.com/icons">Android Material</a> simge setinin bir parçası olan <code>folder</code> ve <code>exit_to_app</code> elementlerinden elde edilmiştir.
              Ortaya çıkan görüntüler <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+</a> lisansı altında yayınlandı.</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a> altında yayınlanan ve
              <a href="https://fonts.google.com/icons">Android Material</a> simge setinin bir parçası olan <code>folder</code> ve <code>exit_to_app</code> elementlerinden elde edilmiştir.
diff --git a/app/src/main/assets/zh-rCN/about_changelog.html b/app/src/main/assets/zh-rCN/about_changelog.html

index 039831586b358b2c84576c6b909199b7f95238ef..6746266f5e3cd7627aa7b3837f7689815d84dd65 100644 (file)
--- a/app/src/main/assets/zh-rCN/about_changelog.html
+++ b/app/src/main/assets/zh-rCN/about_changelog.html
@@ -29,8 +29,8 @@
      </head>
  
      <body>
      </head>
  
      <body>
-        <h3>3.13.3 (version code 67)</h3>
-        <p>2 March 2023 - 最低支持API 23, 最高支持API 33</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-android-3-13-3/">3.13.3</a> (version code 67)</h3>
+        <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=c5359b173d559fc154bf7e4bd8fd65c951c529b3">13 March 2023</a> - 最低支持API 23, 最高支持API 33</p>
          <ul>
              <li>修复由<a href="https://redmine.stoutner.com/issues/963">引起的当前选项卡不工作场景</a>。</li>
          </ul>
          <ul>
              <li>修复由<a href="https://redmine.stoutner.com/issues/963">引起的当前选项卡不工作场景</a>。</li>
          </ul>
diff --git a/app/src/main/assets/zh-rCN/about_licenses.html b/app/src/main/assets/zh-rCN/about_licenses.html

index e137f654b245817641663423b43c7bb2cdbf3c2e..16635dc3a45684a2325b8cdfacf046b29c94b6cb 100644 (file)
--- a/app/src/main/assets/zh-rCN/about_licenses.html
+++ b/app/src/main/assets/zh-rCN/about_licenses.html
@@ -64,7 +64,7 @@
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              出自 <code>security</code>和<code>language</code>, <a href="https://fonts.google.com/icons">Android Material icon set</a>中的一部分，在
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>下发布。
          <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
              出自 <code>security</code>和<code>language</code>, <a href="https://fonts.google.com/icons">Android Material icon set</a>中的一部分，在
              <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>下发布。
-            完整的证书内容在下面。Modifications copyright 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            完整的证书内容在下面。Modifications copyright 2016-2017,2021-2022 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
              生成的图标在<a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>下发布。</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg>出自<code>folder</code>和<code>exit_to_app</code>,
              是<a href="https://fonts.google.com/icons">Android Material icon set</a>的一部分，
              生成的图标在<a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>下发布。</p>
          <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg>出自<code>folder</code>和<code>exit_to_app</code>,
              是<a href="https://fonts.google.com/icons">Android Material icon set</a>的一部分，
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java

index 05bb2f5874146baa3f2c1ddcfc21ffdcf3af1070..985414faa1a6706b1dbc2dee966ddd0b8784fd32 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java
@@ -1,5 +1,5 @@
  /*
  /*
- * Copyright 2016-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2016-2023 Soren Stoutner <soren@stoutner.com>.
   *
   * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
   *
   *
   * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
   *
@@ -625,12 +625,9 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma
                  // Get the checked bookmarks array list.
                  ArrayList<Integer> checkedBookmarksArrayList = savedInstanceState.getIntegerArrayList(CHECKED_BOOKMARKS_ARRAY_LIST);
  
                  // Get the checked bookmarks array list.
                  ArrayList<Integer> checkedBookmarksArrayList = savedInstanceState.getIntegerArrayList(CHECKED_BOOKMARKS_ARRAY_LIST);
  
-                // Check each previously checked bookmark in the list view.  When the minimum API >= 24 a `forEach()` command can be used instead.
-                if (checkedBookmarksArrayList != null) {
-                    for (int i = 0; i < checkedBookmarksArrayList.size(); i++) {
-                        bookmarksListView.setItemChecked(checkedBookmarksArrayList.get(i), true);
-                    }
-                }
+                // Check each previously checked bookmark in the list view.
+                if (checkedBookmarksArrayList != null)
+                    checkedBookmarksArrayList.forEach((position) -> bookmarksListView.setItemChecked(position, true));
              });
          }
  
              });
          }
  
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 3a3db0e9f7932682b992338f0b5debff151cc87e..39b95dca65d30d4ab5f35a3b31b1d47fd6969873 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -4359,7 +4359,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
              // Add the first tab.
              addNewTab("", true);
          } else {  // The activity has been restarted.
              // Add the first tab.
              addNewTab("", true);
          } else {  // The activity has been restarted.
-            // Restore each tab.  Once the minimum API >= 24, a `forEach()` command can be used.
+            // Restore each tab.
              for (int i = 0; i < savedStateArrayList.size(); i++) {
                  // Add a new tab.
                  tabLayout.addTab(tabLayout.newTab());
              for (int i = 0; i < savedStateArrayList.size(); i++) {
                  // Add a new tab.
                  tabLayout.addTab(tabLayout.newTab());
@@ -5333,9 +5333,11 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
  
          nestedScrollWebView.setWebViewClient(new WebViewClient() {
              // `shouldOverrideUrlLoading` makes this WebView the default handler for URLs inside the app, so that links are not kicked out to other apps.
  
          nestedScrollWebView.setWebViewClient(new WebViewClient() {
              // `shouldOverrideUrlLoading` makes this WebView the default handler for URLs inside the app, so that links are not kicked out to other apps.
-            // The deprecated `shouldOverrideUrlLoading` must be used until API >= 24.
              @Override
              @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest webResourceRequest) {
+                // Get the URL from the web resource request.
+                String url = webResourceRequest.getUrl().toString();
+
                  // Sanitize the url.
                  url = sanitizeUrl(url);
  
                  // Sanitize the url.
                  url = sanitizeUrl(url);
  
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt

index 514e3095a2abd6fb6ae40351354766dc3e045806..a8d86ecc6a243d1e2cf28f5decdb1009ce8c23fa 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt
@@ -1,5 +1,5 @@
  /*
  /*
- * Copyright 2017-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2017-2023 Soren Stoutner <soren@stoutner.com>.
   *
   * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
   *
   *
   * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
   *
@@ -19,7 +19,6 @@
  
  package com.stoutner.privacybrowser.activities
  
  
  package com.stoutner.privacybrowser.activities
  
-import android.os.Build
  import android.os.Bundle
  import android.text.SpannableStringBuilder
  import android.text.style.ForegroundColorSpan
  import android.os.Bundle
  import android.text.SpannableStringBuilder
  import android.text.style.ForegroundColorSpan
@@ -55,8 +54,6 @@ import com.stoutner.privacybrowser.helpers.UrlHelper
  import com.stoutner.privacybrowser.viewmodelfactories.WebViewSourceFactory
  import com.stoutner.privacybrowser.viewmodels.WebViewSource
  
  import com.stoutner.privacybrowser.viewmodelfactories.WebViewSourceFactory
  import com.stoutner.privacybrowser.viewmodels.WebViewSource
  
-import java.util.Locale
-
  // Define the public constants.
  const val CURRENT_URL = "current_url"
  const val USER_AGENT = "user_agent"
  // Define the public constants.
  const val CURRENT_URL = "current_url"
  const val USER_AGENT = "user_agent"
@@ -183,62 +180,53 @@ class ViewSourceActivity: AppCompatActivity(), UntrustedSslCertificateListener {
          // Set the swipe refresh background color.
          swipeRefreshLayout.setProgressBackgroundColorSchemeColor(colorBackgroundInt)
  
          // Set the swipe refresh background color.
          swipeRefreshLayout.setProgressBackgroundColorSchemeColor(colorBackgroundInt)
  
-        // Populate the locale string.
-        val localeString = if (Build.VERSION.SDK_INT >= 24) {  // SDK >= 24 has a list of locales.
-            // Get the list of locales.
-            val localeList = resources.configuration.locales
-
-            // Initialize a string builder to extract the locales from the list.
-            val localesStringBuilder = StringBuilder()
+        // Get the list of locales.
+        val localeList = resources.configuration.locales
  
  
-            // Initialize a `q` value, which is used by `WebView` to indicate the order of importance of the languages.
-            var q = 10
-
-            // Populate the string builder with the contents of the locales list.
-            for (i in 0 until localeList.size()) {
-                // Append a comma if there is already an item in the string builder.
-                if (i > 0) {
-                    localesStringBuilder.append(",")
-                }
+        // Initialize a string builder to extract the locales from the list.
+        val localesStringBuilder = StringBuilder()
  
  
-                // Get the locale from the list.
-                val locale = localeList[i]
+        // Initialize a `q` value, which is used by `WebView` to indicate the order of importance of the languages.
+        var q = 10
  
  
-                // Add the locale to the string.  `locale` by default displays as `en_US`, but WebView uses the `en-US` format.
-                localesStringBuilder.append(locale.language)
-                localesStringBuilder.append("-")
-                localesStringBuilder.append(locale.country)
+        // Populate the string builder with the contents of the locales list.
+        for (i in 0 until localeList.size()) {
+            // Append a comma if there is already an item in the string builder.
+            if (i > 0) {
+                localesStringBuilder.append(",")
+            }
  
  
-                // If not the first locale, append `;q=0.x`, which drops by .1 for each removal from the main locale until q=0.1.
-                if (q < 10) {
-                    localesStringBuilder.append(";q=0.")
-                    localesStringBuilder.append(q)
-                }
+            // Get the locale from the list.
+            val locale = localeList[i]
  
  
-                // Decrement `q` if it is greater than 1.
-                if (q > 1) {
-                    q--
-                }
+            // Add the locale to the string.  `locale` by default displays as `en_US`, but WebView uses the `en-US` format.
+            localesStringBuilder.append(locale.language)
+            localesStringBuilder.append("-")
+            localesStringBuilder.append(locale.country)
  
  
-                // Add a second entry for the language only portion of the locale.
-                localesStringBuilder.append(",")
-                localesStringBuilder.append(locale.language)
-
-                // Append `1;q=0.x`, which drops by .1 for each removal form the main locale until q=0.1.
+            // If not the first locale, append `;q=0.x`, which drops by .1 for each removal from the main locale until q=0.1.
+            if (q < 10) {
                  localesStringBuilder.append(";q=0.")
                  localesStringBuilder.append(q)
                  localesStringBuilder.append(";q=0.")
                  localesStringBuilder.append(q)
+            }
  
  
-                // Decrement `q` if it is greater than 1.
-                if (q > 1) {
-                    q--
-                }
+            // Decrement `q` if it is greater than 1.
+            if (q > 1) {
+                q--
              }
  
              }
  
-            // Store the populated string builder in the locale string.
-            localesStringBuilder.toString()
-        } else {  // SDK < 24 only has a primary locale.
-            // Store the locale in the locale string.
-            Locale.getDefault().toString()
+            // Add a second entry for the language only portion of the locale.
+            localesStringBuilder.append(",")
+            localesStringBuilder.append(locale.language)
+
+            // Append `1;q=0.x`, which drops by .1 for each removal form the main locale until q=0.1.
+            localesStringBuilder.append(";q=0.")
+            localesStringBuilder.append(q)
+
+            // Decrement `q` if it is greater than 1.
+            if (q > 1) {
+                q--
+            }
          }
  
          // Instantiate the proxy helper.
          }
  
          // Instantiate the proxy helper.
@@ -257,7 +245,7 @@ class ViewSourceActivity: AppCompatActivity(), UntrustedSslCertificateListener {
          updateLayout(currentUrl)
  
          // Instantiate the WebView source factory.
          updateLayout(currentUrl)
  
          // Instantiate the WebView source factory.
-        val webViewSourceFactory: ViewModelProvider.Factory = WebViewSourceFactory(currentUrl, userAgent, localeString, proxy, contentResolver, MainWebViewActivity.executorService)
+        val webViewSourceFactory: ViewModelProvider.Factory = WebViewSourceFactory(currentUrl, userAgent, localesStringBuilder.toString(), proxy, contentResolver, MainWebViewActivity.executorService)
  
          // Instantiate the WebView source view model class.
          webViewSource = ViewModelProvider(this, webViewSourceFactory)[WebViewSource::class.java]
  
          // Instantiate the WebView source view model class.
          webViewSource = ViewModelProvider(this, webViewSourceFactory)[WebViewSource::class.java]
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutWebViewFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutWebViewFragment.kt

index 8ce9e2253163b5aada9735376e1f2ac309c35a4e..96a475b5ff3df039a51d6022e4663e79782ef550 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutWebViewFragment.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutWebViewFragment.kt
@@ -1,5 +1,5 @@
  /*
  /*
- * Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2023 Soren Stoutner <soren@stoutner.com>.
   *
   * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
   *
   *
   * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
   *
@@ -21,7 +21,6 @@ package com.stoutner.privacybrowser.fragments
  
  import android.content.Intent
  import android.content.res.Configuration
  
  import android.content.Intent
  import android.content.res.Configuration
-import android.net.Uri
  import android.os.Build
  import android.os.Bundle
  import android.view.LayoutInflater
  import android.os.Build
  import android.os.Bundle
  import android.view.LayoutInflater
@@ -91,14 +90,13 @@ class AboutWebViewFragment : Fragment() {
  
          // Set a WebView client.
          tabWebView.webViewClient = object : WebViewClient() {
  
          // Set a WebView client.
          tabWebView.webViewClient = object : WebViewClient() {
-            // // Send external links back to the main Privacy Browser WebView.  The deprecated `shouldOverrideUrlLoading` must be used until API >= 24.
-            @Deprecated("Deprecated in Java")
-            override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
+            // Send external links back to the main Privacy Browser WebView.
+            override fun shouldOverrideUrlLoading(view: WebView, webResourceRequest: WebResourceRequest): Boolean {
                  // Create an intent to view the URL.
                  val urlIntent = Intent(Intent.ACTION_VIEW)
  
                  // Add the URL to the intent.
                  // Create an intent to view the URL.
                  val urlIntent = Intent(Intent.ACTION_VIEW)
  
                  // Add the URL to the intent.
-                urlIntent.data = Uri.parse(url)
+                urlIntent.data = webResourceRequest.url
  
                  // Make it so.
                  startActivity(urlIntent)
  
                  // Make it so.
                  startActivity(urlIntent)
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideWebViewFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideWebViewFragment.kt

index 62f17c5db43f29f114b84da33d3626050dd07ffe..5c8425cc328d34861515075e4246f8a77af83969 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideWebViewFragment.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideWebViewFragment.kt
@@ -1,5 +1,5 @@
  /*
  /*
- * Copyright 2016-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2016-2023 Soren Stoutner <soren@stoutner.com>.
   *
   * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
   *
   *
   * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
   *
@@ -21,7 +21,6 @@ package com.stoutner.privacybrowser.fragments
  
  import android.content.Intent
  import android.content.res.Configuration
  
  import android.content.Intent
  import android.content.res.Configuration
-import android.net.Uri
  import android.os.Build
  import android.os.Bundle
  import android.view.LayoutInflater
  import android.os.Build
  import android.os.Bundle
  import android.view.LayoutInflater
@@ -90,14 +89,13 @@ class GuideWebViewFragment : Fragment() {
  
          // Set a WebView client.
          tabWebView.webViewClient = object : WebViewClient() {
  
          // Set a WebView client.
          tabWebView.webViewClient = object : WebViewClient() {
-            // Send external links back to the main Privacy Browser WebView.  The deprecated `shouldOverrideUrlLoading` must be used until API >= 24.
-            @Deprecated("Deprecated in Java")
-            override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
+            // Send external links back to the main Privacy Browser WebView.
+            override fun shouldOverrideUrlLoading(view: WebView, webResourceRequest: WebResourceRequest): Boolean {
                  // Create an intent to view the URL.
                  val urlIntent = Intent(Intent.ACTION_VIEW)
  
                  // Add the URL to the intent.
                  // Create an intent to view the URL.
                  val urlIntent = Intent(Intent.ACTION_VIEW)
  
                  // Add the URL to the intent.
-                urlIntent.data = Uri.parse(url)
+                urlIntent.data = webResourceRequest.url
  
                  // Make it so.
                  startActivity(urlIntent)
  
                  // Make it so.
                  startActivity(urlIntent)
author	Soren Stoutner <soren@stoutner.com>
	Mon, 20 Mar 2023 22:05:32 +0000 (15:05 -0700)
committer	Soren Stoutner <soren@stoutner.com>
	Mon, 20 Mar 2023 22:05:32 +0000 (15:05 -0700)
app/build.gradle		patch \| blob \| history
app/src/main/assets/de/about_changelog.html		patch \| blob \| history
app/src/main/assets/de/about_licenses.html		patch \| blob \| history
app/src/main/assets/en/about_changelog.html		patch \| blob \| history
app/src/main/assets/en/about_licenses.html		patch \| blob \| history
app/src/main/assets/es/about_changelog.html		patch \| blob \| history
app/src/main/assets/es/about_licenses.html		patch \| blob \| history
app/src/main/assets/fr/about_changelog.html		patch \| blob \| history
app/src/main/assets/fr/about_licenses.html		patch \| blob \| history
app/src/main/assets/it/about_changelog.html		patch \| blob \| history
app/src/main/assets/it/about_licenses.html		patch \| blob \| history
app/src/main/assets/pt-rBR/about_changelog.html		patch \| blob \| history
app/src/main/assets/pt-rBR/about_licenses.html		patch \| blob \| history
app/src/main/assets/ru/about_changelog.html		patch \| blob \| history
app/src/main/assets/ru/about_licenses.html		patch \| blob \| history
app/src/main/assets/tr/about_changelog.html		patch \| blob \| history
app/src/main/assets/tr/about_licenses.html		patch \| blob \| history
app/src/main/assets/zh-rCN/about_changelog.html		patch \| blob \| history
app/src/main/assets/zh-rCN/about_licenses.html		patch \| blob \| history
app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java		patch \| blob \| history
app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java		patch \| blob \| history
app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt		patch \| blob \| history
app/src/main/java/com/stoutner/privacybrowser/fragments/AboutWebViewFragment.kt		patch \| blob \| history
app/src/main/java/com/stoutner/privacybrowser/fragments/GuideWebViewFragment.kt		patch \| blob \| history