From 44a7a1d29d8e4722e2ea522075878a13b89bcb52 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Thu, 17 Nov 2022 10:31:49 -0700 Subject: [PATCH] Fix a crash on new installs. https://redmine.stoutner.com/issues/925 --- app/src/main/assets/de/about_changelog.html | 4 +- app/src/main/assets/en/about_changelog.html | 4 +- app/src/main/assets/en/guide_interface.html | 2 +- app/src/main/assets/es/about_changelog.html | 4 +- app/src/main/assets/fr/about_changelog.html | 4 +- app/src/main/assets/it/about_changelog.html | 4 +- .../main/assets/pt-rBR/about_changelog.html | 4 +- .../main/assets/pt-rBR/guide_interface.html | 2 +- app/src/main/assets/ru/about_changelog.html | 4 +- app/src/main/assets/tr/about_changelog.html | 4 +- app/src/main/assets/tr/guide_interface.html | 2 +- .../activities/BookmarksActivity.java | 4 +- .../BookmarksDatabaseViewActivity.java | 2 +- .../activities/ImportExportActivity.java | 2 +- .../activities/MainWebViewActivity.java | 2 +- .../activities/RequestsActivity.java | 6 +- .../fragments/AboutVersionFragment.kt | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/xml/preferences.xml | 373 +++++++++--------- 19 files changed, 216 insertions(+), 215 deletions(-) diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html index 9518b993..e9a8fb9f 100644 --- a/app/src/main/assets/de/about_changelog.html +++ b/app/src/main/assets/de/about_changelog.html @@ -33,8 +33,8 @@ -

3.12 (Version Code 61)

16. November 2022 - Mindest-API 23, Ziel-API 33

3.12 (Version Code 61)

16. November 2022 - Mindest-API 23, Ziel-API 33

Add WebView DevTools to the navigation menu.
Make long-pressing a bookmark open it in a new foreground tab.

3.12 (version code 61)

16 November 2022 - minimum API 23, target API 33

3.12 (version code 61)

16 November 2022 - minimum API 23, target API 33

Add WebView DevTools to the navigation menu.
Make long-pressing a bookmark open it in a new foreground tab.

Bookmarks

The bookmark drawer may be opened by swiping from the right edge of the screen. - If Android's gesture navigation is enabled, + If Androidâs gesture navigation is enabled, the drawer may be opened by long-pressing on the edge of the screen until the drawer peaks out and then swiping it open. Sometimes it can be difficult to get the bookmarks drawer to reliably peak on devices with curved edges, so it is also possible to open the bookmarks drawer from the options menu.

3.12 (cÃ³digo de versiÃ³n 61)

16 de noviembre de 2022 - API mÃnimo 23, API objetivo 33

3.12 (cÃ³digo de versiÃ³n 61)

16 de noviembre de 2022 - API mÃnimo 23, API objetivo 33

AÃ±adir DevTools de WebView al menÃº de navegaciÃ³n.
Hacer que al pulsar prolongadamente un marcador se abra en una nueva pestaÃ±a de primer plano.

3.12 (version du code 61)

16 Novembre 2022 - API minimale : 23, API optimale : 33

3.12 (version du code 61)

16 Novembre 2022 - API minimale : 23, API optimale : 33

Ajout de l'accÃ¨s aux outils de dÃ©veloppement Webview dans le menu de navigation.
Une pression longue sur un favori permet de l'ouvrir dans un nouvel onglet au premier plan.

3.12 (versione codice 61)

16 Novembre 2022 - minima API 23, target API 33

3.12 (versione codice 61)

16 Novembre 2022 - minima API 23, target API 33

Add WebView DevTools to the navigation menu.
Make long-pressing a bookmark open it in a new foreground tab.

3.12 (version code 61)

16 November 2022 - API mÃnimo 23, API alvo 33

3.12 (version code 61)

16 November 2022 - API mÃnimo 23, API alvo 33

Add WebView DevTools to the navigation menu.
Make long-pressing a bookmark open it in a new foreground tab.

Bookmarks

3.12 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 61)

3.12 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 61)

Ð Ð¼ÐµÐ½Ñ Ð½Ð°Ð²Ð¸Ð³Ð°ÑÐ¸Ð¸ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ñ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÑ WebView DevTools.
ÐÐ»Ð¸ÑÐµÐ»ÑÐ½Ð¾Ðµ Ð½Ð°Ð¶Ð°ÑÐ¸Ðµ Ð½Ð° Ð·Ð°ÐºÐ»Ð°Ð´ÐºÑ Ð¾ÑÐºÑÐ¾ÐµÑ ÐµÐµ Ð² Ð½Ð¾Ð²Ð¾Ð¹ Ð²ÐºÐ»Ð°Ð´ÐºÐµ Ð½Ð° Ð¿ÐµÑÐµÐ´Ð½ÐµÐ¼ Ð¿Ð»Ð°Ð½Ðµ.

3.12 (version code 61)

16 November 2022 - minimum API 23, target API 33

3.12 (version code 61)

16 November 2022 - minimum API 23, target API 33

Add WebView DevTools to the navigation menu.
Make long-pressing a bookmark open it in a new foreground tab.

Bookmarks

. + * Copyright 2018-2022 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -25,7 +25,6 @@ import android.content.SharedPreferences; import android.database.Cursor; import android.database.MatrixCursor; import android.os.Bundle; -import android.preference.PreferenceManager; import android.view.View; import android.view.WindowManager; import android.widget.AdapterView; @@ -40,6 +39,7 @@ import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.DialogFragment; +import androidx.preference.PreferenceManager; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.adapters.RequestsArrayAdapter; @@ -290,4 +290,4 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi DialogFragment viewRequestDialogFragment = ViewRequestDialog.request(id, isLastRequest, selectedRequestStringArray); viewRequestDialogFragment.show(getSupportFragmentManager(), getString(R.string.request_details)); } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt index f4b673ea..6e5c0668 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt @@ -51,8 +51,8 @@ import androidx.webkit.WebViewCompat import com.google.android.material.snackbar.Snackbar -import com.stoutner.privacybrowser.R import com.stoutner.privacybrowser.BuildConfig +import com.stoutner.privacybrowser.R import com.stoutner.privacybrowser.asynctasks.SaveAboutVersionImage import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 573f7f9c..6f437d57 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -619,7 +619,7 @@ Swipe to refresh Some websites donât work well if swipe to refresh is enabled. Download with external app - External apps will not honor Privacy Browserâs proxy settings and will not have access to cookies + External apps do not honor Privacy Browserâs proxy settings and do not have access to cookies (meaning that it is unlikely that files downloaded from sites that require a login will work). Scroll the app bar Scroll the app bar off the top of the screen when the WebView scrolls down. diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 47fa1d64..9bbe6b3c 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -19,305 +19,306 @@ along with Privacy Browser Android. If not, see . --> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:android="http://schemas.android.com/apk/res/android"> + app:key="@string/privacy_category_key" + app:title="@string/privacy" > + app:key="@string/javascript_key" + app:title="@string/javascript" + app:summary="@string/javascript_preference_summary" + app:defaultValue="false" /> + app:key="@string/cookies_key" + app:title="@string/cookies" + app:summary="@string/cookies_preference_summary" + app:defaultValue="false" /> + app:key="@string/dom_storage_key" + app:title="@string/dom_storage_preference" + app:summary="@string/dom_storage_preference_summary" + app:defaultValue="false" /> + app:key="@string/save_form_data_key" + app:title="@string/save_form_data_preference" + app:summary="@string/save_form_data_preference_summary" + app:defaultValue="false" /> + app:key="@string/user_agent_key" + app:title="@string/user_agent" + app:entries="@array/translated_user_agent_names" + app:entryValues="@array/user_agent_names" + app:defaultValue="@string/user_agent_default_value" + app:icon="@drawable/user_agent" /> + app:key="@string/incognito_mode_key" + app:title="@string/incognito_mode" + app:summary="@string/incognito_mode_summary" + app:defaultValue="false" /> + app:key="@string/allow_screenshots_key" + app:title="@string/allow_screenshots" + app:summary="@string/allow_screenshots_summary" + app:defaultValue="false" /> + app:key="blocklists" + app:title="@string/blocklists" > + app:key="@string/easylist_key" + app:title="@string/easylist" + app:summary="@string/easylist_summary" + app:defaultValue="true" /> + app:key="@string/easyprivacy_key" + app:title="@string/easyprivacy" + app:summary="@string/easyprivacy_summary" + app:defaultValue="true" /> + app:key="@string/fanboys_annoyance_list_key" + app:title="@string/fanboys_annoyance_list" + app:summary="@string/fanboys_annoyance_list_summary" + app:defaultValue="true" /> + app:key="@string/fanboys_social_blocking_list_key" + app:title="@string/fanboys_social_blocking_list" + app:summary="@string/fanboys_social_blocking_list_summary" + app:defaultValue="true" /> + app:key="@string/ultralist_key" + app:title="@string/ultralist" + app:summary="@string/ultralist_summary" + app:defaultValue="true" /> + app:key="@string/ultraprivacy_key" + app:title="@string/ultraprivacy" + app:summary="@string/ultraprivacy_summary" + app:defaultValue="true" /> + app:key="@string/block_all_third_party_requests_key" + app:title="@string/block_all_third_party_requests" + app:summary="@string/block_all_third_party_requests_summary" + app:defaultValue="false" /> + app:key="url_modification" + app:title="@string/url_modification" > + app:key="@string/tracking_queries_key" + app:title="@string/tracking_queries" + app:summary="@string/tracking_queries_summary" + app:defaultValue="true" /> + app:key="@string/amp_redirects_key" + app:title="@string/amp_redirects" + app:summary="@string/amp_redirects_summary" + app:defaultValue="true" /> + app:key="search_category" + app:title="@string/search" > + app:key="@string/search_key" + app:title="@string/search" + app:entries="@array/search_entries" + app:entryValues="@array/search_entry_values" + app:defaultValue="@string/search_default_value" + app:icon="@drawable/search" /> + app:key="proxy_category" + app:title="@string/proxy" > + app:key="@string/proxy_key" + app:title="@string/proxy" + app:entries="@array/proxy_entries" + app:entryValues="@array/proxy_entry_values" + app:defaultValue="@string/proxy_default_value" /> + app:key="full_screen" + app:title="@string/full_screen" > + app:key="@string/full_screen_browsing_mode_key" + app:title="@string/full_screen_browsing_mode" + app:summary="@string/full_screen_browsing_mode_summary" + app:defaultValue="false" /> + app:key="@string/hide_app_bar_key" + app:title="@string/hide_app_bar" + app:summary="@string/hide_app_bar_summary" + app:defaultValue="true" /> + app:key="@string/clear_and_exit_category_key" + app:title="@string/clear_and_exit" > + app:key="@string/clear_everything_key" + app:title="@string/clear_everything" + app:summary="@string/clear_everything_summary" + app:defaultValue="true" /> + app:key="@string/clear_cookies_key" + app:title="@string/clear_cookies_preference" + app:summary="@string/clear_cookies_summary" + app:defaultValue="true" /> + app:key="@string/clear_dom_storage_key" + app:title="@string/clear_dom_storage_preference" + app:summary="@string/clear_dom_storage_summary" + app:defaultValue="true" /> + app:key="@string/clear_form_data_key" + app:title="@string/clear_form_data_preference" + app:summary="@string/clear_form_data_summary" + app:defaultValue="true" /> + app:key="@string/clear_logcat_key" + app:title="@string/clear_logcat" + app:summary="@string/clear_logcat_summary" + app:defaultValue="true" /> + app:key="@string/clear_cache_key" + app:title="@string/clear_cache" + app:summary="@string/clear_cache_summary" + app:defaultValue="true" /> + app:key="general" + app:title="@string/general" > + app:icon="@drawable/home" /> + app:icon="@drawable/font_size" /> + app:key="@string/open_intents_in_new_tab_key" + app:title="@string/open_intents_in_new_tab" + app:summary="@string/open_intents_in_new_tab_summary" + app:defaultValue="true" /> + app:key="@string/swipe_to_refresh_key" + app:title="@string/swipe_to_refresh" + app:summary="@string/swipe_to_refresh_summary" + app:defaultValue="true" /> + app:key="@string/download_with_external_app_key" + app:title="@string/download_with_external_app" + app:summary="@string/download_with_external_app_summary" + app:defaultValue="false" /> + app:key="@string/scroll_app_bar_key" + app:title="@string/scroll_app_bar" + app:summary="@string/scroll_app_bar_summary" + app:defaultValue="true" /> + app:key="@string/bottom_app_bar_key" + app:title="@string/bottom_app_bar" + app:summary="@string/bottom_app_bar_summary" + app:defaultValue="false" /> + app:key="@string/display_additional_app_bar_icons_key" + app:title="@string/display_additional_app_bar_icons" + app:summary="@string/display_additional_app_bar_icons_summary" + app:defaultValue="false" /> + app:key="@string/app_theme_key" + app:title="@string/app_theme" + app:entries="@array/app_theme_entries" + app:entryValues="@array/app_theme_entry_values" + app:defaultValue="@string/app_theme_default_value" + app:icon="@drawable/app_theme" /> + app:key="@string/webview_theme_key" + app:title="@string/webview_theme" + app:entries="@array/webview_theme_entries" + app:entryValues="@array/webview_theme_entry_values" + app:defaultValue="@string/webview_theme_default_value" /> + app:key="@string/wide_viewport_key" + app:title="@string/wide_viewport_preference" + app:summary="@string/wide_viewport_summary" + app:defaultValue="true" /> + app:key="@string/display_webpage_images_key" + app:title="@string/display_webpage_images" + app:summary="@string/display_webpage_images_summary" + app:defaultValue="true" /> -- 2.43.0

3.12 (Version Code 61)

3.12 (Version Code 61)

3.12 (version code 61)

3.12 (version code 61)

Bookmarks

3.12 (cÃ³digo de versiÃ³n 61)

3.12 (cÃ³digo de versiÃ³n 61)

3.12 (version du code 61)

3.12 (version du code 61)

3.12 (versione codice 61)

3.12 (versione codice 61)

3.12 (version code 61)

3.12 (version code 61)

Bookmarks

3.12 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 61)

3.12 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 61)

3.12 (version code 61)

3.12 (version code 61)

Bookmarks

3.12 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 61)

3.12 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 61)