Remove Do Not Track. https://redmine.stoutner.com/issues/668

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 d7a742315ee00a84b1e648d36b7760a8aacd975c..d89e287b9268f08fb06cc20f952a82c444f18cf0 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -3605,7 +3605,6 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
 
         // Store the values from the shared preferences in variables.
         incognitoModeEnabled = sharedPreferences.getBoolean("incognito_mode", false);
 
         // Store the values from the shared preferences in variables.
         incognitoModeEnabled = sharedPreferences.getBoolean("incognito_mode", false);

-        boolean doNotTrackEnabled = sharedPreferences.getBoolean("do_not_track", false);

         sanitizeGoogleAnalytics = sharedPreferences.getBoolean("google_analytics", true);
         sanitizeFacebookClickIds = sharedPreferences.getBoolean("facebook_click_ids", true);
         sanitizeTwitterAmpRedirects = sharedPreferences.getBoolean("twitter_amp_redirects", true);
         sanitizeGoogleAnalytics = sharedPreferences.getBoolean("google_analytics", true);
         sanitizeFacebookClickIds = sharedPreferences.getBoolean("facebook_click_ids", true);
         sanitizeTwitterAmpRedirects = sharedPreferences.getBoolean("twitter_amp_redirects", true);


@@ -3636,13 +3635,6 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
         // Apply the proxy.
         applyProxy(false);
 
         // Apply the proxy.
         applyProxy(false);
 

-        // Set Do Not Track status.
-        if (doNotTrackEnabled) {
-            customHeaders.put("DNT", "1");
-        } else {
-            customHeaders.remove("DNT");
-        }
-

         // Get the current layout parameters.  Using coordinator layout parameters allows the `setBehavior()` command and using app bar layout parameters allows the `setScrollFlags()` command.
         CoordinatorLayout.LayoutParams swipeRefreshLayoutParams = (CoordinatorLayout.LayoutParams) swipeRefreshLayout.getLayoutParams();
         AppBarLayout.LayoutParams toolbarLayoutParams = (AppBarLayout.LayoutParams) toolbar.getLayoutParams();
         // Get the current layout parameters.  Using coordinator layout parameters allows the `setBehavior()` command and using app bar layout parameters allows the `setScrollFlags()` command.
         CoordinatorLayout.LayoutParams swipeRefreshLayoutParams = (CoordinatorLayout.LayoutParams) swipeRefreshLayout.getLayoutParams();
         AppBarLayout.LayoutParams toolbarLayoutParams = (AppBarLayout.LayoutParams) toolbar.getLayoutParams();

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt
index 64e4ee98643d9d244b7e83fa648becc5396d93ad..173313f65da654b540f2d88af163bc59ba176aa3 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright © 2017-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017-2021 Soren Stoutner <soren@stoutner.com>.

  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *


@@ -183,9 +183,6 @@ class ViewSourceActivity: AppCompatActivity() {
         // Set the swipe refresh background color.
         swipeRefreshLayout.setProgressBackgroundColorSchemeColor(colorBackgroundInt)
 
         // Set the swipe refresh background color.
         swipeRefreshLayout.setProgressBackgroundColorSchemeColor(colorBackgroundInt)
 

-        // Get the Do Not Track status.
-        val doNotTrack = sharedPreferences.getBoolean(getString(R.string.do_not_track_key), false)
-

         // Populate the locale string.
         val localeString = if (Build.VERSION.SDK_INT >= 24) {  // SDK >= 24 has a list of locales.
             // Get the list of locales.
         // Populate the locale string.
         val localeString = if (Build.VERSION.SDK_INT >= 24) {  // SDK >= 24 has a list of locales.
             // Get the list of locales.


@@ -257,7 +254,7 @@ class ViewSourceActivity: AppCompatActivity() {
         progressBar.isIndeterminate = true
 
         // Instantiate the WebView source factory.
         progressBar.isIndeterminate = true
 
         // Instantiate the WebView source factory.

-        val webViewSourceFactory: ViewModelProvider.Factory = WebViewSourceFactory(currentUrl!!, userAgent!!, doNotTrack, localeString, proxy, MainWebViewActivity.executorService)
+        val webViewSourceFactory: ViewModelProvider.Factory = WebViewSourceFactory(currentUrl!!, userAgent!!, localeString, proxy, MainWebViewActivity.executorService)

 
         // Instantiate the WebView source view model class.
         val webViewSource = ViewModelProvider(this, webViewSourceFactory).get(WebViewSource::class.java)
 
         // Instantiate the WebView source view model class.
         val webViewSource = ViewModelProvider(this, webViewSourceFactory).get(WebViewSource::class.java)


@@ -375,11 +372,8 @@ class ViewSourceActivity: AppCompatActivity() {
             // Get the index of the `/` immediately after the domain name.
             val endOfDomainName = urlString.indexOf("/", urlString.indexOf("//") + 2)
 
             // Get the index of the `/` immediately after the domain name.
             val endOfDomainName = urlString.indexOf("/", urlString.indexOf("//") + 2)
 

-            // Create a base URL string.
-            val baseUrl: String
-

             // Get the base URL.
             // Get the base URL.

-            baseUrl = if (endOfDomainName > 0) {  // There is at least one character after the base URL.
+            val baseUrl = if (endOfDomainName > 0) {  // There is at least one character after the base URL.

                 // Get the base URL.
                 urlString.substring(0, endOfDomainName)
             } else {  // There are no characters after the base URL.
                 // Get the base URL.
                 urlString.substring(0, endOfDomainName)
             } else {  // There are no characters after the base URL.

diff --git a/app/src/main/java/com/stoutner/privacybrowser/backgroundtasks/GetSourceBackgroundTask.java b/app/src/main/java/com/stoutner/privacybrowser/backgroundtasks/GetSourceBackgroundTask.java
index 2c900646abe02953edd83431f9f57d14a5d0629a..3ecac1d6ff3d4c174a94ff67264252a34936d85a 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/backgroundtasks/GetSourceBackgroundTask.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/backgroundtasks/GetSourceBackgroundTask.java
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright © 2017-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017-2021 Soren Stoutner <soren@stoutner.com>.

  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *


@@ -37,7 +37,7 @@ import java.net.Proxy;
 import java.net.URL;
 
 public class GetSourceBackgroundTask {
 import java.net.URL;
 
 public class GetSourceBackgroundTask {

-    public SpannableStringBuilder[] acquire(String urlString, String userAgent, boolean doNotTrack, String localeString, Proxy proxy, WebViewSource webViewSource) {
+    public SpannableStringBuilder[] acquire(String urlString, String userAgent, String localeString, Proxy proxy, WebViewSource webViewSource) {

         // Initialize the spannable string builders.
         SpannableStringBuilder requestHeadersBuilder = new SpannableStringBuilder();
         SpannableStringBuilder responseMessageBuilder = new SpannableStringBuilder();
         // Initialize the spannable string builders.
         SpannableStringBuilder requestHeadersBuilder = new SpannableStringBuilder();
         SpannableStringBuilder responseMessageBuilder = new SpannableStringBuilder();


@@ -187,25 +187,6 @@ public class GetSourceBackgroundTask {
             requestHeadersBuilder.append(":  ?1");
 
 
             requestHeadersBuilder.append(":  ?1");
 
 

-            // Only populate `Do Not Track` if it is enabled.
-            if (doNotTrack) {
-                // Set the `dnt` header property.
-                httpUrlConnection.setRequestProperty("dnt", "1");
-
-                // Add the `dnt` header to the string builder and format the text.
-                requestHeadersBuilder.append(System.getProperty("line.separator"));
-                if (Build.VERSION.SDK_INT >= 21) {  // Newer versions of Android are so smart.
-                    requestHeadersBuilder.append("dnt", new StyleSpan(Typeface.BOLD), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-                } else {  // Older versions not so much.
-                    oldRequestHeadersBuilderLength = requestHeadersBuilder.length();
-                    requestHeadersBuilder.append("dnt");
-                    newRequestHeadersBuilderLength = requestHeadersBuilder.length();
-                    requestHeadersBuilder.setSpan(new StyleSpan(Typeface.BOLD), oldRequestHeadersBuilderLength, newRequestHeadersBuilderLength, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-                }
-                requestHeadersBuilder.append(":  1");
-            }
-
-

             // Set the `Accept` header property.
             httpUrlConnection.setRequestProperty("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3");
 
             // Set the `Accept` header property.
             httpUrlConnection.setRequestProperty("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3");
 

diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
index df93fa106cbad10807bbf2c9e99d491cbfcbaa38..ef0f1b9af4a34f68e6af62cd1418b9521991b697 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
@@ -80,7 +80,6 @@ public class SettingsFragment extends PreferenceFragmentCompat {
         Preference userAgentPreference = findPreference("user_agent");
         Preference customUserAgentPreference = findPreference("custom_user_agent");
         Preference incognitoModePreference = findPreference("incognito_mode");
         Preference userAgentPreference = findPreference("user_agent");
         Preference customUserAgentPreference = findPreference("custom_user_agent");
         Preference incognitoModePreference = findPreference("incognito_mode");

-        Preference doNotTrackPreference = findPreference("do_not_track");

         Preference allowScreenshotsPreference = findPreference(getString(R.string.allow_screenshots_key));
         Preference easyListPreference = findPreference("easylist");
         Preference easyPrivacyPreference = findPreference("easyprivacy");
         Preference allowScreenshotsPreference = findPreference(getString(R.string.allow_screenshots_key));
         Preference easyListPreference = findPreference("easylist");
         Preference easyPrivacyPreference = findPreference("easyprivacy");


@@ -124,7 +123,6 @@ public class SettingsFragment extends PreferenceFragmentCompat {
         assert userAgentPreference != null;
         assert customUserAgentPreference != null;
         assert incognitoModePreference != null;
         assert userAgentPreference != null;
         assert customUserAgentPreference != null;
         assert incognitoModePreference != null;

-        assert doNotTrackPreference != null;

         assert allowScreenshotsPreference != null;
         assert easyListPreference != null;
         assert easyPrivacyPreference != null;
         assert allowScreenshotsPreference != null;
         assert easyListPreference != null;
         assert easyPrivacyPreference != null;


@@ -469,21 +467,6 @@ public class SettingsFragment extends PreferenceFragmentCompat {
             }
         }
 
             }
         }
 

-        // Set the Do Not Track icon.
-        if (savedPreferences.getBoolean("do_not_track", false)) {
-            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
-                doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_night);
-            } else {
-                doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_day);
-            }
-        } else {
-            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
-                doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_night);
-            } else {
-                doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_day);
-            }
-        }
-

         // Set the allow screenshots icon.
         if (savedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)) {
             if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
         // Set the allow screenshots icon.
         if (savedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)) {
             if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {


@@ -1138,24 +1121,6 @@ public class SettingsFragment extends PreferenceFragmentCompat {
                     }
                     break;
 
                     }
                     break;
 

-                case "do_not_track":
-                    // Update the icon.
-                    if (sharedPreferences.getBoolean("do_not_track", false)) {
-                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
-                            doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_night);
-                        } else {
-                            doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_day);
-                        }
-                    } else {
-                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
-                            doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_night);
-                        } else {
-                            doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_day);
-                        }
-                    }
-
-                    break;
-

                 case "allow_screenshots":
                     // Update the icon.
                     if (sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)) {
                 case "allow_screenshots":
                     // Update the icon.
                     if (sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)) {

diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/ImportExportDatabaseHelper.java b/app/src/main/java/com/stoutner/privacybrowser/helpers/ImportExportDatabaseHelper.java
index f3a4a8db969315af11156c8edff844ff79ea0759..b1aa0c61f61cc2edd07dd81eeadaa1fa893e66eb 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/helpers/ImportExportDatabaseHelper.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/ImportExportDatabaseHelper.java
@@ -41,7 +41,7 @@ public class ImportExportDatabaseHelper {
     public static final String IMPORT_SUCCESSFUL = "Import Successful";
 
     // Declare the class constants.
     public static final String IMPORT_SUCCESSFUL = "Import Successful";
 
     // Declare the class constants.

-    private static final int SCHEMA_VERSION = 13;
+    private static final int SCHEMA_VERSION = 14;

     private static final String PREFERENCES_TABLE = "preferences";
 
     // Declare the preferences constants.
     private static final String PREFERENCES_TABLE = "preferences";
 
     // Declare the preferences constants.


@@ -54,7 +54,6 @@ public class ImportExportDatabaseHelper {
     private static final String USER_AGENT = "user_agent";
     private static final String CUSTOM_USER_AGENT = "custom_user_agent";
     private static final String INCOGNITO_MODE = "incognito_mode";
     private static final String USER_AGENT = "user_agent";
     private static final String CUSTOM_USER_AGENT = "custom_user_agent";
     private static final String INCOGNITO_MODE = "incognito_mode";

-    private static final String DO_NOT_TRACK = "do_not_track";

     private static final String ALLOW_SCREENSHOTS = "allow_screenshots";
     private static final String EASYLIST = "easylist";
     private static final String EASYPRIVACY = "easyprivacy";
     private static final String ALLOW_SCREENSHOTS = "allow_screenshots";
     private static final String EASYLIST = "easylist";
     private static final String EASYPRIVACY = "easyprivacy";


@@ -345,6 +344,10 @@ public class ImportExportDatabaseHelper {
                     // Upgrade from schema version 12, Privacy Browser 3.6.
                     case 12:
                         // Do nothing.  `download_location` and `download_custom_location` were removed from the preferences table.
                     // Upgrade from schema version 12, Privacy Browser 3.6.
                     case 12:
                         // Do nothing.  `download_location` and `download_custom_location` were removed from the preferences table.

+
+                    // Upgrade from schema version 13, Privacy Browser 3.7
+                    case 13:
+                        // Do nothing.  `do_not_track` was removed from the preferences table.

                 }
             }
 
                 }
             }
 


@@ -469,7 +472,6 @@ public class ImportExportDatabaseHelper {
                     .putString(USER_AGENT, importPreferencesCursor.getString(importPreferencesCursor.getColumnIndex(USER_AGENT)))
                     .putString(CUSTOM_USER_AGENT, importPreferencesCursor.getString(importPreferencesCursor.getColumnIndex(CUSTOM_USER_AGENT)))
                     .putBoolean(INCOGNITO_MODE, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(INCOGNITO_MODE)) == 1)
                     .putString(USER_AGENT, importPreferencesCursor.getString(importPreferencesCursor.getColumnIndex(USER_AGENT)))
                     .putString(CUSTOM_USER_AGENT, importPreferencesCursor.getString(importPreferencesCursor.getColumnIndex(CUSTOM_USER_AGENT)))
                     .putBoolean(INCOGNITO_MODE, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(INCOGNITO_MODE)) == 1)

-                    .putBoolean(DO_NOT_TRACK, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(DO_NOT_TRACK)) == 1)

                     .putBoolean(ALLOW_SCREENSHOTS, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(ALLOW_SCREENSHOTS)) == 1)
                     .putBoolean(EASYLIST, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(EASYLIST)) == 1)
                     .putBoolean(EASYPRIVACY, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(EASYPRIVACY)) == 1)
                     .putBoolean(ALLOW_SCREENSHOTS, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(ALLOW_SCREENSHOTS)) == 1)
                     .putBoolean(EASYLIST, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(EASYLIST)) == 1)
                     .putBoolean(EASYPRIVACY, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(EASYPRIVACY)) == 1)


@@ -640,7 +642,6 @@ public class ImportExportDatabaseHelper {
                     USER_AGENT + " TEXT, " +
                     CUSTOM_USER_AGENT + " TEXT, " +
                     INCOGNITO_MODE + " BOOLEAN, " +
                     USER_AGENT + " TEXT, " +
                     CUSTOM_USER_AGENT + " TEXT, " +
                     INCOGNITO_MODE + " BOOLEAN, " +

-                    DO_NOT_TRACK + " BOOLEAN, " +

                     ALLOW_SCREENSHOTS + " BOOLEAN, " +
                     EASYLIST + " BOOLEAN, " +
                     EASYPRIVACY + " BOOLEAN, " +
                     ALLOW_SCREENSHOTS + " BOOLEAN, " +
                     EASYLIST + " BOOLEAN, " +
                     EASYPRIVACY + " BOOLEAN, " +


@@ -691,7 +692,6 @@ public class ImportExportDatabaseHelper {
             preferencesContentValues.put(USER_AGENT, sharedPreferences.getString(USER_AGENT, context.getString(R.string.user_agent_default_value)));
             preferencesContentValues.put(CUSTOM_USER_AGENT, sharedPreferences.getString(CUSTOM_USER_AGENT, context.getString(R.string.custom_user_agent_default_value)));
             preferencesContentValues.put(INCOGNITO_MODE, sharedPreferences.getBoolean(INCOGNITO_MODE, false));
             preferencesContentValues.put(USER_AGENT, sharedPreferences.getString(USER_AGENT, context.getString(R.string.user_agent_default_value)));
             preferencesContentValues.put(CUSTOM_USER_AGENT, sharedPreferences.getString(CUSTOM_USER_AGENT, context.getString(R.string.custom_user_agent_default_value)));
             preferencesContentValues.put(INCOGNITO_MODE, sharedPreferences.getBoolean(INCOGNITO_MODE, false));

-            preferencesContentValues.put(DO_NOT_TRACK, sharedPreferences.getBoolean(DO_NOT_TRACK, false));

             preferencesContentValues.put(ALLOW_SCREENSHOTS, sharedPreferences.getBoolean(ALLOW_SCREENSHOTS, false));
             preferencesContentValues.put(EASYLIST, sharedPreferences.getBoolean(EASYLIST, true));
             preferencesContentValues.put(EASYPRIVACY, sharedPreferences.getBoolean(EASYPRIVACY, true));
             preferencesContentValues.put(ALLOW_SCREENSHOTS, sharedPreferences.getBoolean(ALLOW_SCREENSHOTS, false));
             preferencesContentValues.put(EASYLIST, sharedPreferences.getBoolean(EASYLIST, true));
             preferencesContentValues.put(EASYPRIVACY, sharedPreferences.getBoolean(EASYPRIVACY, true));

diff --git a/app/src/main/java/com/stoutner/privacybrowser/viewmodelfactories/WebViewSourceFactory.kt b/app/src/main/java/com/stoutner/privacybrowser/viewmodelfactories/WebViewSourceFactory.kt
index eeef24f4b8f660640eb7d75a9be0879a12504d1d..870e784e638cbdeddef5106d6d50481bbe86ca51 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/viewmodelfactories/WebViewSourceFactory.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/viewmodelfactories/WebViewSourceFactory.kt
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright © 2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2020-2021 Soren Stoutner <soren@stoutner.com>.

  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *


@@ -25,12 +25,12 @@ import androidx.lifecycle.ViewModelProvider
 import java.net.Proxy
 import java.util.concurrent.ExecutorService
 
 import java.net.Proxy
 import java.util.concurrent.ExecutorService
 

-class WebViewSourceFactory (private val urlString: String, private val userAgent: String, private val doNotTrack: Boolean, private val localeString: String, private val proxy: Proxy,
+class WebViewSourceFactory (private val urlString: String, private val userAgent: String, private val localeString: String, private val proxy: Proxy,

                             private val executorService: ExecutorService): ViewModelProvider.Factory {
     // Override the create function in order to add the provided arguments.
     override fun <T: ViewModel?> create(modelClass: Class<T>): T {
         // Return a new instance of the model class with the provided arguments.
         return modelClass.getConstructor(String::class.java, String::class.java, Boolean::class.java, String::class.java, Proxy::class.java, ExecutorService::class.java)
                             private val executorService: ExecutorService): ViewModelProvider.Factory {
     // Override the create function in order to add the provided arguments.
     override fun <T: ViewModel?> create(modelClass: Class<T>): T {
         // Return a new instance of the model class with the provided arguments.
         return modelClass.getConstructor(String::class.java, String::class.java, Boolean::class.java, String::class.java, Proxy::class.java, ExecutorService::class.java)

-                .newInstance(urlString, userAgent, doNotTrack, localeString, proxy, executorService)
+                .newInstance(urlString, userAgent, localeString, proxy, executorService)

     }
 }
\ No newline at end of file
     }
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/stoutner/privacybrowser/viewmodels/WebViewSource.kt b/app/src/main/java/com/stoutner/privacybrowser/viewmodels/WebViewSource.kt
index 1635fe6e5db1965fba33555184fd593456542183..6d650b0cb8f0a48069970f86d729bebd4b47296c 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/viewmodels/WebViewSource.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/viewmodels/WebViewSource.kt
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright © 2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2020-2021 Soren Stoutner <soren@stoutner.com>.

  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *


@@ -30,7 +30,7 @@ import com.stoutner.privacybrowser.backgroundtasks.GetSourceBackgroundTask
 import java.net.Proxy
 import java.util.concurrent.ExecutorService
 
 import java.net.Proxy
 import java.util.concurrent.ExecutorService
 

-class WebViewSource(private val urlString: String, private val userAgent: String, private val doNotTrack: Boolean, private val localeString: String, private val proxy: Proxy,
+class WebViewSource(private val urlString: String, private val userAgent: String, private val localeString: String, private val proxy: Proxy,

                     private val executorService: ExecutorService): ViewModel() {
     // Initialize the mutable live data variables.
     private val mutableLiveDataSourceStringArray = MutableLiveData<Array<SpannableStringBuilder>>()
                     private val executorService: ExecutorService): ViewModel() {
     // Initialize the mutable live data variables.
     private val mutableLiveDataSourceStringArray = MutableLiveData<Array<SpannableStringBuilder>>()


@@ -42,7 +42,7 @@ class WebViewSource(private val urlString: String, private val userAgent: String
         val getSourceBackgroundTask = GetSourceBackgroundTask()
 
         // Get the source.
         val getSourceBackgroundTask = GetSourceBackgroundTask()
 
         // Get the source.

-        executorService.execute { mutableLiveDataSourceStringArray.postValue(getSourceBackgroundTask.acquire(urlString, userAgent, doNotTrack, localeString, proxy, this)) }
+        executorService.execute { mutableLiveDataSourceStringArray.postValue(getSourceBackgroundTask.acquire(urlString, userAgent, localeString, proxy, this)) }

     }
 
     // The source observer.
     }
 
     // The source observer.


@@ -72,6 +72,6 @@ class WebViewSource(private val urlString: String, private val userAgent: String
         val getSourceBackgroundTask = GetSourceBackgroundTask()
 
         // Get the source.
         val getSourceBackgroundTask = GetSourceBackgroundTask()
 
         // Get the source.

-        executorService.execute { mutableLiveDataSourceStringArray.postValue(getSourceBackgroundTask.acquire(urlString, userAgent, doNotTrack, localeString, proxy, this)) }
+        executorService.execute { mutableLiveDataSourceStringArray.postValue(getSourceBackgroundTask.acquire(urlString, userAgent, localeString, proxy, this)) }

     }
 }
\ No newline at end of file
     }
 }
\ No newline at end of file

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f654e1585c8cd8866167b9284509e8d568e44d9b..362a01dc3e3c6c74eaa9fe8263a90aaa4b07ee4d 100644 (file)
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -495,8 +495,6 @@
         <string name="incognito_mode">Inkognito-Modus</string>
         <string name="incognito_mode_summary">Löscht den Verlauf und den Cache nach jedem fertigen Laden einer Webseite.
             Im Incognito-Modus schließt \'Zurück\'-Button den aktive Tab (oder die App, wenn nur ein Tab geöffnet wurde).</string>
         <string name="incognito_mode">Inkognito-Modus</string>
         <string name="incognito_mode_summary">Löscht den Verlauf und den Cache nach jedem fertigen Laden einer Webseite.
             Im Incognito-Modus schließt \'Zurück\'-Button den aktive Tab (oder die App, wenn nur ein Tab geöffnet wurde).</string>

-        <string name="do_not_track">Nicht verfolgen (Do not track)</string>
-        <string name="do_not_track_summary">Einen "Do Not Track-Header" senden, der freundlich anfragt, dass Webserver diesen Browser nicht nachverfolgen sollen.</string>

         <string name="allow_screenshots">Screenshots zulassen</string>
         <string name="allow_screenshots_summary">Screenshots, Bildschirmvideos und Anzeige auf unsicheren Bildschirmen zulassen. Eine Änderung dieser Einstellung startet Privacy Browser neu.</string>
     <string name="blocklists">Sperrlisten</string>
         <string name="allow_screenshots">Screenshots zulassen</string>
         <string name="allow_screenshots_summary">Screenshots, Bildschirmvideos und Anzeige auf unsicheren Bildschirmen zulassen. Eine Änderung dieser Einstellung startet Privacy Browser neu.</string>
     <string name="blocklists">Sperrlisten</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index bd828d573d31f2137f6d80be5fe686b7a8c0fc83..c957ab560a30bf307c9df7ff0c5f5cf8b1629226 100644 (file)
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -491,8 +491,6 @@
         <string name="incognito_mode">Modo incógnito</string>
         <string name="incognito_mode_summary">Borrar el historial y el caché después de que cada página web termine de cargar.
             En el modo Incógnito, Atrás cierra la pestaña (o la app si hay solo una pestaña).</string>
         <string name="incognito_mode">Modo incógnito</string>
         <string name="incognito_mode_summary">Borrar el historial y el caché después de que cada página web termine de cargar.
             En el modo Incógnito, Atrás cierra la pestaña (o la app si hay solo una pestaña).</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="blocklists">Listas de bloqueo</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="blocklists">Listas de bloqueo</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index fd3ac1d3868ae342c9923c416aa059e6463e93c5..214c99b76b8e6156e5576b17055e74c7b03a7e45 100644 (file)
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -486,8 +486,6 @@
         <string name="incognito_mode">Mode Incognito</string>
         <string name="incognito_mode_summary">Vider l\'historique et le cache après le chargement de chaque page.
             Dans le mode Incognito, le bouton Retour ferme l\'onglet (ou l\'application s\'il n\'y a qu\'un seul onglet).</string>
         <string name="incognito_mode">Mode Incognito</string>
         <string name="incognito_mode_summary">Vider l\'historique et le cache après le chargement de chaque page.
             Dans le mode Incognito, le bouton Retour ferme l\'onglet (ou l\'application s\'il n\'y a qu\'un seul onglet).</string>

-        <string name="do_not_track">Ne pas me pister</string>
-        <string name="do_not_track_summary">Envoyer aux sites web un signal «Ne pas me pister» indiquant poliement que vous ne souhaitez pas être pisté</string>

         <string name="allow_screenshots">Autoriser captures d\'écrans</string>
         <string name="allow_screenshots_summary">Autoriser les captures d\'écrans, enregistrements vidéo et affichage sur des écrans non-sécurisés. Changer ce paramètre redémarrera Privacy Browser.</string>
     <string name="blocklists">Listes noires</string>
         <string name="allow_screenshots">Autoriser captures d\'écrans</string>
         <string name="allow_screenshots_summary">Autoriser les captures d\'écrans, enregistrements vidéo et affichage sur des écrans non-sécurisés. Changer ce paramètre redémarrera Privacy Browser.</string>
     <string name="blocklists">Listes noires</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 7e8fc4791963462a58c9a9e507a864ee1180a0e6..2eaf5e6b6dbc39a4115fb9169ac2dbb0d4b886f9 100644 (file)
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -490,8 +490,6 @@
         <string name="incognito_mode">Modalità Incognito</string>
         <string name="incognito_mode_summary">Cancella la cronologia e la cache al termine del caricamento di ogni pagina.
             In Modalità Incognito, il tasto "Indietro" chiude la scheda (o l\'applicazione se è aperta solo una scheda).</string>
         <string name="incognito_mode">Modalità Incognito</string>
         <string name="incognito_mode_summary">Cancella la cronologia e la cache al termine del caricamento di ogni pagina.
             In Modalità Incognito, il tasto "Indietro" chiude la scheda (o l\'applicazione se è aperta solo una scheda).</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="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>

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b384a6c20924c97b523beeae0c544a1288bf12b7..7c0aa650bfde71a710c7c6c76479cb031bdc932c 100644 (file)
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -484,8 +484,6 @@
         <string name="incognito_mode">Modo de navegação anônima</string>
         <string name="incognito_mode_summary">Limpe o histórico e o cache após o término do carregamento de cada página da web. No modo de navegação anônima,
             volta para fechar a guia (ou o aplicativo, se houver apenas uma guia).</string>
         <string name="incognito_mode">Modo de navegação anônima</string>
         <string name="incognito_mode_summary">Limpe o histórico e o cache após o término do carregamento de cada página da web. No modo de navegação anônima,
             volta para fechar a guia (ou o aplicativo, se houver apenas uma guia).</string>

-        <string name="do_not_track">Não rastreie</string>
-        <string name="do_not_track_summary">Envie \'Não Rastreie\' ao cabeçalho, que sugere educadamente que os servidores da web não rastreiam este navegador.</string>

         <string name="allow_screenshots">Permitir capturas de tela</string>
         <string name="allow_screenshots_summary">Permitir capturas de tela, gravação de vídeo e visualização em monitores não seguros. Alterar esta configuração irá reiniciar o Privacy Browser.</string>
     <string name="blocklists">Blocklists</string>
         <string name="allow_screenshots">Permitir capturas de tela</string>
         <string name="allow_screenshots_summary">Permitir capturas de tela, gravação de vídeo e visualização em monitores não seguros. Alterar esta configuração irá reiniciar o Privacy Browser.</string>
     <string name="blocklists">Blocklists</string>

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a2de63731bfac765d792ea185b4d0c95137853f6..cb28574641c3a5339de9bef3f6a396a75f053fb0 100644 (file)
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -487,8 +487,6 @@
         <string name="incognito_mode">Режим инкогнито</string>
         <string name="incognito_mode_summary">Очистка журнала и кэша по завершении загрузки каждой веб-страницы.
             В режиме инкогнито нажатие кнопки Назад приведет к закрытию вкладки (или приложения, если открыта только одна вкладка).</string>
         <string name="incognito_mode">Режим инкогнито</string>
         <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="blocklists">Списки блокировки</string>
         <string name="allow_screenshots">Разрешить скриншоты</string>
         <string name="allow_screenshots_summary">Разрешить скриншоты, запись видео и просмотр на незащищенных дисплеях. При изменении этого параметра Privacy Browser будет перезапущен.</string>
     <string name="blocklists">Списки блокировки</string>

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index acf1af0811880a34aeba16ffa4a359f69dc6dde9..9295ac514c7cd09550ba57b61f9cb7d1e33bd3da 100644 (file)
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -442,8 +442,6 @@
         <string name="custom_user_agent">Özel kullanıcı aracısı</string>
         <string name="incognito_mode">Gizli Mod</string>
         <string name="incognito_mode_summary">Her web sayfasının yüklenmesi bittikten sonra geçmişi ve önbelleği temizler. In Incognito Mode, back closes the tab (or the app if there is only one tab).</string>
         <string name="custom_user_agent">Özel kullanıcı aracısı</string>
         <string name="incognito_mode">Gizli Mod</string>
         <string name="incognito_mode_summary">Her web sayfasının yüklenmesi bittikten sonra geçmişi ve önbelleği temizler. In Incognito Mode, back closes the tab (or the app if there is only one tab).</string>

-        <string name="do_not_track">Takip Etme</string>
-        <string name="do_not_track_summary">Web Serverlarına bu tarayıcıyı takip etmemesi için Takip Etme Başlığı gönderir.</string>

         <string name="allow_screenshots">Ekran görüntülerine izin ver</string>
         <string name="allow_screenshots_summary">Ekran görüntülerine, video kaydına ve güvenli olmayan ekranlarda görüntülenmeye izin verir.
             Bu ayarı değiştirmek Privacy Browser uygulamasını yeniden başlatır.</string>
         <string name="allow_screenshots">Ekran görüntülerine izin ver</string>
         <string name="allow_screenshots_summary">Ekran görüntülerine, video kaydına ve güvenli olmayan ekranlarda görüntülenmeye izin verir.
             Bu ayarı değiştirmek Privacy Browser uygulamasını yeniden başlatır.</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a96b1bc3ca6c3ba22174643c759bd3932bc816a..413961652f5afaf3fdbe69941628090e05dbd18f 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -528,8 +528,6 @@
         <string name="system_default_user_agent" translatable="false">System default user agent</string>  <!-- This item is referenced in code.  It is never displayed on the screen. -->
         <string name="incognito_mode">Incognito Mode</string>
         <string name="incognito_mode_summary">Clear the history and cache after each webpage finishes loading. In Incognito Mode, back closes the tab (or the app if there is only one tab).</string>
         <string name="system_default_user_agent" translatable="false">System default user agent</string>  <!-- This item is referenced in code.  It is never displayed on the screen. -->
         <string name="incognito_mode">Incognito Mode</string>
         <string name="incognito_mode_summary">Clear the history and cache after each webpage finishes loading. In Incognito Mode, back closes the tab (or the app if there is only one tab).</string>

-        <string name="do_not_track">Do Not Track</string>
-        <string name="do_not_track_summary">Send the Do Not Track header, which politely suggests that web servers not track this browser.</string>

         <string name="allow_screenshots">Allow screenshots</string>
         <string name="allow_screenshots_summary">Allow screenshots, video recording, and viewing on non-secure displays. Changing this setting will restart Privacy Browser.</string>
     <string name="blocklists">Blocklists</string>
         <string name="allow_screenshots">Allow screenshots</string>
         <string name="allow_screenshots_summary">Allow screenshots, video recording, and viewing on non-secure displays. Changing this setting will restart Privacy Browser.</string>
     <string name="blocklists">Blocklists</string>


@@ -662,7 +660,6 @@
 
     <!-- Non-translatable preference keys. -->
     <string name="allow_screenshots_key" translatable="false">allow_screenshots</string>
 
     <!-- Non-translatable preference keys. -->
     <string name="allow_screenshots_key" translatable="false">allow_screenshots</string>

-    <string name="do_not_track_key" translatable="false">do_not_track</string>

     <string name="clear_logcat_key" translatable="false">clear_logcat</string>
     <string name="display_additional_app_bar_icons_key" translatable="false">display_additional_app_bar_icons</string>
 
     <string name="clear_logcat_key" translatable="false">clear_logcat</string>
     <string name="display_additional_app_bar_icons_key" translatable="false">display_additional_app_bar_icons</string>
 

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index f91b17e4b3597ff76a311069669aedac99af89be..36448a77e98ed65bb9043418a4f18eb3aa49c660 100644 (file)
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -75,12 +75,6 @@
             android:summary="@string/incognito_mode_summary"
             android:defaultValue="false" />
 
             android:summary="@string/incognito_mode_summary"
             android:defaultValue="false" />
 

-        <SwitchPreference
-            android:key="do_not_track"
-            android:title="@string/do_not_track"
-            android:summary="@string/do_not_track_summary"
-            android:defaultValue="false" />
-

         <SwitchPreference
             android:key="allow_screenshots"
             android:title="@string/allow_screenshots"
         <SwitchPreference
             android:key="allow_screenshots"
             android:title="@string/allow_screenshots"