From 247b22a2fb031f8b790c908e8d29daaa2d1a3472 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Mon, 28 Feb 2022 16:31:31 -0700 Subject: [PATCH] Fix custom user agents. https://redmine.stoutner.com/issues/810 --- app/src/main/assets/de/about_changelog.html | 6 ++++++ app/src/main/assets/en/about_changelog.html | 6 ++++++ app/src/main/assets/es/about_changelog.html | 6 ++++++ app/src/main/assets/fr/about_changelog.html | 6 ++++++ app/src/main/assets/it/about_changelog.html | 6 ++++++ app/src/main/assets/pt-rBR/about_changelog.html | 6 ++++++ app/src/main/assets/ru/about_changelog.html | 6 ++++++ app/src/main/assets/tr/about_changelog.html | 6 ++++++ .../privacybrowser/activities/MainWebViewActivity.java | 4 ++-- .../privacybrowser/fragments/DomainSettingsFragment.java | 3 ++- fastlane/metadata/android/en-US/changelogs/59.txt | 1 + 11 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/59.txt diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html index 2ecd0eb6..94fdaea6 100644 --- a/app/src/main/assets/de/about_changelog.html +++ b/app/src/main/assets/de/about_changelog.html @@ -33,6 +33,12 @@ +

3.10.1 (version code 59)

28. Februar 2022 - Mindest-API 23, Ziel-API 31

Fix a crash when opening the Import/Export activity.

3.10 (version code 58)

25. Februar 2022 - Mindest-API 23, Ziel-API 31

3.10.1 (version code 59)

28 February 2022 - minimum API 23, target API 31

Fix a crash when opening the Import/Export activity.

3.10 (version code 58)

25 February 2022 - minimum API 23, target API 31

3.10.1 (cÃ³digo de versiÃ³n 59)

28 de febrero de 2022 - API mÃnimo 23, API objetivo 31

Fix a crash when opening the Import/Export activity.

3.10 (cÃ³digo de versiÃ³n 58)

25 de febrero de 2022 - API mÃnimo 23, API objetivo 31

3.10.1 (version du code 59)

28 FÃ©vrier 2022 - API minimale : 23, API optimale : 31

Fix a crash when opening the Import/Export activity.

3.10 (version du code 58)

25 FÃ©vrier 2022 - API minimale : 23, API optimale : 31

3.10.1 (versione codice 59)

28 Febbraio 2022 - minima API 23, target API 31

Fix a crash when opening the Import/Export activity.

3.10 (versione codice 58)

25 Febbraio 2022 - minima API 23, target API 31

3.10.1 (cÃ³digo da versÃ£o 59)

28 February 2022 - minimum API 23, target API 31

Fix a crash when opening the Import/Export activity.

3.10 (cÃ³digo da versÃ£o 58)

25 February 2022 - minimum API 23, target API 31

3.10.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 59)

Fix a crash when opening the Import/Export activity.

3.10 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 58)

3.10.1 (version code 59)

28 Åubat 2022 - minimum API 23, target API 31

Fix a crash when opening the Import/Export activity.

3.10 (version code 58)

25 Åubat 2022 - minimum API 23, target API 31

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 6c605828..d592b993 100644 --- 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 1ce0e3cc..45e2b035 100644 --- 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 index 00000000..08f4d9a6 --- /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 -- 2.43.0

3.10.1 (version code 59)

3.10 (version code 58)

3.10.1 (version code 59)

3.10 (version code 58)

3.10.1 (cÃ³digo de versiÃ³n 59)

3.10 (cÃ³digo de versiÃ³n 58)

3.10.1 (version du code 59)

3.10 (version du code 58)

3.10.1 (versione codice 59)

3.10 (versione codice 58)

3.10.1 (cÃ³digo da versÃ£o 59)

3.10 (cÃ³digo da versÃ£o 58)

3.10.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 59)

3.10 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 58)

3.10.1 (version code 59)

3.10 (version code 58)

3.10.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 59)

3.10 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 58)