From eac401700379e6ac5e6b0b696b932354001ef738 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Fri, 18 Nov 2022 13:47:15 -0700 Subject: [PATCH] Fix WebView's dark mode on API 29-32. https://redmine.stoutner.com/issues/927 --- app/src/main/assets/de/about_changelog.html | 6 +- app/src/main/assets/en/about_changelog.html | 8 +- .../main/assets/en/guide_local_storage.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 | 8 +- .../main/assets/pt-rBR/about_changelog.html | 122 +++++++-------- app/src/main/assets/pt-rBR/about_links.html | 2 +- .../assets/pt-rBR/guide_local_storage.html | 19 +-- .../assets/pt-rBR/guide_tracking_ids.html | 14 +- app/src/main/assets/ru/about_changelog.html | 6 +- app/src/main/assets/tr/about_changelog.html | 8 +- .../main/assets/tr/guide_local_storage.html | 2 +- .../activities/MainWebViewActivity.java | 145 ++---------------- .../fragments/DomainSettingsFragment.kt | 5 + .../fragments/SettingsFragment.kt | 17 +- app/src/main/res/values-pt-rBR/strings.xml | 12 ++ app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/preferences.xml | 2 +- .../metadata/android/it-IT/changelogs/62.txt | 1 + .../metadata/android/pt-BR/changelogs/60.txt | 13 ++ .../metadata/android/pt-BR/changelogs/62.txt | 1 + 22 files changed, 165 insertions(+), 237 deletions(-) create mode 100644 fastlane/metadata/android/it-IT/changelogs/62.txt create mode 100644 fastlane/metadata/android/pt-BR/changelogs/60.txt create mode 100644 fastlane/metadata/android/pt-BR/changelogs/62.txt diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html index 2c5cbc16..48569244 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.1 (Version Code 62)

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

3.12.1 (Version Code 62)

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

Fix a crash on new installs of Privacy Browser.

@@ -52,7 +52,7 @@

Delete the Service Worker directory after every page load.

Restrict the file provider to a subdirectory of the cache directory.

Bump the target API to 33 (Android 13).

Implement forcing WebView's dark mode on Android 13.

Implement forcing WebViewâs dark mode on Android 13.

Implement a number diff --git a/app/src/main/assets/en/about_changelog.html b/app/src/main/assets/en/about_changelog.html index 283c5776..1500331c 100644 --- a/app/src/main/assets/en/about_changelog.html +++ b/app/src/main/assets/en/about_changelog.html @@ -27,8 +27,8 @@ -

3.12.1 (version code 62)

17 November 2022 - minimum API 23, target API 33

3.12.1 (version code 62)

17 November 2022 - minimum API 23, target API 33

Fix a crash on new installs of Privacy Browser.

@@ -46,7 +46,7 @@

Delete the Service Worker directory after every page load.

Restrict the file provider to a subdirectory of the cache directory.

Bump the target API to 33 (Android 13).

Implement forcing WebView's dark mode on Android 13.

Implement forcing WebViewâs dark mode on Android 13.

Implement a number @@ -830,7 +830,7 @@

Update launcher icon to make it bigger.
Replace all toast messages with snackbars.
Don't update the URL box if the user is typing in it.
Donât update the URL box if the user is typing in it.
Bump the minimum API from 10 to 15. Privacy Browser was crashing on load in API 10.

diff --git a/app/src/main/assets/en/guide_local_storage.html b/app/src/main/assets/en/guide_local_storage.html index 05d5a9b4..a1ccf604 100644 --- a/app/src/main/assets/en/guide_local_storage.html +++ b/app/src/main/assets/en/guide_local_storage.html @@ -43,7 +43,7 @@

Almost all websites with logins require cookies to be enabled for a user to log in. That is how they make sure it is still you as you move from page to page on the site, and is, in my opinion, the only legitimate use for cookies.

Android's System WebView treats cookies as an app-level setting, meaning that cookies are either on or off for all tabs in Privacy Browser. +

Androidâs System WebView treats cookies as an app-level setting, meaning that cookies are either on or off for all tabs in Privacy Browser. The result is that the cookies setting for whatever tab is currently displayed controls the cookies setting for all the background tabs as well. If you have a tab in that background that has cookies enabled so that you can be logged into a website, and switch to a tab that doesn't have cookies enabled, it disabled cookies for all the tabs. If the background tab makes a request, for example, to see if there is updated information, that request will be sent without cookies, which will cause the website to log you out. diff --git a/app/src/main/assets/es/about_changelog.html b/app/src/main/assets/es/about_changelog.html index 47985fa2..4807918f 100644 --- a/app/src/main/assets/es/about_changelog.html +++ b/app/src/main/assets/es/about_changelog.html @@ -29,8 +29,8 @@ -

3.12.1 (cÃ³digo de versiÃ³n 62)

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

3.12.1 (cÃ³digo de versiÃ³n 62)

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

Corregir un fallo en nuevas instalaciones de Navegador Privado.

diff --git a/app/src/main/assets/fr/about_changelog.html b/app/src/main/assets/fr/about_changelog.html index aeb633db..e33374f6 100644 --- a/app/src/main/assets/fr/about_changelog.html +++ b/app/src/main/assets/fr/about_changelog.html @@ -29,8 +29,8 @@ -

3.12.1 (version code 62)

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

3.12.1 (version code 62)

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

Fix a crash on new installs of Privacy Browser.

diff --git a/app/src/main/assets/it/about_changelog.html b/app/src/main/assets/it/about_changelog.html index 0dc9442a..48b35a0a 100644 --- a/app/src/main/assets/it/about_changelog.html +++ b/app/src/main/assets/it/about_changelog.html @@ -29,10 +29,10 @@ -

3.12.1 (versione codice 62)

17 Novembre 2022 - minima API 23, target API 33

3.12.1 (versione codice 62)

17 Novembre 2022 - minima API 23, target API 33

Fix a crash on new installs of Privacy Browser.
Correzione di un crash per le nuove installazioni di Privacy Browser.

3.12 (versione codice 61)

@@ -857,7 +857,7 @@

Update launcher icon to make it bigger.
Replace all toast messages with snackbars.
Don't update the URL box if the user is typing in it.
Donât update the URL box if the user is typing in it.
Bump the minimum API from 10 to 15. Privacy Browser was crashing on load in API 10.

diff --git a/app/src/main/assets/pt-rBR/about_changelog.html b/app/src/main/assets/pt-rBR/about_changelog.html index 4f7baf11..fb685b43 100644 --- a/app/src/main/assets/pt-rBR/about_changelog.html +++ b/app/src/main/assets/pt-rBR/about_changelog.html @@ -29,56 +29,56 @@ -

3.12.1 (version code 62)

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

Fix a crash on new installs of Privacy Browser.

- -

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.
Add per-app language support.
Fix a crash if Add Domain Settings is called on an empty tab.
Improve the night mode red text and icon color.
Detect I2P installations from Google Play.
Implement a bottom app bar in Settings.
Delete the Service Worker directory after every page load.
Restrict the file provider to a subdirectory of the cache directory.
Bump the target API to 33 (Android 13).
Implement forcing WebView's dark mode on Android 13.
Implement - a - number - of - minor - improvements.
Fix a number - of - minor +
3.12.1 (cÃ³digo de versÃ£o 62)
+
17 de novembro de 2022 - API mÃnimo 23, API alvo 33
+
- Corrigida uma falha em novas instalaÃ§Ãµes do Privacy Browser.
+ +
3.12 (cÃ³digo de versÃ£o 61)
+
16 de novembro de 2022 - API mÃnimo 23, API alvo 33
+
- Adiciona WebView DevTools ao menu de navegaÃ§Ã£o.
- FaÃ§a um pressionamento longo de um marcador para abri-lo em uma nova guia de primeiro plano.
- Adiciona suporte a idiomas por aplicativo.
- Corrijida uma falha se o Adicionar ConfiguraÃ§Ãµes de DomÃnio for chamado em uma guia vazia.
- Melhorar o modo noturno vermelho texto e cor do Ãcone.
- Detectar instalaÃ§Ãµes I2P do Google Play.
- Implemente uma barra de aplicativos inferior em ConfiguraÃ§Ãµes.
- Exclua o diretÃ³rio do Service Worker apÃ³s cada carregamento de pÃ¡gina.
- Restringir o provedor de arquivos a um subdiretÃ³rio do diretÃ³rio de cache.
- Use a API de destino para 33 (Android 13).
- Implementar a imposiÃ§Ã£o do modo escuro do WebView no Android 13.
- Implementado + um + nÃºmero + menor + de + melhorias.
- Corrigido um nÃºmero + menor + de bugs.
- TraduÃ§Ã£o atualizada para o portuguÃªs do Brasil fornecida por Thiago Nazareno ConceiÃ§Ã£o Silva de Jesus.
3.11 (cÃ³digo da versÃ£o 60)
-
30 Julho 2022 - API mÃnimo 23, API alvo 32
-
- Create an option to use the default X-Requested-With header.
- Block all the URL query trackers listed at privacytests.org.
- Add a Share Message option.
- Fix a bug that caused the bottom app bar to cover part of the website.
- Fix duplicate tabs sometimes being opened on restart.
- Display the bookmark opened in new tab snackbar above the bookmarks drawer.
- Add the kernel version to About > Version.
- Preserve the current bookmarks folder on restart.
- Change the default value of the custom proxy URL to socks://localhost:9050.
- Add various - updates to the Guide.
- Make several small - UI improvements.
- Bump the target API to 32 (Android 12L).
3.9 (cÃ³digo da versÃ£o 57)
-
27 November 2021 - API mÃnimo 19, API alvo 31
+
27 de novembro de 2021 - API mÃnimo 19, API alvo 31
- Simplificadas as caixas de diÃ¡logo de salvamento.
- Exibe o nome do arquivo salvo nas barras de notificaÃ§Ã£o flutuantes.
3.8.1 (cÃ³digo da versÃ£o 56)
-
29 Junho 2021 - API mÃnimo 19, API alvo 30
+
29 de junho de 2021 - API mÃnimo 19, API alvo 30
- Removido Startpage e colocado Mojeek como a pÃ¡gina inicial padrÃ£o e motor de busca.
3.8 (cÃ³digo da versÃ£o 55)
-
24 Junho 2021 - API mÃnimo 19, API alvo 30
+
24 de junho de 2021 - API mÃnimo 19, API alvo 30
- Adicionado uma opÃ§Ã£o para mover a barra de aplicativos para a parte inferior.
- Reimplementado o salvamento de arquivos da web.
3.6.1 (cÃ³digo da versÃ£o 53)
-
26 November 2020 - API mÃnimo 19, API alvo 29
+
26 de novembro de 2020 - API mÃnimo 19, API alvo 29
- Corrigido o erro que gerava Ver Fonte ao travar.
3.6 (cÃ³digo da versÃ£o 52)
-
16 November 2020 - API mÃnimo 19, API alvo 29
+
16 de novembro de 2020 - API mÃnimo 19, API alvo 29
- CorreÃ§Ã£o da reproduÃ§Ã£o do Ã¡udio em buffer apÃ³s o fechamento de uma guia.
- Confiar nas autoridades de certificaÃ§Ã£o do usuÃ¡rio no Android 7 (API 24) e mais recente.
3.2 (cÃ³digo da versÃ£o 46)
-
20 Julho 2019 - API mÃnimo 19, API alvo 28
+
20 de julho de 2019 - API mÃnimo 19, API alvo 28
- Change the default search engine and homepage to Startpage.
- Fix proxying through Orbot on recent versions of WebView.
2.12 (cÃ³digo da versÃ£o 35)
-
31 Julho 2018 - API mÃnimo 19, API alvo 27
+
31 de julho de 2018 - API mÃnimo 19, API alvo 27
- Change the default homepage and search engine to Searx.me.
- Add UltraPrivacy to the blocklists.
2.11 (cÃ³digo da versÃ£o 34)
-
10 Julho 2018 - API mÃnimo 19, API alvo 27
+
10 de julho de 2018 - API mÃnimo 19, API alvo 27
- Add a Requests activity that shows how many resource requests have been blocked.
- Fix a problem with proxying through Orbot on recent versions of WebView.
2.7.2 (cÃ³digo da versÃ£o 29)
-
22 November 2017 - API mÃnimo 19, API alvo 26
+
22 de novembro de 2017 - API mÃnimo 19, API alvo 26
- Add an options menu item to create/edit domain settings for the current domain.
- Open telephone number hyperlinks in the dialer.
2.7.1 (cÃ³digo da versÃ£o 28)
-
9 November 2017 - API mÃnimo 19, API alvo 26
+
9 de novembro de 2017 - API mÃnimo 19, API alvo 26
- Fix a crash when editing a bookmark in the new bookmarks drawer.
2.7 (cÃ³digo da versÃ£o 27)
-
7 November 2017 - API mÃnimo 19, API alvo 26
+
7 de novembro de 2017 - API mÃnimo 19, API alvo 26
- Add a bookmarks drawer that is accessed by sliding from the right.
- Prevent Night Mode from flashing a white background when loading new pages.
2.4 (cÃ³digo da versÃ£o 24)
-
23 Junho 2017 - API mÃnimo 19, API alvo 25
+
23 de junho de 2017 - API mÃnimo 19, API alvo 25
- Add a dark theme option.
- Highlight the http:// in red if a domain is not encrypted.
1.13 (cÃ³digo da versÃ£o 15)
-
28 November 2016 - API mÃnimo 19, API alvo 24
+
28 de novembro de 2016 - API mÃnimo 19, API alvo 24
- Double-tap for full screen browsing mode.
- Change the default user agent to PrivacyBrowser/1.0.
1.12 (cÃ³digo da versÃ£o 14)
-
9 November 2016 - API mÃnimo 19, API alvo 24
+
9 de novembro de 2016 - API mÃnimo 19, API alvo 24
- Add a forward and back history list.
- Long press now displays target URLs and the option to view or download pictures.
1.8 (cÃ³digo da versÃ£o 9)
-
16 Julho 2016 - API mÃnimo 19, API alvo 23
+
16 de julho de 2016 - API mÃnimo 19, API alvo 23
- Add a bookmarks interface.
- Add basic controls for form data.
- Delete the Service Worker directory after every page load.
- Restrict the file provider to a subdirectory of the cache directory.
- Bump the target API to 33 (Android 13).
- Implement forcing WebView's dark mode on Android 13.
- Implement forcing WebViewâs dark mode on Android 13.
- Implement a number @@ -832,7 +832,7 @@
  - Update launcher icon to make it bigger.
  - Replace all toast messages with snackbars.
  - Don't update the URL box if the user is typing in it.
  - Donât update the URL box if the user is typing in it.
  - Bump the minimum API from 10 to 15. Privacy Browser was crashing on load in API 10.
  diff --git a/app/src/main/assets/tr/guide_local_storage.html b/app/src/main/assets/tr/guide_local_storage.html index 1f643df2..ce88b642 100644 --- a/app/src/main/assets/tr/guide_local_storage.html +++ b/app/src/main/assets/tr/guide_local_storage.html @@ -44,7 +44,7 @@
  Almost all websites with logins require cookies to be enabled for a user to log in. That is how they make sure it is still you as you move from page to page on the site, and is, in my opinion, the only legitimate use for cookies.
  -
  Android's System WebView treats cookies as an app-level setting, meaning that cookies are either on or off for all tabs in Privacy Browser. +
  Androidâs System WebView treats cookies as an app-level setting, meaning that cookies are either on or off for all tabs in Privacy Browser. The result is that the cookies setting for whatever tab is currently displayed controls the cookies setting for all the background tabs as well. If you have a tab in that background that has cookies enabled so that you can be logged into a website, and switch to a tab that doesn't have cookies enabled, it disabled cookies for all the tabs. If the background tab makes a request, for example, to see if there is updated information, that request will be sent without cookies, which will cause the website to log you out. 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 f21b3c23..e61ab7db 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java @@ -1022,6 +1022,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Disable the clear form data menu item if the API >= 26 so that the status of the main Clear Data is calculated correctly. optionsClearFormDataMenuItem.setEnabled(Build.VERSION.SDK_INT < 26); + // Only display the dark WebView menu item if the API >= 29. + optionsDarkWebViewMenuItem.setVisible(Build.VERSION.SDK_INT >= 29); + // Set the status of the additional app bar icons. Setting the refresh menu item to `SHOW_AS_ACTION_ALWAYS` makes it appear even on small devices like phones. if (displayAdditionalAppBarIcons) { optionsRefreshMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); @@ -1102,16 +1105,12 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Get the current theme status. int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; - // Enable dark WebView if the API is < 33 or if night mode is enabled. - optionsDarkWebViewMenuItem.setEnabled((Build.VERSION.SDK_INT < 33) || (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES)); + // Enable dark WebView if night mode is enabled. + optionsDarkWebViewMenuItem.setEnabled(currentThemeStatus == Configuration.UI_MODE_NIGHT_YES); - // Set the checkbox status for dark WebView if the WebView supports it. - if ((Build.VERSION.SDK_INT >= 33) && WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) { // The device is running API >= 33 and algorithmic darkening is supported. + // Set the checkbox status for dark WebView if the device is running API >= 29 and algorithmic darkening is supported. + if ((Build.VERSION.SDK_INT >= 29) && WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) optionsDarkWebViewMenuItem.setChecked(WebSettingsCompat.isAlgorithmicDarkeningAllowed(currentWebView.getSettings())); - } else if ((Build.VERSION.SDK_INT < 33) && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) { // The device is running API < 33 and the WebView supports force dark. - //noinspection deprecation - optionsDarkWebViewMenuItem.setChecked(WebSettingsCompat.getForceDark(currentWebView.getSettings()) == WebSettingsCompat.FORCE_DARK_ON); - } } // Set the cookies menu item checked status. @@ -1788,23 +1787,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Consume the event. return true; } else if (menuItemId == R.id.dark_webview) { // Dark WebView. - // Check to see if dark WebView is supported by this WebView. - if ((Build.VERSION.SDK_INT >= 33) && WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) { // The device is running API >= 33 and algorithmic darkening is supported. - // Toggle algorithmic darkening. + // Toggle dark WebView if supported. + if ((Build.VERSION.SDK_INT >= 29) && WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) WebSettingsCompat.setAlgorithmicDarkeningAllowed(currentWebView.getSettings(), !WebSettingsCompat.isAlgorithmicDarkeningAllowed(currentWebView.getSettings())); - } else if ((Build.VERSION.SDK_INT < 33) && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) { // The device is running API < 33 and the WebView supports force dark. - // Toggle the dark WebView setting. - //noinspection deprecation - if (WebSettingsCompat.getForceDark(currentWebView.getSettings()) == WebSettingsCompat.FORCE_DARK_ON) { // Dark WebView is currently enabled. - // Turn off dark WebView. - //noinspection deprecation - WebSettingsCompat.setForceDark(currentWebView.getSettings(), WebSettingsCompat.FORCE_DARK_OFF); - } else { // Dark WebView is currently disabled. - // Turn on dark WebView. - //noinspection deprecation - WebSettingsCompat.setForceDark(currentWebView.getSettings(), WebSettingsCompat.FORCE_DARK_ON); - } - } // Consume the event. return true; @@ -3977,8 +3962,8 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook break; } - // Check to see if WebView themes are supported. - if ((Build.VERSION.SDK_INT >= 33) && WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) { // The device is running API >= 33 and algorithmic darkening is supported. + // Set the WebView theme if device is running API >= 29 and algorithmic darkening is supported. + if ((Build.VERSION.SDK_INT >= 29) && WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) { // Set the WebView theme. switch (webViewThemeInt) { case DomainsDatabaseHelper.SYSTEM_DEFAULT: @@ -4008,48 +3993,6 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook WebSettingsCompat.setAlgorithmicDarkeningAllowed(nestedScrollWebView.getSettings(), true); break; } - } else if ((Build.VERSION.SDK_INT < 33) && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) { // The device is running API < 33 and the WebView supports force dark. - // Set the WebView theme. - switch (webViewThemeInt) { - case DomainsDatabaseHelper.SYSTEM_DEFAULT: - // Set the WebView theme. A switch statement cannot be used because the WebView theme entry values string array is not a compile time constant. - if (webViewTheme.equals(webViewThemeEntryValuesStringArray[1])) { // The light theme is selected. - // Turn off the WebView dark mode. - //noinspection deprecation - WebSettingsCompat.setForceDark(nestedScrollWebView.getSettings(), WebSettingsCompat.FORCE_DARK_OFF); - } else if (webViewTheme.equals(webViewThemeEntryValuesStringArray[2])) { // The dark theme is selected. - // Turn on the WebView dark mode. - //noinspection deprecation - WebSettingsCompat.setForceDark(nestedScrollWebView.getSettings(), WebSettingsCompat.FORCE_DARK_ON); - } else { // The system default theme is selected. - // Get the current system theme status. - int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; - - // Set the WebView theme according to the current system theme status. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { // The system is in day mode. - // Turn off the WebView dark mode. - //noinspection deprecation - WebSettingsCompat.setForceDark(nestedScrollWebView.getSettings(), WebSettingsCompat.FORCE_DARK_OFF); - } else { // The system is in night mode. - // Turn on the WebView dark mode. - //noinspection deprecation - WebSettingsCompat.setForceDark(nestedScrollWebView.getSettings(), WebSettingsCompat.FORCE_DARK_ON); - } - } - break; - - case DomainsDatabaseHelper.LIGHT_THEME: - // Turn off the WebView dark mode. - //noinspection deprecation - WebSettingsCompat.setForceDark(nestedScrollWebView.getSettings(), WebSettingsCompat.FORCE_DARK_OFF); - break; - - case DomainsDatabaseHelper.DARK_THEME: - // Turn on the WebView dark mode. - //noinspection deprecation - WebSettingsCompat.setForceDark(nestedScrollWebView.getSettings(), WebSettingsCompat.FORCE_DARK_ON); - break; - } } // Set the viewport. @@ -4155,8 +4098,8 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook nestedScrollWebView.getSettings().setUserAgentString(userAgentDataArray[userAgentArrayPosition]); } - // Apply the WebView theme if supported by the installed WebView. - if ((Build.VERSION.SDK_INT >= 33) && WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) { // The device is running API >= 33 and algorithmic darkening is supported. + // Set the WebView theme if device is running API >= 29 and algorithmic darkening is supported. + if ((Build.VERSION.SDK_INT >= 29) && WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) { // Set the WebView theme. A switch statement cannot be used because the WebView theme entry values string array is not a compile time constant. if (webViewTheme.equals(webViewThemeEntryValuesStringArray[1])) { // the light theme is selected. // Turn off algorithmic darkening. @@ -4171,31 +4114,6 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Set the algorithmic darkening according to the current system theme status. WebSettingsCompat.setAlgorithmicDarkeningAllowed(nestedScrollWebView.getSettings(), currentThemeStatus == Configuration.UI_MODE_NIGHT_YES); } - } else if ((Build.VERSION.SDK_INT < 33) && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) { // The device is running API < 33 and the WebView supports force dark. - // Set the WebView theme. A switch statement cannot be used because the WebView theme entry values string array is not a compile time constant. - if (webViewTheme.equals(webViewThemeEntryValuesStringArray[1])) { // The light theme is selected. - // Turn off the WebView dark mode. - //noinspection deprecation - WebSettingsCompat.setForceDark(nestedScrollWebView.getSettings(), WebSettingsCompat.FORCE_DARK_OFF); - } else if (webViewTheme.equals(webViewThemeEntryValuesStringArray[2])) { // The dark theme is selected. - // Turn on the WebView dark mode. - //noinspection deprecation - WebSettingsCompat.setForceDark(nestedScrollWebView.getSettings(), WebSettingsCompat.FORCE_DARK_ON); - } else { // The system default theme is selected. - // Get the current system theme status. - int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; - - // Set the WebView theme according to the current system theme status. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { // The system is in day mode. - // Turn off the WebView dark mode. - //noinspection deprecation - WebSettingsCompat.setForceDark(nestedScrollWebView.getSettings(), WebSettingsCompat.FORCE_DARK_OFF); - } else { // The system is in night mode. - // Turn on the WebView dark mode. - //noinspection deprecation - WebSettingsCompat.setForceDark(nestedScrollWebView.getSettings(), WebSettingsCompat.FORCE_DARK_ON); - } - } } // Set the viewport. @@ -5088,8 +5006,8 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Get the WebView theme entry values string array. String[] webViewThemeEntryValuesStringArray = getResources().getStringArray(R.array.webview_theme_entry_values); - // Apply the WebView theme if supported by the installed WebView. - if ((Build.VERSION.SDK_INT >= 33) && WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) { // The device is running API >= 33 and algorithmic darkening is supported. + // Set the WebView theme if device is running API >= 29 and algorithmic darkening is supported. + if ((Build.VERSION.SDK_INT >= 29) && WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) { // Set the WebView them. A switch statement cannot be used because the WebView theme entry values string array is not a compile time constant. if (webViewTheme.equals(webViewThemeEntryValuesStringArray[1])) { // The light theme is selected. // Turn off algorithmic darkening. @@ -5118,39 +5036,6 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook WebSettingsCompat.setAlgorithmicDarkeningAllowed(nestedScrollWebView.getSettings(), true); } } - } else if ((Build.VERSION.SDK_INT < 33) && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) { // The device is running API < 33 and the WebView supports force dark. - // Set the WebView theme. A switch statement cannot be used because the WebView theme entry values string array is not a compile time constant. - if (webViewTheme.equals(webViewThemeEntryValuesStringArray[1])) { // The light theme is selected. - // Turn off the WebView dark mode. - //noinspection deprecation - WebSettingsCompat.setForceDark(nestedScrollWebView.getSettings(), WebSettingsCompat.FORCE_DARK_OFF); - - // Make the WebView visible. The WebView was created invisible in `webview_framelayout` to prevent a white background splash in night mode. - // If the system is currently in night mode, showing the WebView will be handled in `onProgressChanged()`. - nestedScrollWebView.setVisibility(View.VISIBLE); - } else if (webViewTheme.equals(webViewThemeEntryValuesStringArray[2])) { // The dark theme is selected. - // Turn on the WebView dark mode. - //noinspection deprecation - WebSettingsCompat.setForceDark(nestedScrollWebView.getSettings(), WebSettingsCompat.FORCE_DARK_ON); - } else { // The system default theme is selected. - // Get the current system theme status. - int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; - - // Set the WebView theme according to the current system theme status. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { // The system is in day mode. - // Turn off the WebView dark mode. - //noinspection deprecation - WebSettingsCompat.setForceDark(nestedScrollWebView.getSettings(), WebSettingsCompat.FORCE_DARK_OFF); - - // Make the WebView visible. The WebView was created invisible in `webview_framelayout` to prevent a white background splash in night mode. - // If the system is currently in night mode, showing the WebView will be handled in `onProgressChanged()`. - nestedScrollWebView.setVisibility(View.VISIBLE); - } else { // The system is in night mode. - // Turn on the WebView dark mode. - //noinspection deprecation - WebSettingsCompat.setForceDark(nestedScrollWebView.getSettings(), WebSettingsCompat.FORCE_DARK_ON); - } - } } // Get a handle for the activity diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt index fc9c2579..0e351b94 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt @@ -134,6 +134,7 @@ class DomainSettingsFragment : Fragment() { val swipeToRefreshImageView = domainSettingsView.findViewById(R.id.swipe_to_refresh_imageview) val swipeToRefreshSpinner = domainSettingsView.findViewById(R.id.swipe_to_refresh_spinner) val swipeToRefreshTextView = domainSettingsView.findViewById(R.id.swipe_to_refresh_textview) + val webViewThemeLinearLayout = domainSettingsView.findViewById(R.id.webview_theme_linearlayout) val webViewThemeImageView = domainSettingsView.findViewById(R.id.webview_theme_imageview) val webViewThemeSpinner = domainSettingsView.findViewById(R.id.webview_theme_spinner) val webViewThemeTextView = domainSettingsView.findViewById(R.id.webview_theme_textview) @@ -179,6 +180,10 @@ class DomainSettingsFragment : Fragment() { val currentIpAddressesRadioButton = domainSettingsView.findViewById(R.id.current_ip_addresses_radiobutton) val currentIpAddressesTextView = domainSettingsView.findViewById(R.id.current_ip_addresses_textview) + // Hide the WebView theme linear layout if the API < 29. + if (Build.VERSION.SDK_INT < 29) + webViewThemeLinearLayout.visibility = View.GONE + // Setup the pinned labels. val cNameLabel = getString(R.string.common_name) + " " val oNameLabel = getString(R.string.organization) + " " diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt index d73c905f..2ce103dc 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt @@ -173,6 +173,15 @@ class SettingsFragment : PreferenceFragmentCompat() { clearAndExitCategory.removePreference(clearFormDataPreference) } + // Remove the WebView theme preference if the API < 29. + if (Build.VERSION.SDK_INT < 29) { + // Get a handle for the general category. + val generalCategory = findPreference(getString(R.string.general_category_key))!! + + // Remove the WebView theme preference. + generalCategory.removePreference(webViewThemePreference) + } + // Only enable Fanboy's social blocking list preference if Fanboy's annoyance list is disabled. fanboySocialBlockingListPreference.isEnabled = !fanboyAnnoyanceListEnabled @@ -273,8 +282,8 @@ class SettingsFragment : PreferenceFragmentCompat() { // Set the current theme as the summary text for the preference. appThemePreference.summary = appThemeEntriesStringArray[appThemeEntryNumber] - // Enable the WebView theme preference if the API < 33 or the app theme is not set to light. Google no longer allows light themes to display dark WebViews. - webViewThemePreference.isEnabled = ((Build.VERSION.SDK_INT < 33) || (appThemeEntryNumber != 1)) + // Enable the WebView theme preference if the app theme is not set to light. Google does not allow light themes to display dark WebViews. + webViewThemePreference.isEnabled = (appThemeEntryNumber != 1) // Get the WebView theme string arrays. webViewThemeEntriesStringArray = resources.getStringArray(R.array.webview_theme_entries) @@ -1090,8 +1099,8 @@ class SettingsFragment : PreferenceFragmentCompat() { } } - // Enable the WebView theme preference if the API < 33 or the app theme is set to light. - webViewThemePreference.isEnabled = ((Build.VERSION.SDK_INT < 33) || (appThemeEntryNumber != 1)) + // Enable the WebView theme preference if the app theme is not set to light. Google does not allow light themes to display dark WebViews. + webViewThemePreference.isEnabled = (appThemeEntryNumber != 1) // Get the webView theme entry number that matches the new WebView theme. val webViewThemeEntryNumber: Int = when (sharedPreferences.getString(getString(R.string.webview_theme_key), getString(R.string.webview_theme_default_value))) { diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index e5217f01..3cf2376e 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -118,6 +118,7 @@ ConfiguraÃ§Ãµes Importar/Exportar Logcat + WebView DevTools Guia Sobre @@ -199,6 +200,8 @@ URL invÃ¡lida Salvando file: Processando imagemâ¦ : + Erro ao salvar %1$s: \u0020 %2$s + Erro desconhecido Solicitar cabeÃ§alhos @@ -377,6 +380,7 @@ Certificados SSL Proxies IDs de rastreamento + Interface Orbot NÃ£o Instalado @@ -407,6 +411,8 @@ VersÃ£o do WebView: Orbot: I2P: + %1$s (DerivaÃ§Ã£o do F-Droid) + %1$s (DerivaÃ§Ã£o do Google Play) OpenKeychain: Uso da MemÃ³ria Consumo da MemÃ³ria do Aplicativo: @@ -501,6 +507,10 @@ Bloquear todas as solicitaÃ§Ãµes de terceiros Bloquear todas as solicitaÃ§Ãµes de terceiros aumenta a privacidade, mas quebra muitos sites. ModificaÃ§Ã£o de URL + Consultas de rastreamento + Remova consultas de rastreamento conhecidas de URLs. + Redirecionamentos de AMP + Remova consultas de redirecionamento AMP (pÃ¡ginas aceleradas para dispositivos mÃ³veis) conhecidas de URLs. Search Mojeek @@ -555,6 +565,8 @@ Deslize para atualizar Alguns sites nÃ£o funcionam bem se deslizar para atualizar estiver habilitado. Download com aplicativo externo + Aplicativos externos nÃ£o respeitarÃ£o as configuraÃ§Ãµes de proxy do Privacy Browser e nÃ£o terÃ£o acesso a cookies + (o que significa que Ã© improvÃ¡vel que os arquivos baixados de sites que exigem login funcionem). Role a barra de aplicativos Role a barra de aplicativos para fora da parte superior da tela quando o WebView rola para baixo. Barra de aplicativos inferior diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6f437d57..428e613a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -679,6 +679,7 @@ fanboys_social_blocking_list font_size full_screen_browsing_mode + general hide_app_bar homepage incognito_mode diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 9bbe6b3c..49b346f6 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -240,7 +240,7 @@ VersÃ£o. +â¢ Preserva a pasta de favoritos atual ao reiniciar. +â¢ Altera o valor padrÃ£o do URL de proxy personalizado para socks://localhost:9050. +â¢ Adiciona vÃ¡rias atualizaÃ§Ãµes do Guia. +â¢ Feitas diversas pequenas melhorias na IU. +â¢ Alterada a API de destino para 32 (Android 12L). +â¢ TraduÃ§Ã£o atualizada para o portuguÃªs do Brasil fornecida por Thiago Nazareno ConceiÃ§Ã£o Silva de Jesus. \ No newline at end of file diff --git a/fastlane/metadata/android/pt-BR/changelogs/62.txt b/fastlane/metadata/android/pt-BR/changelogs/62.txt new file mode 100644 index 00000000..adfb2dba --- /dev/null +++ b/fastlane/metadata/android/pt-BR/changelogs/62.txt @@ -0,0 +1 @@ +â¢ Corrigida uma falha em novas instalaÃ§Ãµes do Privacy Browser. \ No newline at end of file -- 2.43.0

3.12.1 (Version Code 62)

3.12.1 (Version Code 62)

3.12.1 (version code 62)

3.12.1 (version code 62)

3.12.1 (cÃ³digo de versiÃ³n 62)

3.12.1 (cÃ³digo de versiÃ³n 62)

3.12.1 (version code 62)

3.12.1 (version code 62)

3.12.1 (versione codice 62)

3.12.1 (versione codice 62)

3.12 (versione codice 61)

3.12.1 (version code 62)

3.12 (version code 61)

3.12.1 (cÃ³digo de versÃ£o 62)

3.12 (cÃ³digo de versÃ£o 61)

3.11 (cÃ³digo da versÃ£o 60)

3.9 (cÃ³digo da versÃ£o 57)

3.8.1 (cÃ³digo da versÃ£o 56)

3.8 (cÃ³digo da versÃ£o 55)

3.6.1 (cÃ³digo da versÃ£o 53)

3.6 (cÃ³digo da versÃ£o 52)

3.2 (cÃ³digo da versÃ£o 46)

2.12 (cÃ³digo da versÃ£o 35)

2.11 (cÃ³digo da versÃ£o 34)

2.7.2 (cÃ³digo da versÃ£o 29)

2.7.1 (cÃ³digo da versÃ£o 28)

2.7 (cÃ³digo da versÃ£o 27)

2.4 (cÃ³digo da versÃ£o 24)

1.13 (cÃ³digo da versÃ£o 15)

1.12 (cÃ³digo da versÃ£o 14)

1.8 (cÃ³digo da versÃ£o 9)

- Donations

Clear and Exit

Limpar e fechar

ModificaÃ§Ã£o de URL

X-Requested-With Header

CabeÃ§alho X-Requested-With

3.12.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 62)

3.12.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 62)

3.12.1 (version code 62)

3.12.1 (version code 62)

3.12.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 62)

3.12.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 62)