From: Soren Stoutner <soren@stoutner.com>
Date: Fri, 1 Jun 2018 18:11:49 +0000 (-0700)
Subject: Replace the Form Data app bar icon with a Refresh icon.  https://redmine.stoutner... 
X-Git-Tag: v2.11~7
X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=9e83ccb62ce1e98af1be0e8e39b851ba89fe3f8d;p=PrivacyBrowserAndroid.git

Replace the Form Data app bar icon with a Refresh icon.  https://redmine.stoutner.com/issues/288
---

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 4905321b..3f96b721 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -1583,7 +1583,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
         MenuItem toggleFirstPartyCookiesMenuItem = menu.findItem(R.id.toggle_first_party_cookies);
         MenuItem toggleThirdPartyCookiesMenuItem = menu.findItem(R.id.toggle_third_party_cookies);
         MenuItem toggleDomStorageMenuItem = menu.findItem(R.id.toggle_dom_storage);
-        MenuItem toggleSaveFormDataMenuItem = menu.findItem(R.id.toggle_save_form_data);
+        MenuItem refreshMenuItem = menu.findItem(R.id.refresh);
 
         // Only display third-party cookies if SDK >= 21
         toggleThirdPartyCookiesMenuItem.setVisible(Build.VERSION.SDK_INT >= 21);
@@ -1591,15 +1591,15 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
         // Get the shared preference values.  `this` references the current context.
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
 
-        // Set the status of the additional app bar icons.  The default is `false`.
+        // 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 (sharedPreferences.getBoolean("display_additional_app_bar_icons", false)) {
             toggleFirstPartyCookiesMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
             toggleDomStorageMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            toggleSaveFormDataMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            refreshMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         } else { //Do not display the additional icons.
             toggleFirstPartyCookiesMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
             toggleDomStorageMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-            toggleSaveFormDataMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+            refreshMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         }
 
         return true;
@@ -3659,58 +3659,54 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
     }
 
     private void updatePrivacyIcons(boolean runInvalidateOptionsMenu) {
-        // Get handles for the icons.
-        MenuItem privacyIconMenuItem = mainMenu.findItem(R.id.toggle_javascript);
-        MenuItem firstPartyCookiesIconMenuItem = mainMenu.findItem(R.id.toggle_first_party_cookies);
-        MenuItem domStorageIconMenuItem = mainMenu.findItem(R.id.toggle_dom_storage);
-        MenuItem formDataIconMenuItem = mainMenu.findItem(R.id.toggle_save_form_data);
+        // Get handles for the menu items.
+        MenuItem privacyMenuItem = mainMenu.findItem(R.id.toggle_javascript);
+        MenuItem firstPartyCookiesMenuItem = mainMenu.findItem(R.id.toggle_first_party_cookies);
+        MenuItem domStorageMenuItem = mainMenu.findItem(R.id.toggle_dom_storage);
+        MenuItem refreshMenuItem = mainMenu.findItem(R.id.refresh);
 
-        // Update `privacyIcon`.
+        // Update the privacy icon.
         if (javaScriptEnabled) {  // JavaScript is enabled.
-            privacyIconMenuItem.setIcon(R.drawable.javascript_enabled);
+            privacyMenuItem.setIcon(R.drawable.javascript_enabled);
         } else if (firstPartyCookiesEnabled) {  // JavaScript is disabled but cookies are enabled.
-            privacyIconMenuItem.setIcon(R.drawable.warning);
+            privacyMenuItem.setIcon(R.drawable.warning);
         } else {  // All the dangerous features are disabled.
-            privacyIconMenuItem.setIcon(R.drawable.privacy_mode);
+            privacyMenuItem.setIcon(R.drawable.privacy_mode);
         }
 
-        // Update `firstPartyCookiesIcon`.
+        // Update the first-party cookies icon.
         if (firstPartyCookiesEnabled) {  // First-party cookies are enabled.
-            firstPartyCookiesIconMenuItem.setIcon(R.drawable.cookies_enabled);
+            firstPartyCookiesMenuItem.setIcon(R.drawable.cookies_enabled);
         } else {  // First-party cookies are disabled.
             if (darkTheme) {
-                firstPartyCookiesIconMenuItem.setIcon(R.drawable.cookies_disabled_dark);
+                firstPartyCookiesMenuItem.setIcon(R.drawable.cookies_disabled_dark);
             } else {
-                firstPartyCookiesIconMenuItem.setIcon(R.drawable.cookies_disabled_light);
+                firstPartyCookiesMenuItem.setIcon(R.drawable.cookies_disabled_light);
             }
         }
 
-        // Update `domStorageIcon`.
+        // Update the DOM storage icon.
         if (javaScriptEnabled && domStorageEnabled) {  // Both JavaScript and DOM storage are enabled.
-            domStorageIconMenuItem.setIcon(R.drawable.dom_storage_enabled);
+            domStorageMenuItem.setIcon(R.drawable.dom_storage_enabled);
         } else if (javaScriptEnabled) {  // JavaScript is enabled but DOM storage is disabled.
             if (darkTheme) {
-                domStorageIconMenuItem.setIcon(R.drawable.dom_storage_disabled_dark);
+                domStorageMenuItem.setIcon(R.drawable.dom_storage_disabled_dark);
             } else {
-                domStorageIconMenuItem.setIcon(R.drawable.dom_storage_disabled_light);
+                domStorageMenuItem.setIcon(R.drawable.dom_storage_disabled_light);
             }
         } else {  // JavaScript is disabled, so DOM storage is ghosted.
             if (darkTheme) {
-                domStorageIconMenuItem.setIcon(R.drawable.dom_storage_ghosted_dark);
+                domStorageMenuItem.setIcon(R.drawable.dom_storage_ghosted_dark);
             } else {
-                domStorageIconMenuItem.setIcon(R.drawable.dom_storage_ghosted_light);
+                domStorageMenuItem.setIcon(R.drawable.dom_storage_ghosted_light);
             }
         }
 
-        // Update `formDataIcon`.
-        if (saveFormDataEnabled) {  // Form data is enabled.
-            formDataIconMenuItem.setIcon(R.drawable.form_data_enabled);
-        } else {  // Form data is disabled.
-            if (darkTheme) {
-                formDataIconMenuItem.setIcon(R.drawable.form_data_disabled_dark);
-            } else {
-                formDataIconMenuItem.setIcon(R.drawable.form_data_disabled_light);
-            }
+        // Update the refresh icon.
+        if (darkTheme) {
+            refreshMenuItem.setIcon(R.drawable.refresh_enabled_dark);
+        } else {
+            refreshMenuItem.setIcon(R.drawable.refresh_enabled_light);
         }
 
         // `invalidateOptionsMenu` calls `onPrepareOptionsMenu()` and redraws the icons in the `AppBar`.
diff --git a/app/src/main/res/menu/webview_options_menu.xml b/app/src/main/res/menu/webview_options_menu.xml
index 0a239ee7..ba51a600 100644
--- a/app/src/main/res/menu/webview_options_menu.xml
+++ b/app/src/main/res/menu/webview_options_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2018 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 74d33b53..5cf7989f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -307,6 +307,8 @@
         <string name="incognito_mode_summary">Borrar el historial y el caché después de que cada página web termine de cargar. Adelante y atrás no funcionan en el Modo incógnito.</string>
         <string name="do_not_track">No rastrear</string>
         <string name="do_not_track_summary">Enviar la cabecera de no rastrear (DNT) que educadamente sugiere que los servidores web no rastreen este navegador.</string>
+        <string name="allow_screenshots">Permitir capturas de pantalla</string>
+        <string name="allow_screenshots_summary">Permitir capturas de pantalla, grabación de vídeo y visualización en pantallas inseguras. Cambiar esta configuración reiniciará Navegador Privado.</string>
     <string name="block_lists">Listas de bloqueo</string>
         <string name="easylist">EasyList</string>
         <string name="easylist_summary">Lista principal de bloqueo de anuncios.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 2bb74f0e..6310ad6f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -305,6 +305,9 @@
         <string name="incognito_mode_summary">Cancella la cronologia e la cache al termine del caricamento di ogni pagina. I pulsanti Avanti e Indietro non funzionano in modalità incognito.</string>
         <string name="do_not_track">Non tracciare</string>
         <string name="do_not_track_summary">Invia un\'intestazione di non tracciamento per chiedere al web server di non tracciare il browser.</string>
+        <string name="allow_screenshots">Permetti gli screenshot</string>
+        <string name="allow_screenshots_summary">Permette gli screenshot, la registrazione di video, e la possibilità di visualizzare su schermi non sicuri.
+            La modifica di questa impostazione provoca il riavvio di Privacy Browser.</string>
     <string name="block_lists">Block List</string>
         <string name="easylist">EasyList</string>
         <string name="easylist_summary">Blocking list principale.</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2dbc44a4..892b82f4 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -306,6 +306,8 @@
         <string name="incognito_mode_summary">Очистка журнала и кэша после завершения загрузки каждой веб-страницы. Кнопки \'Вперед\' и \'Назад\' не работают в этом режиме.</string>
         <string name="do_not_track">Не отслеживать</string>
         <string name="do_not_track_summary">Отправлять заголовок \'не отслеживать\', являющийся пожеланием веб-серверу не отслеживать этот браузер.</string>
+        <string name="allow_screenshots">Разрешить скриншоты</string>
+        <string name="allow_screenshots_summary">Разрешить скриншоты, запись видео и просмотр на незащищенных дисплеях. При изменении этого параметра Privacy Browser будет перезапущен.</string>
     <string name="block_lists">Списки блокировки</string>
         <string name="easylist">EasyList</string>
         <string name="easylist_summary">Основной список блокировки рекламы.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f52a84dd..3a2a9063 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -460,7 +460,7 @@
         <string name="swipe_to_refresh_preference">Swipe to refresh</string>
         <string name="swipe_to_refresh_summary">Some websites don’t work well if swipe to refresh is enabled.</string>
         <string name="display_additional_app_bar_icons">Display additional app bar icons</string>
-        <string name="display_additional_app_bar_icons_summary">Display icons for toggling cookies, DOM storage, and form data in the app bar if there is room.</string>
+        <string name="display_additional_app_bar_icons_summary">Display icons in the app bar for refreshing the WebView and, if there is room, for toggling cookies and DOM storage.</string>
         <string name="dark_theme">Dark theme</string>
         <string name="dark_theme_summary">Changing the theme will restart Privacy Browser.</string>
         <string name="night_mode">Night mode</string>