From: Soren Stoutner Date: Tue, 6 Sep 2016 02:30:31 +0000 (-0700) Subject: Add a DNT option and turn it on by default. Fixes https://redmine.stoutner.com/issues/30 X-Git-Tag: v1.10~7 X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=826776d415157b99701dd19d2713a60db6fefe2c;p=PrivacyBrowserAndroid.git Add a DNT option and turn it on by default. Fixes https://redmine.stoutner.com/issues/30 --- diff --git a/app/src/main/assets/de/guide_local_storage.html b/app/src/main/assets/de/guide_local_storage.html index 8aea5734..d3c2a84b 100644 --- a/app/src/main/assets/de/guide_local_storage.html +++ b/app/src/main/assets/de/guide_local_storage.html @@ -27,11 +27,17 @@ h3 { color: 0D4781; } + + img { + vertical-align: bottom; + height: 32; + width: 32; + } -

Erstanbieter-Cookies

Cookies können in zwei Typen unterteilt werden. Erstanbieter-Cookies sind Cookies, die von aktuell besuchten Website gesetzt werden.

@@ -54,7 +60,7 @@ als Warnung.

Drittanbieter-Cookies

Drittanbieter-Cookies werden von Teilen einer Website gesetzt, die von einem anderen Server als dem aktuell besuchten. Beispielsweise laden viele Websites Werbungen von einem Drittanbieter-Broker wie Googles @@ -82,14 +88,14 @@ Deshalb aktiviert das Aktivieren von Erstanbieter-Cookies zugleich auch Drittanbieter-Cookies.

DOM-Speicher

Der Document Object Model-Speicher, auch bekannt als Web-Speicher, ist wie Cookies auf Steroiden. Während die maximale Gesamtspeichergrße für alle Cookies von einer einzigen URL 4kb beträgt, kann der DOM-Speicher zwischen 5-25 Megabytes pro Seite betragen. Da der DOM-Speicher Javascript zum Lesen und Schreiben von Daten nutzt, Ã¤ndert das Aktivieren also nichts, solange nicht auch Javascript aktiviert ist.

Formulardaten

Formulardaten beinhalten die Informationen, die in Web-Formularen eingegeben werden, wie Benutzernamen, Adressen, Telefonnummern etc. und listet sie als Auswahlmenü auf künftig besuchten Websites auf. Ungleich der anderen Arten der lokalen Datenspeicherung werden Formulardaten nicht ohne die explizite Handlung des Nutzers an den Webserver gesendet.

diff --git a/app/src/main/assets/de/images/cookie_dark_blue.png b/app/src/main/assets/de/images/cookie_dark_blue.png new file mode 120000 index 00000000..d8473698 --- /dev/null +++ b/app/src/main/assets/de/images/cookie_dark_blue.png @@ -0,0 +1 @@ +../../en/images/cookie_dark_blue.png \ No newline at end of file diff --git a/app/src/main/assets/de/images/ic_subtitles_dark_blue.png b/app/src/main/assets/de/images/ic_subtitles_dark_blue.png new file mode 120000 index 00000000..6bccc980 --- /dev/null +++ b/app/src/main/assets/de/images/ic_subtitles_dark_blue.png @@ -0,0 +1 @@ +../../en/images/ic_subtitles_dark_blue.png \ No newline at end of file diff --git a/app/src/main/assets/de/images/ic_web_dark_blue.png b/app/src/main/assets/de/images/ic_web_dark_blue.png new file mode 120000 index 00000000..ddc6eef3 --- /dev/null +++ b/app/src/main/assets/de/images/ic_web_dark_blue.png @@ -0,0 +1 @@ +../../en/images/ic_web_dark_blue.png \ No newline at end of file diff --git a/app/src/main/assets/en/guide_local_storage.html b/app/src/main/assets/en/guide_local_storage.html index ae110a6b..c0eeaaee 100644 --- a/app/src/main/assets/en/guide_local_storage.html +++ b/app/src/main/assets/en/guide_local_storage.html @@ -18,15 +18,21 @@ - + -

First-Party Cookies

Cookies can be divided into two types. First-party cookies are cookies set by the website in the URL bar at the top of the page.

@@ -49,7 +55,7 @@ as a warning.

Third-Party Cookies

Third-party cookies are set by portions of a website that are loaded from servers different from the URL at the top of the page. For example, most website that have advertisements load them from a third-party ad broker, like Google's @@ -78,14 +84,14 @@ between first-party and third-party cookies. Thus, enabling first-party cookies will also enable third-party cookies.

DOM Storage

Document Object Model storage, also known as web storage, is like cookies on steroids. Whereas the maximum combined storage size for all cookies from a single URL is 4 kilobytes, DOM storage can hold between 5-25 megabytes per site. Because DOM storage uses JavaScript to read and write data, enabling it will do nothing unless JavaScript is also enabled.

Form Data

Form data contains information typed into web forms, like user names, addresses, phone numbers, etc., and lists them in a drop-down box on future visits. Unlike the other forms of local storage, form data is not sent to the web server without specific user interaction.

diff --git a/app/src/main/assets/en/guide_tracking_ids.html b/app/src/main/assets/en/guide_tracking_ids.html index 14bed944..77813ade 100644 --- a/app/src/main/assets/en/guide_tracking_ids.html +++ b/app/src/main/assets/en/guide_tracking_ids.html @@ -32,6 +32,17 @@ +

Do Not Track

+ +

A few years ago the W3C (World Wide Web Consortium) created a mechanism for browsers to inform web servers that they would not like to be tracked. + This is accomplished by including a DNT (Do Not Track) header with web requests. + This header is enabled by default in Privacy Browser, although if desired it can be disabled in the settings.

+ +

The DNT header doesn't really provide much privacy because most web servers ignore it. Yahoo programmed their servers to ignore the DNT header + from Internet Explorer 10 when it was turned on by default because they argued that the user had not made the decision to enable DNT. + Google and Microsoft ignore DNT even though they include a DNT feature in the browsers they distribute. Facebook also ignores DNT.

+ +

Privacy Browser Free includes a banner advertisement across the bottom of the screen that is populated by Google's @@ -53,6 +64,5 @@

Verizon, one of the major mobile carriers in the United States, adds a unique tracking header to all HTTP traffic on their network. The Electronic Frontier Foundation has written about the privacy implications of this practice. Due to public pressure Verizon has created a way to opt out of this tracking.

- \ No newline at end of file diff --git a/app/src/main/assets/en/images/cookie_dark_blue.png b/app/src/main/assets/en/images/cookie_dark_blue.png new file mode 100644 index 00000000..a4d5d409 Binary files /dev/null and b/app/src/main/assets/en/images/cookie_dark_blue.png differ diff --git a/app/src/main/assets/en/images/ic_subtitles_dark_blue.png b/app/src/main/assets/en/images/ic_subtitles_dark_blue.png new file mode 100644 index 00000000..11c87bd3 Binary files /dev/null and b/app/src/main/assets/en/images/ic_subtitles_dark_blue.png differ diff --git a/app/src/main/assets/en/images/ic_web_dark_blue.png b/app/src/main/assets/en/images/ic_web_dark_blue.png new file mode 100644 index 00000000..d3030bef Binary files /dev/null and b/app/src/main/assets/en/images/ic_web_dark_blue.png differ diff --git a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java index d604a2e1..2af787eb 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java @@ -103,7 +103,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // It is also used in `onCreate()`, `onCreateOptionsMenu()`, `onPrepareOptionsMenu()`, and `onOptionsItemSelected()`. public static boolean firstPartyCookiesEnabled; - // `thridPartyCookiesEnables` is public static so it can be accessed from `SettingsFragment`. + // `thirdPartyCookiesEnables` is public static so it can be accessed from `SettingsFragment`. // It is also used in `onCreate()`, `onCreateOptionsMenu()`, `onPrepareOptionsMenu()`, and `onOptionsItemSelected()`. public static boolean thirdPartyCookiesEnabled; @@ -128,7 +128,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // `swipeToRefreshEnabled` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()`. public static boolean swipeToRefreshEnabled; - // `customHeader` is public static so it can be accessed from `BookmarksActivity`. It is also used in `onCreate()` and `loadUrlFromTextBox()`. + // `customHeader` is public static so it can be accessed from `BookmarksActivity`. It is also used in `onCreate()`, `onOptionsItemSelected()`, and `loadUrlFromTextBox()`. public static Map customHeaders = new HashMap(); @@ -222,9 +222,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // drawerToggle creates the hamburger icon at the start of the AppBar. drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, supportAppBar, R.string.open_navigation, R.string.close_navigation); - // Replace the header that `WebView` creates for `X-Requested-With` with a null value. The default value is the application ID (com.stoutner.privacybrowser.standard). - customHeaders.put("X-Requested-With", ""); - mainWebView.setWebViewClient(new WebViewClient() { // shouldOverrideUrlLoading makes this `WebView` the default handler for URLs inside the app, so that links are not kicked out to other apps. @Override @@ -452,6 +449,15 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation swipeToRefresh.setEnabled(swipeToRefreshEnabled); + // Replace the header that `WebView` creates for `X-Requested-With` with a null value. The default value is the application ID (com.stoutner.privacybrowser.standard). + customHeaders.put("X-Requested-With", ""); + + // Set Do Not Track. The default is true. + if (sharedPreferences.getBoolean("do_not_track", true)) { + customHeaders.put("DNT", "1"); + } + + // Get the intent information that started the app. final Intent intent = getIntent(); @@ -920,6 +926,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Clear `formattedUrlString`. formattedUrlString = null; + // Clear `customHeaders`. + customHeaders.clear(); + // Destroy the internal state of the webview. mainWebView.destroy(); diff --git a/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java index 51952c4f..4eef49c2 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/SettingsFragment.java @@ -128,32 +128,30 @@ public class SettingsFragment extends PreferenceFragment { switch (key) { case "javascript_enabled": - // Set javaScriptEnabled to the new state. The default is false. + // Set `javaScriptEnabled` to the new state. The default is `false`. MainWebViewActivity.javaScriptEnabled = sharedPreferences.getBoolean("javascript_enabled", false); - // Toggle the state of the "dom_storage_enabled" preference. The default is false. + // Toggle the state of the `dom_storage_enabled` preference. The default is `false`. final Preference domStorageEnabled = findPreference("dom_storage_enabled"); domStorageEnabled.setEnabled(sharedPreferences.getBoolean("javascript_enabled", false)); - // Update mainWebView and reload the website. + // Update `mainWebView`. MainWebViewActivity.mainWebView.getSettings().setJavaScriptEnabled(MainWebViewActivity.javaScriptEnabled); - MainWebViewActivity.mainWebView.reload(); // Update the privacy icons. MainWebViewActivity.updatePrivacyIcons(MainWebViewActivity.privacyBrowserActivity); break; case "first_party_cookies_enabled": - // Set firstPartyCookiesEnabled to the new state. The default is false. + // Set `firstPartyCookiesEnabled` to the new state. The default is `false`. MainWebViewActivity.firstPartyCookiesEnabled = sharedPreferences.getBoolean("first_party_cookies_enabled", false); - // Toggle the state of the "third_party_cookies_enabled" preference. The default is false. + // Toggle the state of the `third_party_cookies_enabled` preference. The default is `false`. final Preference thirdPartyCookiesEnabled = findPreference("third_party_cookies_enabled"); thirdPartyCookiesEnabled.setEnabled(sharedPreferences.getBoolean("first_party_cookies_enabled", false)); - // Update mainWebView and reload the website. + // Update `mainWebView`. MainWebViewActivity.cookieManager.setAcceptCookie(MainWebViewActivity.firstPartyCookiesEnabled); - MainWebViewActivity.mainWebView.reload(); // Update the checkbox in the options menu. MenuItem firstPartyCookiesMenuItem = MainWebViewActivity.mainMenu.findItem(R.id.toggleFirstPartyCookies); @@ -164,17 +162,16 @@ public class SettingsFragment extends PreferenceFragment { break; case "third_party_cookies_enabled": - // Set thirdPartyCookiesEnabled to the new state. The default is false. + // Set `thirdPartyCookiesEnabled` to the new state. The default is `false`. MainWebViewActivity.thirdPartyCookiesEnabled = sharedPreferences.getBoolean("third_party_cookies_enabled", false); // Update the checkbox in the options menu. MenuItem thirdPartyCookiesMenuItem = MainWebViewActivity.mainMenu.findItem(R.id.toggleThirdPartyCookies); thirdPartyCookiesMenuItem.setChecked(MainWebViewActivity.thirdPartyCookiesEnabled); - // Update mainWebView and reload the website if API >= 21. + // Update `mainWebView` if API >= 21. if (Build.VERSION.SDK_INT >= 21) { MainWebViewActivity.cookieManager.setAcceptThirdPartyCookies(MainWebViewActivity.mainWebView, MainWebViewActivity.thirdPartyCookiesEnabled); - MainWebViewActivity.mainWebView.reload(); } // Update the privacy icons. @@ -182,32 +179,30 @@ public class SettingsFragment extends PreferenceFragment { break; case "dom_storage_enabled": - // Set domStorageEnabled to the new state. The default is false. + // Set `domStorageEnabled` to the new state. The default is `false`. MainWebViewActivity.domStorageEnabled = sharedPreferences.getBoolean("dom_storage_enabled", false); // Update the checkbox in the options menu. MenuItem domStorageMenuItem = MainWebViewActivity.mainMenu.findItem(R.id.toggleDomStorage); domStorageMenuItem.setChecked(MainWebViewActivity.domStorageEnabled); - // Update mainWebView and reload the website. + // Update `mainWebView`. MainWebViewActivity.mainWebView.getSettings().setDomStorageEnabled(MainWebViewActivity.domStorageEnabled); - MainWebViewActivity.mainWebView.reload(); // Update the privacy icons. MainWebViewActivity.updatePrivacyIcons(MainWebViewActivity.privacyBrowserActivity); break; case "save_form_data_enabled": - // Set saveFormDataEnabled to the new state. The default is false. + // Set `saveFormDataEnabled` to the new state. The default is `false`. MainWebViewActivity.saveFormDataEnabled = sharedPreferences.getBoolean("save_form_data_enabled", false); // Update the checkbox in the options menu. MenuItem saveFormDataMenuItem = MainWebViewActivity.mainMenu.findItem(R.id.toggleSaveFormData); saveFormDataMenuItem.setChecked(MainWebViewActivity.saveFormDataEnabled); - // Update mainWebView and reload the website. + // Update `mainWebView`. MainWebViewActivity.mainWebView.getSettings().setSaveFormData(MainWebViewActivity.saveFormDataEnabled); - MainWebViewActivity.mainWebView.reload(); // Update the privacy icons. MainWebViewActivity.updatePrivacyIcons(MainWebViewActivity.privacyBrowserActivity); @@ -218,7 +213,7 @@ public class SettingsFragment extends PreferenceFragment { switch (userAgentString) { case "Default user agent": - // Set the default user agent on mainWebView, display the user agent as the summary text for userAgentPreference, and disable customUserAgent. + // Set the default user agent on `mainWebView`, display the user agent as the summary text for `userAgentPreference`, and disable `customUserAgent`. // Once API >= 17 we can use getDefaultUserAgent(). For now, setUserAgentString("") sets the WebView's default user agent. MainWebViewActivity.mainWebView.getSettings().setUserAgentString(""); userAgentPreference.setSummary(MainWebViewActivity.mainWebView.getSettings().getUserAgentString()); @@ -298,18 +293,26 @@ public class SettingsFragment extends PreferenceFragment { break; case "javascript_enabled_search_custom_url": - // Set the new custom search URL as the summary text for "javascript_enabled_search_custom_url". The default is "". + // Set the new custom search URL as the summary text for `javascript_enabled_search_custom_url`. The default is ``. javaScriptEnabledSearchCustomURLPreference.setSummary(sharedPreferences.getString("javascript_enabled_search_custom_url", "")); - // Update javaScriptEnabledSearchCustomURL. The default is "". + // Update javaScriptEnabledSearchCustomURL. The default is ``. MainWebViewActivity.javaScriptEnabledSearchURL = sharedPreferences.getString("javascript_enabled_search_custom_url", ""); break; + case "do_not_track": + // Update `customHeaders`. The default is `true`. + if (sharedPreferences.getBoolean("do_not_track", true)) { + MainWebViewActivity.customHeaders.put("DNT", "1"); + } else { // Remove the Do Not Track header. + MainWebViewActivity.customHeaders.remove("DNT"); + } + case "homepage": - // Set the new homepage URL as the summary text for the Homepage preference. The default is "https://www.duckduckgo.com". + // Set the new homepage URL as the summary text for the Homepage preference. The default is `https://www.duckduckgo.com`. homepagePreference.setSummary(sharedPreferences.getString("homepage", "https://www.duckduckgo.com")); - // Update the homepage variable. The default is "https://www.duckduckgo.com". + // Update the homepage variable. The default is `https://www.duckduckgo.com`. MainWebViewActivity.homepage = sharedPreferences.getString("homepage", "https://www.duckduckgo.com"); break; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 02ed5ea1..2ede85be 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -205,6 +205,8 @@ Custom user agent Custom user agent + Do not track + Send the Do Not Track header which politely suggests that web servers not track this browser. Search JavaScript-disabled search

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index f6acd257..4441ca6a 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -68,6 +68,12 @@ android:defaultValue="PrivacyBrowser/1.0" android:inputType="textVisiblePassword|textMultiLine" /> + +

Erstanbieter-Cookies

Erstanbieter-Cookies

Drittanbieter-Cookies

Drittanbieter-Cookies

DOM-Speicher

DOM-Speicher

Formulardaten

Formulardaten

First-Party Cookies

First-Party Cookies

Third-Party Cookies

Third-Party Cookies

DOM Storage

DOM Storage

Form Data

Form Data

Do Not Track

Advertisements