X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FMainWebViewActivity.java;h=2edbfdfeea2efd2f6eb21176b37f4bb986f311c9;hb=57b05bcbae9759d4b58ce3b96ede61992eb34eee;hp=13600840837ef20d245fd564cc742abda5dcf82c;hpb=0b0c40ca00cfdd80f3e215528f1b9c7f95bbcfe1;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 13600840..2edbfdfe 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java @@ -67,33 +67,38 @@ import java.net.URLEncoder; public class MainWebViewActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, CreateHomeScreenShortcut.CreateHomeScreenSchortcutListener { // favoriteIcon is public static so it can be accessed from CreateHomeScreenShortcut. public static Bitmap favoriteIcon; - // mainWebView is public static so it can be accessed from AboutDialog. It is also used in onCreate(), onOptionsItemSelected(), onNavigationItemSelected(), and loadUrlFromTextBox(). + // mainWebView is public static so it can be accessed from AboutDialog and SettingsFragment. It is also used in onCreate(), onOptionsItemSelected(), onNavigationItemSelected(), and loadUrlFromTextBox(). public static WebView mainWebView; + // mainMenu is public static so it can be accessed from SettingsFragment. It is also used in onCreateOptionsMenu() and onOptionsItemSelected(). + public static Menu mainMenu; + // cookieManager is public static so it can be accessed from SettingsFragment. It is also used in onCreate(), onOptionsItemSelected(), and onNavigationItemSelected(). + public static CookieManager cookieManager; + // javaScriptEnabled is public static so it can be accessed from SettingsFragment. It is also used in onCreate(), onCreateOptionsMenu(), onOptionsItemSelected(), and loadUrlFromTextBox(). + public static boolean javaScriptEnabled; + // firstPartyCookiesEnabled is public static so it can be accessed from SettingsFragment. It is also used in onCreate(), onCreateOptionsMenu(), onPrepareOptionsMenu(), and onOptionsItemSelected(). + public static boolean firstPartyCookiesEnabled; + // thirdPartyCookiesEnabled is uesd 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(). + public static boolean domStorageEnabled; + // javaScriptDisabledSearchURL is public static so it can be accessed from SettingsFragment. It is also used in onCreate() and loadURLFromTextBox(). + public static String javaScriptDisabledSearchURL; + // javaScriptEnabledSearchURL is public static so it can be accessed from SettingsFragment. It is also used in onCreate() and loadURLFromTextBox(). + public static String javaScriptEnabledSearchURL; + // homepage is public static so it can be accessed from SettingsFragment. It is also used in onCreate() and onOptionsItemSelected(). + public static String homepage; + // swipeToRefresh is public static so it can be accessed from SettingsFragment. It is also used in onCreate(). + public static SwipeRefreshLayout swipeToRefresh; + // swipeToRefreshEnabled is public static so it can be accessed from SettingsFragment. It is also used in onCreate(). + public static boolean swipeToRefreshEnabled; + // drawerToggle is used in onCreate(), onPostCreate(), onConfigurationChanged(), onNewIntent(), and onNavigationItemSelected(). private ActionBarDrawerToggle drawerToggle; // drawerLayout is used in onCreate(), onNewIntent(), and onBackPressed(). private DrawerLayout drawerLayout; - // mainMenu is used in onCreateOptionsMenu() and onOptionsItemSelected(). - private Menu mainMenu; // formattedUrlString is used in onCreate(), onOptionsItemSelected(), onCreateHomeScreenShortcutCreate(), and loadUrlFromTextBox(). private String formattedUrlString; - // homepage is used in onCreate() and onOptionsItemSelected(). - private String homepage; - // javaScriptEnabled is used in onCreate(), onCreateOptionsMenu(), onOptionsItemSelected(), and loadUrlFromTextBox(). - private boolean javaScriptEnabled; - // domStorageEnabled is used in onCreate(), onCreateOptionsMenu(), and onOptionsItemSelected(). - private boolean domStorageEnabled; - - /* saveFormDataEnabled does nothing until database storage is implemented. - // saveFormDataEnabled is used in onCreate(), onCreateOptionsMenu(), and onOptionsItemSelected(). - private boolean saveFormDataEnabled; - */ - - // cookieManager is used in onCreate(), onOptionsItemSelected(), and onNavigationItemSelected(). - private CookieManager cookieManager; - // cookiesEnabled is used in onCreate(), onCreateOptionsMenu(), and onOptionsItemSelected(). - private boolean cookiesEnabled; // urlTextBox is used in onCreate(), onOptionsItemSelected(), and loadUrlFromTextBox(). private EditText urlTextBox; @@ -118,7 +123,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation final View adView = findViewById(R.id.adView); // Implement swipe to refresh - final SwipeRefreshLayout swipeToRefresh = (SwipeRefreshLayout) findViewById(R.id.swipeRefreshLayout); + swipeToRefresh = (SwipeRefreshLayout) findViewById(R.id.swipeRefreshLayout); swipeToRefresh.setColorSchemeResources(R.color.blue); swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override @@ -306,34 +311,79 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Hide zoom controls. mainWebView.getSettings().setDisplayZoomControls(false); + // Initialize the default preference values the first time the program is run. PreferenceManager.setDefaultValues(this, R.xml.preferences, false); // Get the shared preference values. SharedPreferences savedPreferences = PreferenceManager.getDefaultSharedPreferences(this); - // Set JavaScript initial status. + // Set JavaScript initial status. The default value is false. javaScriptEnabled = savedPreferences.getBoolean("javascript_enabled", false); mainWebView.getSettings().setJavaScriptEnabled(javaScriptEnabled); - // Set DOM storage initial status. + // Initialize cookieManager. + cookieManager = CookieManager.getInstance(); + + // Set cookies initial status. The default value is false. + firstPartyCookiesEnabled = savedPreferences.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); + cookieManager.setAcceptThirdPartyCookies(mainWebView, thirdPartyCookiesEnabled); + } + + // Set DOM storage initial status. The default value is false. 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 the user agent initial status. + String userAgentString = savedPreferences.getString("user_agent", "Default user agent"); + switch (userAgentString) { + case "Default user agent": + // Do nothing. + break; + + 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")); + 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")); + break; + } + + // Set the initial string for JavaScript disabled search. + if (savedPreferences.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", ""); + } else { + // Use the string from javascript_disabled_search. + javaScriptDisabledSearchURL = savedPreferences.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")) { + // Get the custom URL string. The default is "". + javaScriptEnabledSearchURL = savedPreferences.getString("javascript_enabled_search_custom_url", ""); + } else { + // Use the string from javascript_enabled_search. + javaScriptEnabledSearchURL = savedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q="); + } - // Set cookies initial status. - cookiesEnabled = savedPreferences.getBoolean("cookies_enabled", false); - cookieManager = CookieManager.getInstance(); - cookieManager.setAcceptCookie(cookiesEnabled); - // Set homepage initial status. + // Set homepage initial status. The default value is "https://www.duckduckgo.com". homepage = savedPreferences.getString("homepage", "https://www.duckduckgo.com"); + // Set swipe to refresh initial status. The default is true. + swipeToRefreshEnabled = savedPreferences.getBoolean("swipe_to_refresh_enabled", true); + swipeToRefresh.setEnabled(swipeToRefreshEnabled); + + // Get the intent information that started the app. final Intent intent = getIntent(); @@ -388,17 +438,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 +457,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 +508,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 +524,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 +608,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 +621,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); @@ -583,7 +643,12 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation //Everything else will be handled by CreateHomeScreenShortcut and the associated listeners below. return true; + case R.id.refresh: + mainWebView.reload(); + return true; + default: + // Don't consume the event. return super.onOptionsItemSelected(menuItem); } } @@ -622,7 +687,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; @@ -759,9 +824,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Use the correct search URL based on javaScriptEnabled. if (javaScriptEnabled) { - formattedUrlString = "https://duckduckgo.com/?q=" + encodedUrlString; - } else { - formattedUrlString = "https://duckduckgo.com/html/?q=" + encodedUrlString; + formattedUrlString = javaScriptEnabledSearchURL + encodedUrlString; + } else { // JavaScript is disabled. + formattedUrlString = javaScriptDisabledSearchURL + encodedUrlString; } }