From: Soren Stoutner Date: Thu, 28 Apr 2016 03:24:57 +0000 (-0700) Subject: Add controls for third-party cookies. X-Git-Tag: v1.4-standard~2 X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=d649575d732610b57a2b35cbbb8ac9557b068005;p=PrivacyBrowserAndroid.git Add controls for third-party cookies. Migrate the SettingsActivity to a SettingsFragment. --- diff --git a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java index 13600840..2720a8ac 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java @@ -92,8 +92,10 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // cookieManager is used in onCreate(), onOptionsItemSelected(), and onNavigationItemSelected(). private CookieManager cookieManager; - // cookiesEnabled is used in onCreate(), onCreateOptionsMenu(), and onOptionsItemSelected(). - private boolean cookiesEnabled; + // firstPartyCookiesEnabled is used in onCreate(), onCreateOptionsMenu(), onPrepareOptionsMenu(), and onOptionsItemSelected(). + private boolean firstPartyCookiesEnabled; + // thirdPartyCookiesEnabled is uesd in onCreate(), onCreateOptionsMenu(), onPrepareOptionsMenu(), and onOptionsItemSelected(). + private boolean thirdPartyCookiesEnabled; // urlTextBox is used in onCreate(), onOptionsItemSelected(), and loadUrlFromTextBox(). private EditText urlTextBox; @@ -316,21 +318,23 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation javaScriptEnabled = savedPreferences.getBoolean("javascript_enabled", false); mainWebView.getSettings().setJavaScriptEnabled(javaScriptEnabled); + // Initialize cookieManager. + cookieManager = CookieManager.getInstance(); + + // Set cookies initial status. + firstPartyCookiesEnabled = savedPreferences.getBoolean("first_party_cookies_enabled", false); + cookieManager.setAcceptCookie(firstPartyCookiesEnabled); + + // Set third-party cookies initial status if API >= 21. + if (Build.VERSION.SDK_INT >= 21) { + thirdPartyCookiesEnabled = savedPreferences.getBoolean("third_party_cookies_enabled", false); + cookieManager.setAcceptThirdPartyCookies(mainWebView, thirdPartyCookiesEnabled); + } + // Set DOM storage initial status. domStorageEnabled = savedPreferences.getBoolean("dom_storage_enabled", false); mainWebView.getSettings().setDomStorageEnabled(domStorageEnabled); - /* Save Form Data does nothing until database storage is implemented. - // Set Save Form Data initial status. - saveFormDataEnabled = true; - mainWebView.getSettings().setSaveFormData(saveFormDataEnabled); - */ - - // Set cookies initial status. - cookiesEnabled = savedPreferences.getBoolean("cookies_enabled", false); - cookieManager = CookieManager.getInstance(); - cookieManager.setAcceptCookie(cookiesEnabled); - // Set homepage initial status. homepage = savedPreferences.getString("homepage", "https://www.duckduckgo.com"); @@ -388,17 +392,18 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Get MenuItems for checkable menu items. MenuItem toggleJavaScript = menu.findItem(R.id.toggleJavaScript); + MenuItem toggleFirstPartyCookies = menu.findItem(R.id.toggleFirstPartyCookies); + MenuItem toggleThirdPartyCookies = menu.findItem(R.id.toggleThirdPartyCookies); MenuItem toggleDomStorage = menu.findItem(R.id.toggleDomStorage); /* toggleSaveFormData does nothing until database storage is implemented. MenuItem toggleSaveFormData = menu.findItem(R.id.toggleSaveFormData); */ - MenuItem toggleCookies = menu.findItem(R.id.toggleCookies); // Set the initial icon for toggleJavaScript if (javaScriptEnabled) { toggleJavaScript.setIcon(R.drawable.javascript_enabled); } else { - if (domStorageEnabled || cookiesEnabled) { + if (domStorageEnabled || firstPartyCookiesEnabled) { toggleJavaScript.setIcon(R.drawable.warning); } else { toggleJavaScript.setIcon(R.drawable.privacy_mode); @@ -406,17 +411,26 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation } // Set the initial status of the menu item checkboxes. + toggleFirstPartyCookies.setChecked(firstPartyCookiesEnabled); + toggleThirdPartyCookies.setChecked(thirdPartyCookiesEnabled); toggleDomStorage.setChecked(domStorageEnabled); /* toggleSaveFormData does nothing until database storage is implemented. toggleSaveFormData.setChecked(saveFormDataEnabled); */ - toggleCookies.setChecked(cookiesEnabled); return true; } @Override public boolean onPrepareOptionsMenu(Menu menu) { + // Only enable Third-Party Cookies if SDK >= 21 and First-Party Cookies are enabled. + MenuItem toggleThirdPartyCookies = menu.findItem(R.id.toggleThirdPartyCookies); + if ((Build.VERSION.SDK_INT >= 21) && firstPartyCookiesEnabled) { + toggleThirdPartyCookies.setEnabled(true); + } else { + toggleThirdPartyCookies.setEnabled(false); + } + // Enable Clear Cookies if there are any. MenuItem clearCookies = menu.findItem(R.id.clearCookies); clearCookies.setEnabled(cookieManager.hasCookies()); @@ -448,17 +462,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation mainWebView.reload(); // Update the toggleJavaScript icon and display a snackbar. - if (domStorageEnabled || cookiesEnabled) { + if (domStorageEnabled || firstPartyCookiesEnabled) { menuItem.setIcon(R.drawable.warning); - if (domStorageEnabled && cookiesEnabled) { - Snackbar.make(findViewById(R.id.mainWebView), R.string.both_still_enabled, Snackbar.LENGTH_SHORT).show(); - } else { - if (domStorageEnabled) { - Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_still_enabled, Snackbar.LENGTH_SHORT).show(); - } else { - Snackbar.make(findViewById(R.id.mainWebView), R.string.cookies_still_enabled, Snackbar.LENGTH_SHORT).show(); - } - } + Snackbar.make(findViewById(R.id.mainWebView), R.string.javascript_disabled, Snackbar.LENGTH_SHORT).show(); } else { menuItem.setIcon(R.drawable.privacy_mode); Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); @@ -472,75 +478,83 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation } return true; - case R.id.toggleDomStorage: - if (domStorageEnabled) { - domStorageEnabled = false; + case R.id.toggleFirstPartyCookies: + if (firstPartyCookiesEnabled) { + firstPartyCookiesEnabled = false; menuItem.setChecked(false); - mainWebView.getSettings().setDomStorageEnabled(false); + cookieManager.setAcceptCookie(false); mainWebView.reload(); - // Update the toggleJavaScript icon and display a snackbar if appropriate. - if (!javaScriptEnabled && !cookiesEnabled) { - toggleJavaScript.setIcon(R.drawable.privacy_mode); - Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); - } else { - if (cookiesEnabled) { + // Update the toggleJavaScript icon if appropriate and display a snackbar. + if (!javaScriptEnabled) { + if (domStorageEnabled) { toggleJavaScript.setIcon(R.drawable.warning); - Snackbar.make(findViewById(R.id.mainWebView), R.string.cookies_still_enabled, Snackbar.LENGTH_SHORT).show(); - } // Else Do nothing because JavaScript is enabled. + Snackbar.make(findViewById(R.id.mainWebView), R.string.first_party_cookies_disabled, Snackbar.LENGTH_SHORT).show(); + } else { + toggleJavaScript.setIcon(R.drawable.privacy_mode); + Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); + } + } else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.first_party_cookies_disabled, Snackbar.LENGTH_SHORT).show(); } } else { - domStorageEnabled = true; + firstPartyCookiesEnabled = true; menuItem.setChecked(true); - mainWebView.getSettings().setDomStorageEnabled(true); + cookieManager.setAcceptCookie(true); mainWebView.reload(); // Update the toggleJavaScript icon if appropriate. if (!javaScriptEnabled) { toggleJavaScript.setIcon(R.drawable.warning); - } // Else Do nothing because JavaScript is enabled. + } // Else do nothing because JavaScript is enabled. - Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_enabled, Snackbar.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.first_party_cookies_enabled, Snackbar.LENGTH_SHORT).show(); } return true; - /* toggleSaveFormData does nothing until database storage is implemented. - case R.id.toggleSaveFormData: - if (saveFormDataEnabled) { - saveFormDataEnabled = false; - menuItem.setChecked(false); - mainWebView.getSettings().setSaveFormData(false); - mainWebView.reload(); - } else { - saveFormDataEnabled = true; - menuItem.setChecked(true); - mainWebView.getSettings().setSaveFormData(true); - mainWebView.reload(); - } + case R.id.toggleThirdPartyCookies: + if (Build.VERSION.SDK_INT >= 21) { + if (thirdPartyCookiesEnabled) { + thirdPartyCookiesEnabled = false; + menuItem.setChecked(false); + cookieManager.setAcceptThirdPartyCookies(mainWebView, false); + mainWebView.reload(); + + Snackbar.make(findViewById(R.id.mainWebView), R.string.third_party_cookies_disabled, Snackbar.LENGTH_SHORT).show(); + } else { + thirdPartyCookiesEnabled = true; + menuItem.setChecked(true); + cookieManager.setAcceptThirdPartyCookies(mainWebView, true); + mainWebView.reload(); + + Snackbar.make(findViewById(R.id.mainWebView), R.string.third_party_cookies_enabled, Snackbar.LENGTH_SHORT).show(); + } + } // Else do nothing because SDK < 21. return true; - */ - case R.id.toggleCookies: - if (cookiesEnabled) { - cookiesEnabled = false; + case R.id.toggleDomStorage: + if (domStorageEnabled) { + domStorageEnabled = false; menuItem.setChecked(false); - cookieManager.setAcceptCookie(false); + mainWebView.getSettings().setDomStorageEnabled(false); mainWebView.reload(); - // Update the toggleJavaScript icon and display a snackbar if appropriate. - if (!javaScriptEnabled && !domStorageEnabled) { - toggleJavaScript.setIcon(R.drawable.privacy_mode); - Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); - } else { - if (domStorageEnabled) { + // Update the toggleJavaScript icon if appropriate and display a snackbar. + if (!javaScriptEnabled) { + if (firstPartyCookiesEnabled) { toggleJavaScript.setIcon(R.drawable.warning); - Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_enabled, Snackbar.LENGTH_SHORT).show(); - } // Else Do nothing because JavaScript is enabled. + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_disabled, Snackbar.LENGTH_SHORT).show(); + } else { + toggleJavaScript.setIcon(R.drawable.privacy_mode); + Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); + } + }else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_disabled, Snackbar.LENGTH_SHORT).show(); } } else { - cookiesEnabled = true; + domStorageEnabled = true; menuItem.setChecked(true); - cookieManager.setAcceptCookie(true); + mainWebView.getSettings().setDomStorageEnabled(true); mainWebView.reload(); // Update the toggleJavaScript icon if appropriate. @@ -548,16 +562,10 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation toggleJavaScript.setIcon(R.drawable.warning); } // Else Do nothing because JavaScript is enabled. - Snackbar.make(findViewById(R.id.mainWebView), R.string.cookies_enabled, Snackbar.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_enabled, Snackbar.LENGTH_SHORT).show(); } return true; - case R.id.clearDomStorage: - WebStorage webStorage = WebStorage.getInstance(); - webStorage.deleteAllData(); - Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_deleted, Snackbar.LENGTH_SHORT).show(); - return true; - case R.id.clearCookies: if (Build.VERSION.SDK_INT < 21) { cookieManager.removeAllCookie(); @@ -567,6 +575,12 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation Snackbar.make(findViewById(R.id.mainWebView), R.string.cookies_deleted, Snackbar.LENGTH_SHORT).show(); return true; + case R.id.clearDomStorage: + WebStorage webStorage = WebStorage.getInstance(); + webStorage.deleteAllData(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_deleted, Snackbar.LENGTH_SHORT).show(); + return true; + case R.id.share: Intent shareIntent = new Intent(); shareIntent.setAction(Intent.ACTION_SEND); @@ -622,7 +636,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation break; case R.id.settings: - // Launch SettingsActivity. + // Launch PreferenceFragment. Intent intent = new Intent(this, SettingsActivity.class); startActivity(intent); break; diff --git a/app/src/main/java/com/stoutner/privacybrowser/SettingsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/SettingsActivity.java index f0f78fff..4c0a603b 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/SettingsActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/SettingsActivity.java @@ -20,15 +20,14 @@ package com.stoutner.privacybrowser; import android.os.Bundle; -import android.preference.PreferenceActivity; +import android.support.v7.app.AppCompatActivity; -// Once the minimum API is >= 11 we can switch from the deprecated PreferenceActivity to using a PreferenceFragment. -public class SettingsActivity extends PreferenceActivity { +public class SettingsActivity extends AppCompatActivity { @Override - // Until minimum API is >= 11 we needs to use the deprecated addPreferenceFromResource from PreferenceActivity. - @SuppressWarnings("deprecation") - public void onCreate(Bundle savedInstanceState) { + protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.preferences); + + // Display SettingsFragment + getFragmentManager().beginTransaction().replace(android.R.id.content, new SettingsFragment()).commit(); } } diff --git a/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java new file mode 100644 index 00000000..1968c65b --- /dev/null +++ b/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java @@ -0,0 +1,31 @@ +/** + * Copyright 2016 Soren Stoutner . + * + * This file is part of Privacy Browser . + * + * Privacy Browser is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privacy Browser is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Privacy Browser. If not, see . + */ + +package com.stoutner.privacybrowser; + +import android.os.Bundle; +import android.preference.PreferenceFragment; + +public class SettingsFragment extends PreferenceFragment { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.preferences); + } +} diff --git a/app/src/main/res/menu/menu_options.xml b/app/src/main/res/menu/menu_options.xml index e6bdeadd..038b364f 100644 --- a/app/src/main/res/menu/menu_options.xml +++ b/app/src/main/res/menu/menu_options.xml @@ -31,37 +31,35 @@ app:showAsAction="always" /> - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f8a25db2..73c4a465 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -27,13 +27,15 @@ Download started Privacy Mode JavaScript enabled + JavaScript disabled DOM Storage enabled - Cookies enabled - JavaScript disabled, DOM Storage still enabled - Cookies still enabled - JavaScript disabled, DOM Storage and Cookies still enabled - DOM Storage deleted + DOM Storage disabled + First-Party Cookies enabled + First-Party Cookies disabled + Third-Party Cookies enabled + Third-Party Cookies disabled Cookies deleted + DOM Storage deleted Open Navigation Drawer Close Navigation Drawer @@ -51,12 +53,13 @@ About Clear and Exit - + JavaScript + First-Party Cookies + Third-Party Cookies DOM Storage - Cookies - Clear DOM Storage Clear Cookies + Clear DOM Storage Share Add to Home Screen @@ -67,15 +70,21 @@ Privacy Settings - JavaScript - Enable JavaScript by default - DOM Storage - Enable DOM storage by default - Cookies - Enable cookies by default + Enable JavaScript by default + JavaScript allows websites to run programs (scripts) on your device. + Enable First-Party Cookies by default + Cookies allow websites to store information on your device. + First-party cookies come from the server listed in the address bar. + Devices with versions of Android older than Lollipop (version 5.0) will also enable third-party cookies with this setting. + Enable Third-Party Cookies by default + Third-party cookies allow parts of websites that aren\'t the main website, like advertisements, to store information on your device. + This setting requires Android Lollipop (version 5.0) or higher. It has no effect if first-party cookies are disabled. + Enable DOM Storage by default + Document Object Management storage, also called web storage, is an enhanced form of cookies + that allows websites to store larger and more complex types of information, like pictures, on your device. General Settings Homepage - Set the homepage + Set the homepage. About Privacy Browser diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index e2ccb7dc..06dbbd62 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -30,15 +30,21 @@ android:defaultValue="false" /> + +