]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/commitdiff
projects / PrivacyBrowserAndroid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0692296)
Fix custom user agents. https://redmine.stoutner.com/issues/810
authorSoren Stoutner <soren@stoutner.com>
Mon, 28 Feb 2022 23:31:31 +0000 (16:31 -0700)
committerSoren Stoutner <soren@stoutner.com>
Mon, 28 Feb 2022 23:31:31 +0000 (16:31 -0700)
app/src/main/assets/de/about_changelog.html patch | blob | history
app/src/main/assets/en/about_changelog.html patch | blob | history
app/src/main/assets/es/about_changelog.html patch | blob | history
app/src/main/assets/fr/about_changelog.html patch | blob | history
app/src/main/assets/it/about_changelog.html patch | blob | history
app/src/main/assets/pt-rBR/about_changelog.html patch | blob | history
app/src/main/assets/ru/about_changelog.html patch | blob | history
app/src/main/assets/tr/about_changelog.html patch | blob | history
app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java patch | blob | history
app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java patch | blob | history
fastlane/metadata/android/en-US/changelogs/59.txt [new file with mode: 0644] patch | blob

diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html
index 2ecd0eb6d785412f17c11ceda91539168e32e763..94fdaea6de56029eba25aa15e5cf16d653029efa 100644 (file)
--- a/app/src/main/assets/de/about_changelog.html
+++ b/app/src/main/assets/de/about_changelog.html
@@ -33,6 +33,12 @@
     </head>
 
     <body>
+        <h3>3.10.1 (version code 59)</h3>
+        <p>28. Februar 2022 - Mindest-API 23, Ziel-API 31</p>
+        <ul>
+            <li>Fix a crash when opening the <a href="https://redmine.stoutner.com/issues/808">Import/Export activity</a>.</li>
+        </ul>
+
         <h3><a href="https://www.stoutner.com/privacy-browser-3-10/">3.10</a> (version code 58)</h3>
         <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=b0f0322c62a5cd25e587f1760a33fcf60c279954">25. Februar 2022</a> - Mindest-API 23, Ziel-API 31</p>
         <ul>
diff --git a/app/src/main/assets/en/about_changelog.html b/app/src/main/assets/en/about_changelog.html
index 9b000708bb4b87bc82096001092329ad68788395..8337ba2b58da11f1aa1e31963fad418c1253c828 100644 (file)
--- a/app/src/main/assets/en/about_changelog.html
+++ b/app/src/main/assets/en/about_changelog.html
@@ -27,6 +27,12 @@
     </head>
 
     <body>
+        <h3>3.10.1 (version code 59)</h3>
+        <p>28 February 2022 - minimum API 23, target API 31</p>
+        <ul>
+            <li>Fix a crash when opening the <a href="https://redmine.stoutner.com/issues/808">Import/Export activity</a>.</li>
+        </ul>
+
         <h3><a href="https://www.stoutner.com/privacy-browser-3-10/">3.10</a> (version code 58)</h3>
         <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=b0f0322c62a5cd25e587f1760a33fcf60c279954">25 February 2022</a> - minimum API 23, target API 31</p>
         <ul>
diff --git a/app/src/main/assets/es/about_changelog.html b/app/src/main/assets/es/about_changelog.html
index 9a3c4fc555975025ad71a55a0c77007f27dc94d5..a27b3b0e886799f9839c1e3e9fe8c8a6d8e9bcb4 100644 (file)
--- a/app/src/main/assets/es/about_changelog.html
+++ b/app/src/main/assets/es/about_changelog.html
@@ -29,6 +29,12 @@
     </head>
 
     <body>
+        <h3>3.10.1 (código de versión 59)</h3>
+        <p>28 de febrero de 2022 - API mínimo 23, API objetivo 31</p>
+        <ul>
+            <li>Fix a crash when opening the <a href="https://redmine.stoutner.com/issues/808">Import/Export activity</a>.</li>
+        </ul>
+
         <h3><a href="https://www.stoutner.com/privacy-browser-3-10/">3.10</a> (código de versión 58)</h3>
         <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=b0f0322c62a5cd25e587f1760a33fcf60c279954">25 de febrero de 2022</a> - API mínimo 23, API objetivo 31</p>
         <ul>
diff --git a/app/src/main/assets/fr/about_changelog.html b/app/src/main/assets/fr/about_changelog.html
index d14ec277817645288a9426e77cae7341cd814dd8..4615edef34970883e6106a1965544e6c7d483265 100644 (file)
--- a/app/src/main/assets/fr/about_changelog.html
+++ b/app/src/main/assets/fr/about_changelog.html
@@ -29,6 +29,12 @@
     </head>
 
     <body>
+        <h3>3.10.1 (version du code 59)</h3>
+        <p>28 Février 2022 - API minimale : 23, API optimale : 31</p>
+        <ul>
+            <li>Fix a crash when opening the <a href="https://redmine.stoutner.com/issues/808">Import/Export activity</a>.</li>
+        </ul>
+
         <h3><a href="https://www.stoutner.com/privacy-browser-3-10/">3.10</a> (version du code 58)</h3>
         <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=b0f0322c62a5cd25e587f1760a33fcf60c279954">25 Février 2022</a> - API minimale : 23, API optimale : 31</p>
         <ul>
diff --git a/app/src/main/assets/it/about_changelog.html b/app/src/main/assets/it/about_changelog.html
index b81824a363a6b57e812c7f76d9d7f0684d1e24f2..b0f2e9ed49b1fbfcb587b122ff2b9eeae89d6e5e 100644 (file)
--- a/app/src/main/assets/it/about_changelog.html
+++ b/app/src/main/assets/it/about_changelog.html
@@ -29,6 +29,12 @@
     </head>
 
     <body>
+        <h3>3.10.1 (versione codice 59)</h3>
+        <p>28 Febbraio 2022 - minima API 23, target API 31</p>
+        <ul>
+            <li>Fix a crash when opening the <a href="https://redmine.stoutner.com/issues/808">Import/Export activity</a>.</li>
+        </ul>
+
         <h3><a href="https://www.stoutner.com/privacy-browser-3-10/">3.10</a> (versione codice 58)</h3>
         <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=b0f0322c62a5cd25e587f1760a33fcf60c279954">25 Febbraio 2022</a> - minima API 23, target API 31</p>
         <ul>
diff --git a/app/src/main/assets/pt-rBR/about_changelog.html b/app/src/main/assets/pt-rBR/about_changelog.html
index 058f4e0976785dd4d487e0376baa16a26769a1c0..1479884d2901eac286040f87394a723319ea63d1 100644 (file)
--- a/app/src/main/assets/pt-rBR/about_changelog.html
+++ b/app/src/main/assets/pt-rBR/about_changelog.html
@@ -29,6 +29,12 @@
     </head>
 
     <body>
+        <h3>3.10.1 (código da versão 59)</h3>
+        <p>28 February 2022 - minimum API 23, target API 31</p>
+        <ul>
+            <li>Fix a crash when opening the <a href="https://redmine.stoutner.com/issues/808">Import/Export activity</a>.</li>
+        </ul>
+
         <h3><a href="https://www.stoutner.com/privacy-browser-3-10/">3.10</a> (código da versão 58)</h3>
         <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=b0f0322c62a5cd25e587f1760a33fcf60c279954">25 February 2022</a> - minimum API 23, target API 31</p>
         <ul>
diff --git a/app/src/main/assets/ru/about_changelog.html b/app/src/main/assets/ru/about_changelog.html
index d1956a3189ad549dd0a219bc259973388f9082c7..bbf1e3821ffa67ef93c313ed77b81fad7482ed6b 100644 (file)
--- a/app/src/main/assets/ru/about_changelog.html
+++ b/app/src/main/assets/ru/about_changelog.html
@@ -27,6 +27,12 @@
     </head>
 
     <body>
+        <h3>3.10.1 (код версии 59)</h3>
+        <p>28 февраля 2022 года - минимальный API 23, целевой API 31</p>
+        <ul>
+            <li>Fix a crash when opening the <a href="https://redmine.stoutner.com/issues/808">Import/Export activity</a>.</li>
+        </ul>
+
         <h3><a href="https://www.stoutner.com/privacy-browser-3-10/">3.10</a> (код версии 58)</h3>
         <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=b0f0322c62a5cd25e587f1760a33fcf60c279954">25 февраля 2022 года</a> - минимальный API 23, целевой API 31</p>
         <ul>
diff --git a/app/src/main/assets/tr/about_changelog.html b/app/src/main/assets/tr/about_changelog.html
index b026e58d203dff2684732893d7b9ad70ad6f25c3..a54574944387e6ed3c8fae07e9c07d5956e6ca2c 100644 (file)
--- a/app/src/main/assets/tr/about_changelog.html
+++ b/app/src/main/assets/tr/about_changelog.html
@@ -27,6 +27,12 @@
     </head>
 
     <body>
+        <h3>3.10.1 (version code 59)</h3>
+        <p>28 Şubat 2022 - minimum API 23, target API 31</p>
+        <ul>
+            <li>Fix a crash when opening the <a href="https://redmine.stoutner.com/issues/808">Import/Export activity</a>.</li>
+        </ul>
+
         <h3><a href="https://www.stoutner.com/privacy-browser-3-10/">3.10</a> (version code 58)</h3>
         <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=b0f0322c62a5cd25e587f1760a33fcf60c279954">25 Şubat 2022</a> - minimum API 23, target API 31</p>
         <ul>
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 6c605828f8a59d68342628e5e3d0e3e170f0b5d8..d592b993d7c5fc8f097ee25e0758b0b04d753a04 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -204,10 +204,10 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
     // The user agent constants are public static so they can be accessed from `SettingsFragment`, `DomainsActivity`, and `DomainSettingsFragment`.
     public final static int UNRECOGNIZED_USER_AGENT = -1;
     public final static int SETTINGS_WEBVIEW_DEFAULT_USER_AGENT = 1;
-    public final static int SETTINGS_CUSTOM_USER_AGENT = 12;
+    public final static int SETTINGS_CUSTOM_USER_AGENT = 11;
     public final static int DOMAINS_SYSTEM_DEFAULT_USER_AGENT = 0;
     public final static int DOMAINS_WEBVIEW_DEFAULT_USER_AGENT = 2;
-    public final static int DOMAINS_CUSTOM_USER_AGENT = 13;
+    public final static int DOMAINS_CUSTOM_USER_AGENT = 12;
 
     // Define the start activity for result request codes.  The public static entry is accessed from `OpenDialog()`.
     private final int BROWSE_FILE_UPLOAD_REQUEST_CODE = 0;
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
index 1ce0e3cccd5a7668b52f85738652ec8692f344a7..45e2b035a0d16c9f5a0e40e2d2141a63b3425f92 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
@@ -601,7 +601,8 @@ public class DomainSettingsFragment extends Fragment {
                     // Get the user agent string from the user agent data array.
                     userAgentTextView.setText(userAgentDataArray[defaultUserAgentArrayPosition]);
             }
-        } else if (userAgentArrayPosition == MainWebViewActivity.UNRECOGNIZED_USER_AGENT) {  // A custom user agent is stored in the current user agent name.
+        } else if (userAgentArrayPosition == MainWebViewActivity.UNRECOGNIZED_USER_AGENT || currentUserAgentName.equals(getString(R.string.custom_user_agent))) {
+            // A custom user agent is stored in the current user agent name.  The second check is necessary in case the user did not change the default custom text.
             // Set the user agent spinner to `Custom user agent`.
             userAgentSpinner.setSelection(MainWebViewActivity.DOMAINS_CUSTOM_USER_AGENT);
 
diff --git a/fastlane/metadata/android/en-US/changelogs/59.txt b/fastlane/metadata/android/en-US/changelogs/59.txt
new file mode 100644 (file)
index 0000000..08f4d9a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/59.txt
@@ -0,0 +1 @@
+• Fix a crash when opening the Import/Export activity.
\ No newline at end of file
A web browser that respects your privacy.