X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FMainWebViewActivity.java;h=d604a2e1f14bec7b4cb39094d8c0ae7203772ee1;hb=87a7789309364ec0802a460cf4f6e79f8a01ee4a;hp=0a824a1527c0f0b657ea51f84430f3ba7f916cf5;hpb=757139ad59282fb8400bc641a4be574e0b88de49;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java index 0a824a15..d604a2e1 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java @@ -36,6 +36,7 @@ import android.os.Bundle; import android.preference.PreferenceManager; import android.support.design.widget.NavigationView; import android.support.design.widget.Snackbar; +import android.support.v4.app.ActivityCompat; import android.support.v4.content.ContextCompat; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; @@ -76,6 +77,10 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // It is also used in `onCreate()` and `onCreateHomeScreenShortcutCreate()`. public static Bitmap favoriteIcon; + // `privacyBrowserActivity` is public static so it can be accessed from `SettingsFragment`. + // It is also used in `onCreate()`, `onCreateOptionsMenu()`, and `onOptionsItemSelected()`, + public static Activity privacyBrowserActivity; + // `mainWebView` is public static so it can be accessed from `SettingsFragment`. // It is also used in `onCreate()`, `onOptionsItemSelected()`, `onNavigationItemSelected()`, and `loadUrlFromTextBox()`. public static WebView mainWebView; @@ -98,7 +103,8 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // It is also used in `onCreate()`, `onCreateOptionsMenu()`, `onPrepareOptionsMenu()`, and `onOptionsItemSelected()`. public static boolean firstPartyCookiesEnabled; - // `thirdPartyCookiesEnabled` is used in `onCreate()`, `onCreateOptionsMenu()`, `onPrepareOptionsMenu()`, and `onOptionsItemSelected()`. + // `thridPartyCookiesEnables` is public static so it can be accessed from `SettingsFragment`. + // It is also used in `onCreate()`, `onCreateOptionsMenu()`, `onPrepareOptionsMenu()`, and `onOptionsItemSelected()`. public static boolean thirdPartyCookiesEnabled; // `domStorageEnabled` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()`, `onCreateOptionsMenu()`, and `onOptionsItemSelected()`. @@ -133,9 +139,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // `drawerLayout` is used in `onCreate()`, `onNewIntent()`, and `onBackPressed()`. private DrawerLayout drawerLayout; - // `privacyIcon` is used in `onCreateOptionsMenu()` and `updatePrivacyIcon()`. - private MenuItem privacyIcon; - // `urlTextBox` is used in `onCreate()`, `onOptionsItemSelected()`, and `loadUrlFromTextBox()`. private EditText urlTextBox; @@ -145,6 +148,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // `sslErrorHandler` is used in `onCreate()`, `onSslErrorCancel()`, and `onSslErrorProceed`. private SslErrorHandler sslErrorHandler; + // `sharedPreferences` is used in `onCreate()` and `onCreateOptionsMenu()`. + SharedPreferences sharedPreferences; + @Override // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled. The whole premise of Privacy Browser is built around an understanding of these dangers. @SuppressLint("SetJavaScriptEnabled") @@ -152,6 +158,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation super.onCreate(savedInstanceState); setContentView(R.layout.main_coordinatorlayout); + // We need a handle for the activity, which is accessed from `SettingsFragment` and fed into `updatePrivacyIcons()`. + privacyBrowserActivity = this; + // We need to use the SupportActionBar from android.support.v7.app.ActionBar until the minimum API is >= 21. Toolbar supportAppBar = (Toolbar) findViewById(R.id.appBar); setSupportActionBar(supportAppBar); @@ -367,35 +376,35 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation PreferenceManager.setDefaultValues(this, R.xml.preferences, false); // Get the shared preference values. - SharedPreferences savedPreferences = PreferenceManager.getDefaultSharedPreferences(this); + sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); // Set JavaScript initial status. The default value is false. - javaScriptEnabled = savedPreferences.getBoolean("javascript_enabled", false); + javaScriptEnabled = sharedPreferences.getBoolean("javascript_enabled", false); mainWebView.getSettings().setJavaScriptEnabled(javaScriptEnabled); // Initialize cookieManager. cookieManager = CookieManager.getInstance(); // Set cookies initial status. The default value is false. - firstPartyCookiesEnabled = savedPreferences.getBoolean("first_party_cookies_enabled", false); + firstPartyCookiesEnabled = sharedPreferences.getBoolean("first_party_cookies_enabled", false); cookieManager.setAcceptCookie(firstPartyCookiesEnabled); // Set third-party cookies initial status if API >= 21. The default value is false. if (Build.VERSION.SDK_INT >= 21) { - thirdPartyCookiesEnabled = savedPreferences.getBoolean("third_party_cookies_enabled", false); + thirdPartyCookiesEnabled = sharedPreferences.getBoolean("third_party_cookies_enabled", false); cookieManager.setAcceptThirdPartyCookies(mainWebView, thirdPartyCookiesEnabled); } // Set DOM storage initial status. The default value is false. - domStorageEnabled = savedPreferences.getBoolean("dom_storage_enabled", false); + domStorageEnabled = sharedPreferences.getBoolean("dom_storage_enabled", false); mainWebView.getSettings().setDomStorageEnabled(domStorageEnabled); // Set the saved form data initial status. The default is false. - saveFormDataEnabled = savedPreferences.getBoolean("save_form_data_enabled", false); + saveFormDataEnabled = sharedPreferences.getBoolean("save_form_data_enabled", false); mainWebView.getSettings().setSaveFormData(saveFormDataEnabled); // Set the user agent initial status. - String userAgentString = savedPreferences.getString("user_agent", "Default user agent"); + String userAgentString = sharedPreferences.getString("user_agent", "Default user agent"); switch (userAgentString) { case "Default user agent": // Do nothing. @@ -403,43 +412,43 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation case "Custom user agent": // Set the custom user agent on mainWebView, The default is "PrivacyBrowser/1.0". - mainWebView.getSettings().setUserAgentString(savedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); + mainWebView.getSettings().setUserAgentString(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); break; default: // Set the selected user agent on mainWebView. The default is "PrivacyBrowser/1.0". - mainWebView.getSettings().setUserAgentString(savedPreferences.getString("user_agent", "PrivacyBrowser/1.0")); + mainWebView.getSettings().setUserAgentString(sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0")); break; } // Set the initial string for JavaScript disabled search. - if (savedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q=").equals("Custom URL")) { + if (sharedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q=").equals("Custom URL")) { // Get the custom URL string. The default is "". - javaScriptDisabledSearchURL = savedPreferences.getString("javascript_disabled_search_custom_url", ""); + javaScriptDisabledSearchURL = sharedPreferences.getString("javascript_disabled_search_custom_url", ""); } else { // Use the string from javascript_disabled_search. - javaScriptDisabledSearchURL = savedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q="); + javaScriptDisabledSearchURL = sharedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q="); } // Set the initial string for JavaScript enabled search. - if (savedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q=").equals("Custom URL")) { + if (sharedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q=").equals("Custom URL")) { // Get the custom URL string. The default is "". - javaScriptEnabledSearchURL = savedPreferences.getString("javascript_enabled_search_custom_url", ""); + javaScriptEnabledSearchURL = sharedPreferences.getString("javascript_enabled_search_custom_url", ""); } else { // Use the string from javascript_enabled_search. - javaScriptEnabledSearchURL = savedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q="); + javaScriptEnabledSearchURL = sharedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q="); } // Set the homepage initial status. The default value is `https://www.duckduckgo.com`. - homepage = savedPreferences.getString("homepage", "https://www.duckduckgo.com"); + homepage = sharedPreferences.getString("homepage", "https://www.duckduckgo.com"); // Set the font size initial status. the default value is `100`. - String defaultFontSizeString = savedPreferences.getString("default_font_size", "100"); + String defaultFontSizeString = sharedPreferences.getString("default_font_size", "100"); mainWebView.getSettings().setTextZoom(Integer.valueOf(defaultFontSizeString)); // Set the swipe to refresh initial status. The default is `true`. - swipeToRefreshEnabled = savedPreferences.getBoolean("swipe_to_refresh_enabled", true); + swipeToRefreshEnabled = sharedPreferences.getBoolean("swipe_to_refresh_enabled", true); swipeToRefresh.setEnabled(swipeToRefreshEnabled); @@ -505,13 +514,10 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Set mainMenu so it can be used by onOptionsItemSelected. mainMenu = menu; - // Initialize privacyIcon - privacyIcon = menu.findItem(R.id.toggleJavaScript); - // Set the initial status of the privacy icon. - updatePrivacyIcon(); + updatePrivacyIcons(privacyBrowserActivity); - // Get MenuItems for checkable menu items. + // Get handles for the menu items. MenuItem toggleFirstPartyCookies = menu.findItem(R.id.toggleFirstPartyCookies); MenuItem toggleThirdPartyCookies = menu.findItem(R.id.toggleThirdPartyCookies); MenuItem toggleDomStorage = menu.findItem(R.id.toggleDomStorage); @@ -523,6 +529,19 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation toggleDomStorage.setChecked(domStorageEnabled); toggleSaveFormData.setChecked(saveFormDataEnabled); + // Set the status of the additional app bar icons. The default is `false`. + if (sharedPreferences.getBoolean("display_additional_app_bar_icons", false)) { + toggleFirstPartyCookies.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + toggleThirdPartyCookies.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + toggleDomStorage.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + toggleSaveFormData.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + } else { //Do not display the additional icons. + toggleFirstPartyCookies.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + toggleThirdPartyCookies.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + toggleDomStorage.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + toggleSaveFormData.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + } + return true; } @@ -631,9 +650,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation mainWebView.getSettings().setJavaScriptEnabled(javaScriptEnabled); // Update the privacy icon. - updatePrivacyIcon(); + updatePrivacyIcons(privacyBrowserActivity); - // Display a Snackbar. + // Display a `Snackbar`. if (javaScriptEnabled) { Snackbar.make(findViewById(R.id.mainWebView), R.string.javascript_enabled, Snackbar.LENGTH_SHORT).show(); } else { @@ -659,7 +678,18 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation cookieManager.setAcceptCookie(firstPartyCookiesEnabled); // Update the privacy icon. - updatePrivacyIcon(); + updatePrivacyIcons(privacyBrowserActivity); + + // Display a `Snackbar`. + if (firstPartyCookiesEnabled) { + Snackbar.make(findViewById(R.id.mainWebView), R.string.first_party_cookies_enabled, Snackbar.LENGTH_SHORT).show(); + } else { + if (javaScriptEnabled) { + Snackbar.make(findViewById(R.id.mainWebView), R.string.first_party_cookies_disabled, Snackbar.LENGTH_SHORT).show(); + } else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); + } + } // Reload the WebView. mainWebView.reload(); @@ -676,6 +706,13 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Apply the new cookie status. cookieManager.setAcceptThirdPartyCookies(mainWebView, thirdPartyCookiesEnabled); + // Display a `Snackbar`. + if (thirdPartyCookiesEnabled) { + Snackbar.make(findViewById(R.id.mainWebView), R.string.third_party_cookies_enabled, Snackbar.LENGTH_SHORT).show(); + } else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.third_party_cookies_disabled, Snackbar.LENGTH_SHORT).show(); + } + // Reload the WebView. mainWebView.reload(); } // Else do nothing because SDK < 21. @@ -691,6 +728,13 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Apply the new DOM Storage status. mainWebView.getSettings().setDomStorageEnabled(domStorageEnabled); + // Display a `Snackbar`. + if (domStorageEnabled) { + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_enabled, Snackbar.LENGTH_SHORT).show(); + } else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_disabled, Snackbar.LENGTH_SHORT).show(); + } + // Reload the WebView. mainWebView.reload(); return true; @@ -705,6 +749,13 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Apply the new form data status. mainWebView.getSettings().setSaveFormData(saveFormDataEnabled); + // Display a `Snackbar`. + if (saveFormDataEnabled) { + Snackbar.make(findViewById(R.id.mainWebView), R.string.form_data_enabled, Snackbar.LENGTH_SHORT).show(); + } else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.form_data_disabled, Snackbar.LENGTH_SHORT).show(); + } + // Reload the WebView. mainWebView.reload(); return true; @@ -906,6 +957,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Reinitialize the adView variable, as the View will have been removed and re-added in the free flavor by BannerAd.reloadAfterRotate(). adView = findViewById(R.id.adView); + + // `invalidateOptionsMenu` should recalculate the number of action buttons from the menu to display on the app bar, but it doesn't because of the this bug: https://code.google.com/p/android/issues/detail?id=20493#c8 + invalidateOptionsMenu(); } @Override @@ -1033,15 +1087,70 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation inputMethodManager.hideSoftInputFromWindow(mainWebView.getWindowToken(), 0); } - private void updatePrivacyIcon() { + public static void updatePrivacyIcons(Activity activity) { + // Get handles for the icons. + MenuItem privacyIcon = mainMenu.findItem(R.id.toggleJavaScript); + MenuItem firstPartyCookiesIcon = mainMenu.findItem(R.id.toggleFirstPartyCookies); + MenuItem thirdPartyCookiesIcon = mainMenu.findItem(R.id.toggleThirdPartyCookies); + MenuItem domStorageIcon = mainMenu.findItem(R.id.toggleDomStorage); + MenuItem formDataIcon = mainMenu.findItem(R.id.toggleSaveFormData); + + // Update `privacyIcon`. if (javaScriptEnabled) { + // `JavaScript` is enabled. privacyIcon.setIcon(R.drawable.javascript_enabled); } else { if (firstPartyCookiesEnabled) { + // `JavaScript` is disabled but cookies are enabled. privacyIcon.setIcon(R.drawable.warning); } else { + // All the dangerous features are disabled. privacyIcon.setIcon(R.drawable.privacy_mode); } } + + // Update `firstPartyCookiesIcon`. + if (firstPartyCookiesEnabled) { + // First-party cookies are enabled. + firstPartyCookiesIcon.setIcon(R.drawable.cookies_warning); + } else { + // First-party cookies are disabled. + firstPartyCookiesIcon.setIcon(R.drawable.cookies_disabled); + } + + // Update `thirdPartyCookiesIcon`. + if (firstPartyCookiesEnabled) { + if (thirdPartyCookiesEnabled) { + // Third-party cookies are enabled. Bad! + thirdPartyCookiesIcon.setIcon(R.drawable.cookies_critical); + } else { + // Third-party cookies are disabled. + thirdPartyCookiesIcon.setIcon(R.drawable.cookies_disabled); + } + } else { + // First-party cookies are disabled, so third-party cookies are ghosted. + thirdPartyCookiesIcon.setIcon(R.drawable.cookies_ghosted); + } + + // Update `domStorageIcon`. + if (javaScriptEnabled) { + if (domStorageEnabled) { + domStorageIcon.setIcon(R.drawable.dom_storage_enabled); + } else { + domStorageIcon.setIcon(R.drawable.dom_storage_disabled); + } + } else { + domStorageIcon.setIcon(R.drawable.dom_storage_ghosted); + } + + // Update `formDataIcon`. + if (saveFormDataEnabled) { + formDataIcon.setIcon(R.drawable.form_data_enabled); + } else { + formDataIcon.setIcon(R.drawable.form_data_disabled); + } + + // `invalidateOptionsMenu` calls `onPrepareOptionsMenu()` and redraws the icons in the `AppBar`. + ActivityCompat.invalidateOptionsMenu(activity); } }