X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FMainWebViewActivity.java;h=104522b600f0b9f467e539d27dc6a69d29d84bce;hp=0a824a1527c0f0b657ea51f84430f3ba7f916cf5;hb=0abf9642763f1af98af73b2fc3cc44752a342db3;hpb=757139ad59282fb8400bc641a4be574e0b88de49 diff --git a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java index 0a824a15..104522b6 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java @@ -30,12 +30,15 @@ import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; +import android.net.http.SslCertificate; import android.net.http.SslError; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; +import android.support.annotation.NonNull; import android.support.design.widget.NavigationView; import android.support.design.widget.Snackbar; +import android.support.v4.app.ActivityCompat; import android.support.v4.content.ContextCompat; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; @@ -71,61 +74,67 @@ import java.util.HashMap; import java.util.Map; // We need to use AppCompatActivity from android.support.v7.app.AppCompatActivity to have access to the SupportActionBar until the minimum API is >= 21. -public class MainWebViewActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, CreateHomeScreenShortcut.CreateHomeScreenSchortcutListener, SslCertificateError.SslCertificateErrorListener { +public class MainWebViewActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, CreateHomeScreenShortcut.CreateHomeScreenSchortcutListener, + SslCertificateError.SslCertificateErrorListener, DownloadFile.DownloadFileListener { + + // `appBar` is public static so it can be accessed from `OrbotProxyHelper`. + // It is also used in `onCreate()`. + public static ActionBar appBar; + // `favoriteIcon` is public static so it can be accessed from `CreateHomeScreenShortcut`, `BookmarksActivity`, `CreateBookmark`, `CreateBookmarkFolder`, and `EditBookmark`. // It is also used in `onCreate()` and `onCreateHomeScreenShortcutCreate()`. public static Bitmap favoriteIcon; - // `mainWebView` is public static so it can be accessed from `SettingsFragment`. - // It is also used in `onCreate()`, `onOptionsItemSelected()`, `onNavigationItemSelected()`, and `loadUrlFromTextBox()`. - public static WebView mainWebView; - // `formattedUrlString` is public static so it can be accessed from `BookmarksActivity`. // It is also used in `onCreate()`, `onOptionsItemSelected()`, `onCreateHomeScreenShortcutCreate()`, and `loadUrlFromTextBox()`. public static String formattedUrlString; - // `mainMenu` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreateOptionsMenu()` and `onOptionsItemSelected()`. - public static Menu mainMenu; + // `sslCertificate` is public static so it can be accessed from `ViewSslCertificate`. It is also used in `onCreate()`. + public static SslCertificate sslCertificate; - // `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; + // 'mainWebView' is used in `onCreate()`, `onOptionsItemSelected()`, `onNavigationItemSelected()`, `onRestart()`, and `loadUrlFromTextBox()`. + private WebView mainWebView; - // `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; + // `swipeRefreshLayout` is used in `onCreate()`, `onPrepareOptionsMenu`, and `onRestart()`. + private SwipeRefreshLayout swipeRefreshLayout; - // `thirdPartyCookiesEnabled` is used in `onCreate()`, `onCreateOptionsMenu()`, `onPrepareOptionsMenu()`, and `onOptionsItemSelected()`. - public static boolean thirdPartyCookiesEnabled; + // `cookieManager` is used in `onCreate()`, `onOptionsItemSelected()`, and `onNavigationItemSelected()`, and `onRestart()`. + private CookieManager cookieManager; - // `domStorageEnabled` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()`, `onCreateOptionsMenu()`, and `onOptionsItemSelected()`. - public static boolean domStorageEnabled; + // `customHeader` is used in `onCreate()`, `onOptionsItemSelected()`, and `loadUrlFromTextBox()`. + private final Map customHeaders = new HashMap<>(); - // `saveFormDataEnabled` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()`, `onCreateOptionsMenu()`, and `onOptionsItemSelected()`. - public static boolean saveFormDataEnabled; + // `javaScriptEnabled` is also used in `onCreate()`, `onCreateOptionsMenu()`, `onOptionsItemSelected()`, `loadUrlFromTextBox()`, and `applySettings()`. + // It is `Boolean` instead of `boolean` because `applySettings()` needs to know if it is `null`. + private Boolean javaScriptEnabled; - // `javaScriptDisabledSearchURL` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()` and `loadURLFromTextBox()`. - public static String javaScriptDisabledSearchURL; + // `firstPartyCookiesEnabled` is used in `onCreate()`, `onCreateOptionsMenu()`, `onPrepareOptionsMenu()`, `onOptionsItemSelected()`, and `applySettings()`. + private boolean firstPartyCookiesEnabled; - // `javaScriptEnabledSearchURL` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()` and `loadURLFromTextBox()`. - public static String javaScriptEnabledSearchURL; + // `thirdPartyCookiesEnabled` used in `onCreate()`, `onCreateOptionsMenu()`, `onPrepareOptionsMenu()`, `onOptionsItemSelected()`, and `applySettings()`. + private boolean thirdPartyCookiesEnabled; - // `homepage` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()` and `onOptionsItemSelected()`. - public static String homepage; + // `domStorageEnabled` is used in `onCreate()`, `onCreateOptionsMenu()`, `onOptionsItemSelected()`, and `applySettings()`. + private boolean domStorageEnabled; - // `swipeToRefresh` is public static so it can be accessed from SettingsFragment. It is also used in onCreate(). - public static SwipeRefreshLayout swipeToRefresh; + // `saveFormDataEnabled` is used in `onCreate()`, `onCreateOptionsMenu()`, `onOptionsItemSelected()`, and `applySettings()`. + private boolean saveFormDataEnabled; - // `swipeToRefreshEnabled` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()`. - public static boolean swipeToRefreshEnabled; + // `swipeToRefreshEnabled` is used in `onPrepareOptionsMenu()` and `applySettings()`. + private boolean swipeToRefreshEnabled; - // `customHeader` is public static so it can be accessed from `BookmarksActivity`. It is also used in `onCreate()` and `loadUrlFromTextBox()`. - public static Map customHeaders = new HashMap(); + // 'homepage' is used in `onCreate()`, `onNavigationItemSelected()`, and `applySettings()`. + private String homepage; + // `javaScriptDisabledSearchURL` is used in `loadURLFromTextBox()` and `applySettings()`. + private String javaScriptDisabledSearchURL; + // `javaScriptEnabledSearchURL` is used in `loadURLFromTextBox()` and `applySettings()`. + private String javaScriptEnabledSearchURL; + + // `mainMenu` is used in `onCreateOptionsMenu()` and `updatePrivacyIcons()`. + private Menu mainMenu; // `drawerToggle` is used in `onCreate()`, `onPostCreate()`, `onConfigurationChanged()`, `onNewIntent()`, and `onNavigationItemSelected()`. private ActionBarDrawerToggle drawerToggle; @@ -133,9 +142,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // `drawerLayout` is used in `onCreate()`, `onNewIntent()`, and `onBackPressed()`. private DrawerLayout drawerLayout; - // `privacyIcon` is used in `onCreateOptionsMenu()` and `updatePrivacyIcon()`. - private MenuItem privacyIcon; - // `urlTextBox` is used in `onCreate()`, `onOptionsItemSelected()`, and `loadUrlFromTextBox()`. private EditText urlTextBox; @@ -155,7 +161,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // We need to use the SupportActionBar from android.support.v7.app.ActionBar until the minimum API is >= 21. Toolbar supportAppBar = (Toolbar) findViewById(R.id.appBar); setSupportActionBar(supportAppBar); - final ActionBar appBar = getSupportActionBar(); + appBar = getSupportActionBar(); // This is needed to get rid of the Android Studio warning that appBar might be null. assert appBar != null; @@ -188,10 +194,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation final FrameLayout fullScreenVideoFrameLayout = (FrameLayout) findViewById(R.id.fullScreenVideoFrameLayout); // Implement swipe to refresh - swipeToRefresh = (SwipeRefreshLayout) findViewById(R.id.swipeRefreshLayout); - assert swipeToRefresh != null; //This assert removes the incorrect warning on the following line that swipeToRefresh might be null. - swipeToRefresh.setColorSchemeResources(R.color.blue); - swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { + swipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipeRefreshLayout); + swipeRefreshLayout.setColorSchemeResources(R.color.blue_700); + swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override public void onRefresh() { mainWebView.reload(); @@ -207,17 +212,15 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Listen for touches on the navigation menu. final NavigationView navigationView = (NavigationView) findViewById(R.id.navigationView); - assert navigationView != null; // This assert removes the incorrect warning on the following line that navigationView might be null. navigationView.setNavigationItemSelectedListener(this); // 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. + // `shouldOverrideUrlLoading` makes this `WebView` the default handler for URLs inside the app, so that links are not kicked out to other apps. + // We have to use the deprecated `shouldOverrideUrlLoading` until API >= 24. + @SuppressWarnings("deprecation") @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { // Use an external email program if the link begins with "mailto:". @@ -243,6 +246,10 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Update the URL in urlTextBox when the page starts to load. @Override public void onPageStarted(WebView view, String url, Bitmap favicon) { + // We need to update `formattedUrlString` at the beginning of the load, so that if the user toggles JavaScript during the load the new website is reloaded. + formattedUrlString = url; + + // Display the loading URL is the URL text box. urlTextBox.setText(url); } @@ -255,6 +262,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation if (!urlTextBox.hasFocus()) { urlTextBox.setText(formattedUrlString); } + + // Store the SSL certificate so it can be accessed from `ViewSslCertificate`. + sslCertificate = mainWebView.getCertificate(); } // Handle SSL Certificate errors. @@ -280,8 +290,8 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation } else { progressBar.setVisibility(View.GONE); - //Stop the SwipeToRefresh indicator if it is running - swipeToRefresh.setRefreshing(false); + //Stop the `SwipeToRefresh` indicator if it is running + swipeRefreshLayout.setRefreshing(false); } } @@ -302,7 +312,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation appBar.hide(); // Show the fullScreenVideoFrameLayout. - assert fullScreenVideoFrameLayout != null; //This assert removes the incorrect warning on the following line that fullScreenVideoFrameLayout might be null. fullScreenVideoFrameLayout.addView(view); fullScreenVideoFrameLayout.setVisibility(View.VISIBLE); @@ -330,7 +339,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation BannerAd.showAd(adView); // Hide the fullScreenVideoFrameLayout. - assert fullScreenVideoFrameLayout != null; //This assert removes the incorrect warning on the following line that fullScreenVideoFrameLayout might be null. fullScreenVideoFrameLayout.removeAllViews(); fullScreenVideoFrameLayout.setVisibility(View.GONE); } @@ -338,21 +346,11 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Allow the downloading of files. mainWebView.setDownloadListener(new DownloadListener() { - // Launch the Android download manager when a link leads to a download. @Override public void onDownloadStart(String url, String userAgent, String contentDisposition, String mimetype, long contentLength) { - DownloadManager downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE); - DownloadManager.Request requestUri = new DownloadManager.Request(Uri.parse(url)); - - // Add the URL as the description for the download. - requestUri.setDescription(url); - - // Show the download notification after the download is completed. - requestUri.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); - - // Initiate the download and display a Snackbar. - downloadManager.enqueue(requestUri); - Snackbar.make(findViewById(R.id.mainWebView), R.string.download_started, Snackbar.LENGTH_SHORT).show(); + // Show the `DownloadFile` `AlertDialog` and name this instance `@string/download`. + DialogFragment downloadFileDialogFragment = DownloadFile.fromUrl(url, contentDisposition, contentLength); + downloadFileDialogFragment.show(getFragmentManager(), getResources().getString(R.string.download)); } }); @@ -362,86 +360,17 @@ 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. The default value is false. - javaScriptEnabled = savedPreferences.getBoolean("javascript_enabled", false); - mainWebView.getSettings().setJavaScriptEnabled(javaScriptEnabled); - // Initialize cookieManager. cookieManager = CookieManager.getInstance(); - // Set cookies initial status. The default value is false. - firstPartyCookiesEnabled = savedPreferences.getBoolean("first_party_cookies_enabled", false); - 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); - - // Set the saved form data initial status. The default is false. - saveFormDataEnabled = savedPreferences.getBoolean("save_form_data_enabled", false); - mainWebView.getSettings().setSaveFormData(saveFormDataEnabled); - - // Set the user agent initial status. - String userAgentString = savedPreferences.getString("user_agent", "Default user agent"); - 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 the homepage initial status. The default value is `https://www.duckduckgo.com`. - homepage = savedPreferences.getString("homepage", "https://www.duckduckgo.com"); - - // Set the font size initial status. the default value is `100`. - String defaultFontSizeString = savedPreferences.getString("default_font_size", "100"); - mainWebView.getSettings().setTextZoom(Integer.valueOf(defaultFontSizeString)); + // 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 the swipe to refresh initial status. The default is `true`. - swipeToRefreshEnabled = savedPreferences.getBoolean("swipe_to_refresh_enabled", true); - swipeToRefresh.setEnabled(swipeToRefreshEnabled); + // Initialize the default preference values the first time the program is run. + PreferenceManager.setDefaultValues(this, R.xml.preferences, false); + // Apply the settings from the shared preferences. + applySettings(); // Get the intent information that started the app. final Intent intent = getIntent(); @@ -502,53 +431,71 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Inflate the menu; this adds items to the action bar if it is present. getMenuInflater().inflate(R.menu.webview_options_menu, menu); - // Set mainMenu so it can be used by onOptionsItemSelected. + // Set mainMenu so it can be used by `onOptionsItemSelected()` and `updatePrivacyIcons`. mainMenu = menu; - // Initialize privacyIcon - privacyIcon = menu.findItem(R.id.toggleJavaScript); - - // Set the initial status of the privacy icon. - updatePrivacyIcon(); + // Set the initial status of the privacy icons. + updatePrivacyIcons(); - // Get MenuItems for checkable menu items. + // Get handles for the menu items. MenuItem toggleFirstPartyCookies = menu.findItem(R.id.toggleFirstPartyCookies); MenuItem toggleThirdPartyCookies = menu.findItem(R.id.toggleThirdPartyCookies); MenuItem toggleDomStorage = menu.findItem(R.id.toggleDomStorage); MenuItem toggleSaveFormData = menu.findItem(R.id.toggleSaveFormData); - // Set the initial status of the menu item checkboxes. - toggleFirstPartyCookies.setChecked(firstPartyCookiesEnabled); - toggleThirdPartyCookies.setChecked(thirdPartyCookiesEnabled); - toggleDomStorage.setChecked(domStorageEnabled); - toggleSaveFormData.setChecked(saveFormDataEnabled); + // Only display third-Party Cookies if SDK >= 21 + toggleThirdPartyCookies.setVisible(Build.VERSION.SDK_INT >= 21); + + // Get the shared preference values. `this` references the current context. + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); + + // Set the status of the additional app bar icons. The default is `false`. + if (sharedPreferences.getBoolean("display_additional_app_bar_icons", false)) { + toggleFirstPartyCookies.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + toggleDomStorage.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + toggleSaveFormData.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + } else { //Do not display the additional icons. + toggleFirstPartyCookies.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + toggleDomStorage.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + toggleSaveFormData.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + } return true; } @Override public boolean onPrepareOptionsMenu(Menu menu) { - // Only enable Third-Party Cookies if SDK >= 21 and First-Party Cookies are enabled. + // Get handles for the menu items. + MenuItem toggleFirstPartyCookies = menu.findItem(R.id.toggleFirstPartyCookies); MenuItem toggleThirdPartyCookies = menu.findItem(R.id.toggleThirdPartyCookies); - if ((Build.VERSION.SDK_INT >= 21) && firstPartyCookiesEnabled) { - toggleThirdPartyCookies.setEnabled(true); - } else { - toggleThirdPartyCookies.setEnabled(false); - } + MenuItem toggleDomStorage = menu.findItem(R.id.toggleDomStorage); + MenuItem toggleSaveFormData = menu.findItem(R.id.toggleSaveFormData); + MenuItem clearCookies = menu.findItem(R.id.clearCookies); + MenuItem clearFormData = menu.findItem(R.id.clearFormData); + MenuItem refreshMenuItem = menu.findItem(R.id.refresh); + + // Set the status of the menu item checkboxes. + toggleFirstPartyCookies.setChecked(firstPartyCookiesEnabled); + toggleThirdPartyCookies.setChecked(thirdPartyCookiesEnabled); + toggleDomStorage.setChecked(domStorageEnabled); + toggleSaveFormData.setChecked(saveFormDataEnabled); + + // Enable third-party cookies if first-party cookies are enabled. + toggleThirdPartyCookies.setEnabled(firstPartyCookiesEnabled); // Enable DOM Storage if JavaScript is enabled. - MenuItem toggleDomStorage = menu.findItem(R.id.toggleDomStorage); toggleDomStorage.setEnabled(javaScriptEnabled); // Enable Clear Cookies if there are any. - MenuItem clearCookies = menu.findItem(R.id.clearCookies); clearCookies.setEnabled(cookieManager.hasCookies()); // Enable Clear Form Data is there is any. - MenuItem clearFormData = menu.findItem(R.id.clearFormData); WebViewDatabase mainWebViewDatabase = WebViewDatabase.getInstance(this); clearFormData.setEnabled(mainWebViewDatabase.hasFormData()); + // Only show `Refresh` if `swipeToRefresh` is disabled. + refreshMenuItem.setVisible(!swipeToRefreshEnabled); + // Initialize font size variables. int fontSize = mainWebView.getSettings().getTextZoom(); String fontSizeTitle; @@ -602,10 +549,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation fontSizeMenuItem.setTitle(fontSizeTitle); selectedFontSizeMenuItem.setChecked(true); - // Only show `Refresh` if `swipeToRefresh` is disabled. - MenuItem refreshMenuItem = menu.findItem(R.id.refresh); - refreshMenuItem.setVisible(!swipeToRefreshEnabled); - // Run all the other default commands. super.onPrepareOptionsMenu(menu); @@ -631,17 +574,15 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation mainWebView.getSettings().setJavaScriptEnabled(javaScriptEnabled); // Update the privacy icon. - updatePrivacyIcon(); + updatePrivacyIcons(); - // Display a Snackbar. - if (javaScriptEnabled) { + // Display a `Snackbar`. + if (javaScriptEnabled) { // JavaScrip is enabled. Snackbar.make(findViewById(R.id.mainWebView), R.string.javascript_enabled, Snackbar.LENGTH_SHORT).show(); - } else { - if (firstPartyCookiesEnabled) { - Snackbar.make(findViewById(R.id.mainWebView), R.string.javascript_disabled, Snackbar.LENGTH_SHORT).show(); - } else { - Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); - } + } else if (firstPartyCookiesEnabled) { // JavaScript is disabled, but first-party cookies are enabled. + Snackbar.make(findViewById(R.id.mainWebView), R.string.javascript_disabled, Snackbar.LENGTH_SHORT).show(); + } else { // Privacy mode. + Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); } // Reload the WebView. @@ -659,7 +600,16 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation cookieManager.setAcceptCookie(firstPartyCookiesEnabled); // Update the privacy icon. - updatePrivacyIcon(); + updatePrivacyIcons(); + + // Display a `Snackbar`. + if (firstPartyCookiesEnabled) { // First-party cookies are enabled. + Snackbar.make(findViewById(R.id.mainWebView), R.string.first_party_cookies_enabled, Snackbar.LENGTH_SHORT).show(); + } else if (javaScriptEnabled){ // JavaScript is still enabled. + Snackbar.make(findViewById(R.id.mainWebView), R.string.first_party_cookies_disabled, Snackbar.LENGTH_SHORT).show(); + } else { // Privacy mode. + Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); + } // Reload the WebView. mainWebView.reload(); @@ -676,6 +626,13 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Apply the new cookie status. cookieManager.setAcceptThirdPartyCookies(mainWebView, thirdPartyCookiesEnabled); + // Display a `Snackbar`. + if (thirdPartyCookiesEnabled) { + Snackbar.make(findViewById(R.id.mainWebView), R.string.third_party_cookies_enabled, Snackbar.LENGTH_SHORT).show(); + } else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.third_party_cookies_disabled, Snackbar.LENGTH_SHORT).show(); + } + // Reload the WebView. mainWebView.reload(); } // Else do nothing because SDK < 21. @@ -691,6 +648,13 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Apply the new DOM Storage status. mainWebView.getSettings().setDomStorageEnabled(domStorageEnabled); + // Display a `Snackbar`. + if (domStorageEnabled) { + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_enabled, Snackbar.LENGTH_SHORT).show(); + } else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_disabled, Snackbar.LENGTH_SHORT).show(); + } + // Reload the WebView. mainWebView.reload(); return true; @@ -705,6 +669,13 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Apply the new form data status. mainWebView.getSettings().setSaveFormData(saveFormDataEnabled); + // Display a `Snackbar`. + if (saveFormDataEnabled) { + Snackbar.make(findViewById(R.id.mainWebView), R.string.form_data_enabled, Snackbar.LENGTH_SHORT).show(); + } else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.form_data_disabled, Snackbar.LENGTH_SHORT).show(); + } + // Reload the WebView. mainWebView.reload(); return true; @@ -771,7 +742,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation DialogFragment createHomeScreenShortcutDialogFragment = new CreateHomeScreenShortcut(); createHomeScreenShortcutDialogFragment.show(getFragmentManager(), getResources().getString(R.string.create_shortcut)); - //Everything else will be handled by CreateHomeScreenShortcut and the associated listeners below. + //Everything else will be handled by `CreateHomeScreenShortcut` and the associated listener below. return true; case R.id.refresh: @@ -784,10 +755,10 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation } } - @Override // removeAllCookies is deprecated, but it is required for API < 21. @SuppressWarnings("deprecation") - public boolean onNavigationItemSelected(MenuItem menuItem) { + @Override + public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) { int menuItemId = menuItem.getItemId(); switch (menuItemId) { @@ -864,11 +835,14 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation mainWebView.clearHistory(); // Clear any SSL certificate preferences. - MainWebViewActivity.mainWebView.clearSslPreferences(); + mainWebView.clearSslPreferences(); // Clear `formattedUrlString`. formattedUrlString = null; + // Clear `customHeaders`. + customHeaders.clear(); + // Destroy the internal state of the webview. mainWebView.destroy(); @@ -906,11 +880,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Reinitialize the adView variable, as the View will have been removed and re-added in the free flavor by BannerAd.reloadAfterRotate(). adView = findViewById(R.id.adView); - } - @Override - public void onCancelCreateHomeScreenShortcut(DialogFragment dialogFragment) { - // Do nothing because the user selected "Cancel". + // `invalidateOptionsMenu` should recalculate the number of action buttons from the menu to display on the app bar, but it doesn't because of the this bug: https://code.google.com/p/android/issues/detail?id=20493#c8 + invalidateOptionsMenu(); } @Override @@ -932,6 +904,32 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation sendBroadcast(placeBookmarkShortcut); } + @Override + public void onDownloadFile(DialogFragment dialogFragment, String downloadUrl) { + DownloadManager downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE); + DownloadManager.Request downloadRequest = new DownloadManager.Request(Uri.parse(downloadUrl)); + + // Get the file name from `dialogFragment`. + EditText downloadFileNameEditText = (EditText) dialogFragment.getDialog().findViewById(R.id.download_file_name); + String fileName = downloadFileNameEditText.getText().toString(); + + // Set the download save in the the `DIRECTORY_DOWNLOADS`using `fileName`. + // Once we have `WRITE_EXTERNAL_STORAGE` permissions we can use `setDestinationInExternalPublicDir`. + downloadRequest.setDestinationInExternalFilesDir(this, "/", fileName); + + // Allow `MediaScanner` to index the download if it is a media file. + downloadRequest.allowScanningByMediaScanner(); + + // Add the URL as the description for the download. + downloadRequest.setDescription(downloadUrl); + + // Show the download notification after the download is completed. + downloadRequest.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); + + // Initiate the download and display a Snackbar. + downloadManager.enqueue(downloadRequest); + } + public void viewSslCertificate(View view) { // Show the `ViewSslCertificate` `AlertDialog` and name this instance `@string/view_ssl_certificate`. DialogFragment viewSslCertificateDialogFragment = new ViewSslCertificate(); @@ -958,7 +956,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation drawerLayout.closeDrawer(GravityCompat.START); } else { // Load the previous URL if available. - assert mainWebView != null; //This assert removes the incorrect warning in Android Studio on the following line that mainWebView might be null. if (mainWebView.canGoBack()) { mainWebView.goBack(); } else { @@ -984,6 +981,18 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation BannerAd.resumeAd(adView); } + @Override + public void onRestart() { + super.onRestart(); + + // Apply the settings from shared preferences, which might have been changed in `SettingsActivity`. + applySettings(); + + // Update the privacy icons. + updatePrivacyIcons(); + + } + private void loadUrlFromTextBox() throws UnsupportedEncodingException { // Get the text from urlTextBox and convert it to a string. trim() removes white spaces from the beginning and end of the string. String unformattedUrlString = urlTextBox.getText().toString().trim(); @@ -1018,8 +1027,8 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Sanitize the search input and convert it to a DuckDuckGo search. final String encodedUrlString = URLEncoder.encode(unformattedUrlString, "UTF-8"); - // Use the correct search URL based on javaScriptEnabled. - if (javaScriptEnabled) { + // Use the correct search URL. + if (javaScriptEnabled) { // JavaScript is enabled. formattedUrlString = javaScriptEnabledSearchURL + encodedUrlString; } else { // JavaScript is disabled. formattedUrlString = javaScriptDisabledSearchURL + encodedUrlString; @@ -1033,15 +1042,138 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation inputMethodManager.hideSoftInputFromWindow(mainWebView.getWindowToken(), 0); } - private void updatePrivacyIcon() { - if (javaScriptEnabled) { - privacyIcon.setIcon(R.drawable.javascript_enabled); - } else { - if (firstPartyCookiesEnabled) { - privacyIcon.setIcon(R.drawable.warning); - } else { - privacyIcon.setIcon(R.drawable.privacy_mode); + private void applySettings() { + // Get the shared preference values. `this` references the current context. + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); + + // Store the values from `sharedPreferences` in variables. + String userAgentString = sharedPreferences.getString("user_agent", "Default user agent"); + String customUserAgentString = sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0"); + String javaScriptDisabledSearchString = sharedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q="); + String javaScriptDisabledCustomSearchString = sharedPreferences.getString("javascript_disabled_search_custom_url", ""); + String javaScriptEnabledSearchString = sharedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q="); + String javaScriptEnabledCustomSearchString = sharedPreferences.getString("javascript_enabled_search_custom_url", ""); + String homepageString = sharedPreferences.getString("homepage", "https://www.duckduckgo.com"); + String defaultFontSizeString = sharedPreferences.getString("default_font_size", "100"); + swipeToRefreshEnabled = sharedPreferences.getBoolean("swipe_to_refresh_enabled", false); + boolean doNotTrackEnabled = sharedPreferences.getBoolean("do_not_track", true); + boolean proxyThroughOrbot = sharedPreferences.getBoolean("proxy_through_orbot", false); + + // Because they can be modified on-the-fly by the user, these default settings are only applied when the program first runs. + if (javaScriptEnabled == null) { // If `javaScriptEnabled` is null the program is just starting. + // Get the values from `sharedPreferences`. + javaScriptEnabled = sharedPreferences.getBoolean("javascript_enabled", false); + firstPartyCookiesEnabled = sharedPreferences.getBoolean("first_party_cookies_enabled", false); + thirdPartyCookiesEnabled = sharedPreferences.getBoolean("third_party_cookies_enabled", false); + domStorageEnabled = sharedPreferences.getBoolean("dom_storage_enabled", false); + saveFormDataEnabled = sharedPreferences.getBoolean("save_form_data_enabled", false); + + // Apply the default settings. + mainWebView.getSettings().setJavaScriptEnabled(javaScriptEnabled); + cookieManager.setAcceptCookie(firstPartyCookiesEnabled); + mainWebView.getSettings().setDomStorageEnabled(domStorageEnabled); + mainWebView.getSettings().setSaveFormData(saveFormDataEnabled); + mainWebView.getSettings().setTextZoom(Integer.valueOf(defaultFontSizeString)); + + // Set third-party cookies status if API >= 21. + if (Build.VERSION.SDK_INT >= 21) { + cookieManager.setAcceptThirdPartyCookies(mainWebView, thirdPartyCookiesEnabled); } } + + // Apply the other settings from `sharedPreferences`. + homepage = homepageString; + swipeRefreshLayout.setEnabled(swipeToRefreshEnabled); + + // Set the user agent initial status. + switch (userAgentString) { + case "Default user agent": + // Set the user agent to `""`, which uses the default value. + mainWebView.getSettings().setUserAgentString(""); + break; + + case "Custom user agent": + // Set the custom user agent. + mainWebView.getSettings().setUserAgentString(customUserAgentString); + break; + + default: + // Use the selected user agent. + mainWebView.getSettings().setUserAgentString(userAgentString); + break; + } + + // Set JavaScript disabled search. + if (javaScriptDisabledSearchString.equals("Custom URL")) { // Get the custom URL string. + javaScriptDisabledSearchURL = javaScriptDisabledCustomSearchString; + } else { // Use the string from the pre-built list. + javaScriptDisabledSearchURL = javaScriptDisabledSearchString; + } + + // Set JavaScript enabled search. + if (javaScriptEnabledSearchString.equals("Custom URL")) { // Get the custom URL string. + javaScriptEnabledSearchURL = javaScriptEnabledCustomSearchString; + } else { // Use the string from the pre-built list. + javaScriptEnabledSearchURL = javaScriptEnabledSearchString; + } + + // Set Do Not Track status. + if (doNotTrackEnabled) { + customHeaders.put("DNT", "1"); + } else { + customHeaders.remove("DNT"); + } + + // Set Orbot proxy status. + if (proxyThroughOrbot) { + // Set the proxy. `this` refers to the current activity where an `AlertDialog` might be displayed. + OrbotProxyHelper.setProxy(getApplicationContext(), this, "localhost", "8118"); + } else { // Reset the proxy to default. The host is `""` and the port is `"0"`. + OrbotProxyHelper.setProxy(getApplicationContext(), this, "", "0"); + } + } + + private void updatePrivacyIcons() { + // Get handles for the icons. + MenuItem privacyIcon = mainMenu.findItem(R.id.toggleJavaScript); + MenuItem firstPartyCookiesIcon = mainMenu.findItem(R.id.toggleFirstPartyCookies); + MenuItem domStorageIcon = mainMenu.findItem(R.id.toggleDomStorage); + MenuItem formDataIcon = mainMenu.findItem(R.id.toggleSaveFormData); + + // Update `privacyIcon`. + if (javaScriptEnabled) { // JavaScript is enabled. + privacyIcon.setIcon(R.drawable.javascript_enabled); + } else if (firstPartyCookiesEnabled) { // JavaScript is disabled but cookies are enabled. + privacyIcon.setIcon(R.drawable.warning); + } else { // All the dangerous features are disabled. + privacyIcon.setIcon(R.drawable.privacy_mode); + } + + // Update `firstPartyCookiesIcon`. + if (firstPartyCookiesEnabled) { // First-party cookies are enabled. + firstPartyCookiesIcon.setIcon(R.drawable.cookies_enabled); + } else { // First-party cookies are disabled. + firstPartyCookiesIcon.setIcon(R.drawable.cookies_disabled); + } + + // Update `domStorageIcon`. + if (javaScriptEnabled && domStorageEnabled) { // Both JavaScript and DOM storage are enabled. + domStorageIcon.setIcon(R.drawable.dom_storage_enabled); + } else if (javaScriptEnabled){ // JavaScript is enabled but DOM storage is disabled. + domStorageIcon.setIcon(R.drawable.dom_storage_disabled); + } else { // JavaScript is disabled, so DOM storage is ghosted. + domStorageIcon.setIcon(R.drawable.dom_storage_ghosted); + } + + // Update `formDataIcon`. + if (saveFormDataEnabled) { // Form data is enabled. + formDataIcon.setIcon(R.drawable.form_data_enabled); + } else { // Form data is disabled. + formDataIcon.setIcon(R.drawable.form_data_disabled); + } + + // `invalidateOptionsMenu` calls `onPrepareOptionsMenu()` and redraws the icons in the `AppBar`. + // `this` references the current activity. + ActivityCompat.invalidateOptionsMenu(this); } }