X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FMainWebViewActivity.java;h=a48fa3780d25da29a395e17b4084a8138ab5b449;hp=c83b8d6b870e3c1f8e543da4d6dbff50a4518915;hb=e4e45c521ade9eb2f87a97eecffed7e852b09df7;hpb=9c582d802e641b2b6d27271310fc16898020b470 diff --git a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java index c83b8d6b..a48fa378 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java @@ -27,12 +27,17 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Configuration; import android.graphics.Bitmap; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; import android.net.Uri; +import android.net.http.SslError; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; 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; import android.support.v4.widget.SwipeRefreshLayout; @@ -48,6 +53,7 @@ import android.view.View; import android.view.inputmethod.InputMethodManager; import android.webkit.CookieManager; import android.webkit.DownloadListener; +import android.webkit.SslErrorHandler; import android.webkit.WebChromeClient; import android.webkit.WebStorage; import android.webkit.WebView; @@ -62,76 +68,86 @@ import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.net.URLEncoder; +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 { - // favoriteIcon is public static so it can be accessed from CreateHomeScreenShortcut and BookmarksActivity. - // It is also used in onCreate() and onCreateHomeScreenShortcutCreate(). +public class MainWebViewActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, CreateHomeScreenShortcut.CreateHomeScreenSchortcutListener, SslCertificateError.SslCertificateErrorListener { + // `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(). + // `privacyBrowserActivity` is public static so it can be accessed from `SettingsFragment`. + // It is also used in `onCreate()`, `onCreateOptionsMenu()`, and `onOptionsItemSelected()`, + public static Activity privacyBrowserActivity; + + // `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(). + // `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(). + // `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(). + // `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(). + // `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(). + // `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 used in onCreate(), onCreateOptionsMenu(), onPrepareOptionsMenu(), and onOptionsItemSelected(). + // `thridPartyCookiesEnables` is public static so it can be accessed from `SettingsFragment`. + // It is also used 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(). + // `domStorageEnabled` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()`, `onCreateOptionsMenu()`, and `onOptionsItemSelected()`. public static boolean domStorageEnabled; - // saveFormDataEnabled is public static so it can be accessed from SettingsFragment. It is also used in onCreate(), onCreateOptionsMenu(), and onOptionsItemSelected(). + // `saveFormDataEnabled` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()`, `onCreateOptionsMenu()`, and `onOptionsItemSelected()`. public static boolean saveFormDataEnabled; - // javaScriptDisabledSearchURL is public static so it can be accessed from SettingsFragment. It is also used in onCreate() and loadURLFromTextBox(). + // `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(). + // `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(). + // `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(). + // `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(). + // `swipeToRefreshEnabled` is public static so it can be accessed from `SettingsFragment`. It is also used in `onCreate()`. public static boolean swipeToRefreshEnabled; + // `customHeader` is public static so it can be accessed from `BookmarksActivity`. It is also used in `onCreate()` and `loadUrlFromTextBox()`. + public static Map customHeaders = new HashMap(); + - // drawerToggle is used in onCreate(), onPostCreate(), onConfigurationChanged(), onNewIntent(), and onNavigationItemSelected(). + // `drawerToggle` is used in `onCreate()`, `onPostCreate()`, `onConfigurationChanged()`, `onNewIntent()`, and `onNavigationItemSelected()`. private ActionBarDrawerToggle drawerToggle; - // drawerLayout is used in onCreate(), onNewIntent(), and onBackPressed(). + // `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(). + // `urlTextBox` is used in `onCreate()`, `onOptionsItemSelected()`, and `loadUrlFromTextBox()`. private EditText urlTextBox; - // adView is used in onCreate() and onConfigurationChanged(). + // `adView` is used in `onCreate()` and `onConfigurationChanged()`. private View adView; + // `sslErrorHandler` is used in `onCreate()`, `onSslErrorCancel()`, and `onSslErrorProceed`. + private SslErrorHandler sslErrorHandler; + @Override // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled. The whole premise of Privacy Browser is built around an understanding of these dangers. @SuppressLint("SetJavaScriptEnabled") @@ -139,6 +155,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation super.onCreate(savedInstanceState); setContentView(R.layout.main_coordinatorlayout); + // We need a handle for the activity, which is accessed from `SettingsFragment` and fed into `updatePrivacyIcons()`. + privacyBrowserActivity = this; + // 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); @@ -200,12 +219,31 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // drawerToggle creates the hamburger icon at the start of the AppBar. drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, supportAppBar, R.string.open_navigation, R.string.close_navigation); + // Replace the header that `WebView` creates for `X-Requested-With` with a null value. The default value is the application ID (com.stoutner.privacybrowser.standard). + customHeaders.put("X-Requested-With", ""); + mainWebView.setWebViewClient(new WebViewClient() { - // shouldOverrideUrlLoading makes this WebView the default handler for URLs inside the app, so that links are not kicked out to other apps. + // shouldOverrideUrlLoading makes this `WebView` the default handler for URLs inside the app, so that links are not kicked out to other apps. @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { - mainWebView.loadUrl(url); - return true; + // Use an external email program if the link begins with "mailto:". + if (url.startsWith("mailto:")) { + // We use `ACTION_SENDTO` instead of `ACTION_SEND` so that only email programs are launched. + Intent emailIntent = new Intent(Intent.ACTION_SENDTO); + + // Parse the url and set it as the data for the `Intent`. + emailIntent.setData(Uri.parse(url)); + + // `FLAG_ACTIVITY_NEW_TASK` opens the email program in a new task instead as part of Privacy Browser. + emailIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + + // Make it so. + startActivity(emailIntent); + return true; + } else { // Load the URL in Privacy Browser. + mainWebView.loadUrl(url, customHeaders); + return true; + } } // Update the URL in urlTextBox when the page starts to load. @@ -224,6 +262,17 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation urlTextBox.setText(formattedUrlString); } } + + // Handle SSL Certificate errors. + @Override + public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) { + // Store `handler` so it can be accesses from `onSslErrorCancel()` and `onSslErrorProceed()`. + sslErrorHandler = handler; + + // Display the SSL error `AlertDialog`. + DialogFragment sslCertificateErrorDialogFragment = SslCertificateError.displayDialog(error); + sslCertificateErrorDialogFragment.show(getFragmentManager(), getResources().getString(R.string.ssl_certificate_error)); + } }); mainWebView.setWebChromeClient(new WebChromeClient() { @@ -388,10 +437,14 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation } - // Set homepage initial status. The default value is "https://www.duckduckgo.com". + // Set the 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. + // 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)); + + // Set the swipe to refresh initial status. The default is `true`. swipeToRefreshEnabled = savedPreferences.getBoolean("swipe_to_refresh_enabled", true); swipeToRefresh.setEnabled(swipeToRefreshEnabled); @@ -411,7 +464,15 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation } // Load the initial website. - mainWebView.loadUrl(formattedUrlString); + mainWebView.loadUrl(formattedUrlString, customHeaders); + + // If the favorite icon is null, load the default. + if (favoriteIcon == null) { + // We have to use `ContextCompat` until API >= 21. + Drawable favoriteIconDrawable = ContextCompat.getDrawable(getApplicationContext(), R.drawable.world); + BitmapDrawable favoriteIconBitmapDrawable = (BitmapDrawable) favoriteIconDrawable; + favoriteIcon = favoriteIconBitmapDrawable.getBitmap(); + } // Initialize AdView for the free flavor and request an ad. If this is not the free flavor BannerAd.requestAd() does nothing. adView = findViewById(R.id.adView); @@ -421,7 +482,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation @Override protected void onNewIntent(Intent intent) { - // Sets the new intent as the activity intent, so that any future getIntent()s pick up this one instead of creating a new activity. + // Sets the new intent as the activity intent, so that any future `getIntent()`s pick up this one instead of creating a new activity. setIntent(intent); if (intent.getData() != null) { @@ -436,7 +497,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation } // Load the website. - mainWebView.loadUrl(formattedUrlString); + mainWebView.loadUrl(formattedUrlString, customHeaders); // Clear the keyboard if displayed and remove the focus on the urlTextBar if it has it. mainWebView.requestFocus(); @@ -445,13 +506,13 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.menu_options, menu); + getMenuInflater().inflate(R.menu.webview_options_menu, menu); // Set mainMenu so it can be used by onOptionsItemSelected. mainMenu = menu; - // Initialize privacyIcon - privacyIcon = menu.findItem(R.id.toggleJavaScript); + // Set the initial status of the privacy icon. + updatePrivacyIcons(privacyBrowserActivity); // Get MenuItems for checkable menu items. MenuItem toggleFirstPartyCookies = menu.findItem(R.id.toggleFirstPartyCookies); @@ -459,9 +520,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation MenuItem toggleDomStorage = menu.findItem(R.id.toggleDomStorage); MenuItem toggleSaveFormData = menu.findItem(R.id.toggleSaveFormData); - // Set the initial status of the privacy icon. - updatePrivacyIcon(); - // Set the initial status of the menu item checkboxes. toggleFirstPartyCookies.setChecked(firstPartyCookiesEnabled); toggleThirdPartyCookies.setChecked(thirdPartyCookiesEnabled); @@ -494,10 +552,67 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation WebViewDatabase mainWebViewDatabase = WebViewDatabase.getInstance(this); clearFormData.setEnabled(mainWebViewDatabase.hasFormData()); + // Initialize font size variables. + int fontSize = mainWebView.getSettings().getTextZoom(); + String fontSizeTitle; + MenuItem selectedFontSizeMenuItem; + + // Prepare the font size title and current size menu item. + switch (fontSize) { + case 50: + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.fifty_percent); + selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeFiftyPercent); + break; + + case 75: + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.seventy_five_percent); + selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeSeventyFivePercent); + break; + + case 100: + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.one_hundred_percent); + selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeOneHundredPercent); + break; + + case 125: + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.one_hundred_twenty_five_percent); + selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeOneHundredTwentyFivePercent); + break; + + case 150: + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.one_hundred_fifty_percent); + selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeOneHundredFiftyPercent); + break; + + case 175: + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.one_hundred_seventy_five_percent); + selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeOneHundredSeventyFivePercent); + break; + + case 200: + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.two_hundred_percent); + selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeTwoHundredPercent); + break; + + default: + fontSizeTitle = getResources().getString(R.string.font_size) + " - " + getResources().getString(R.string.one_hundred_percent); + selectedFontSizeMenuItem = menu.findItem(R.id.fontSizeOneHundredPercent); + break; + } + + // Set the font size title and select the current size menu item. + MenuItem fontSizeMenuItem = menu.findItem(R.id.fontSize); + 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); - // return true displays the menu. + // `return true` displays the menu. return true; } @@ -519,9 +634,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation mainWebView.getSettings().setJavaScriptEnabled(javaScriptEnabled); // Update the privacy icon. - updatePrivacyIcon(); + updatePrivacyIcons(privacyBrowserActivity); - // Display a Snackbar. + // Display a `Snackbar`. if (javaScriptEnabled) { Snackbar.make(findViewById(R.id.mainWebView), R.string.javascript_enabled, Snackbar.LENGTH_SHORT).show(); } else { @@ -547,7 +662,18 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation cookieManager.setAcceptCookie(firstPartyCookiesEnabled); // Update the privacy icon. - updatePrivacyIcon(); + updatePrivacyIcons(privacyBrowserActivity); + + // Display a `Snackbar`. + if (firstPartyCookiesEnabled) { + Snackbar.make(findViewById(R.id.mainWebView), R.string.first_party_cookies_enabled, Snackbar.LENGTH_SHORT).show(); + } else { + if (javaScriptEnabled) { + Snackbar.make(findViewById(R.id.mainWebView), R.string.first_party_cookies_disabled, Snackbar.LENGTH_SHORT).show(); + } else { + Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); + } + } // Reload the WebView. mainWebView.reload(); @@ -564,6 +690,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. @@ -579,6 +712,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; @@ -593,6 +733,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; @@ -618,6 +765,34 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation mainWebView.reload(); return true; + case R.id.fontSizeFiftyPercent: + mainWebView.getSettings().setTextZoom(50); + return true; + + case R.id.fontSizeSeventyFivePercent: + mainWebView.getSettings().setTextZoom(75); + return true; + + case R.id.fontSizeOneHundredPercent: + mainWebView.getSettings().setTextZoom(100); + return true; + + case R.id.fontSizeOneHundredTwentyFivePercent: + mainWebView.getSettings().setTextZoom(125); + return true; + + case R.id.fontSizeOneHundredFiftyPercent: + mainWebView.getSettings().setTextZoom(150); + return true; + + case R.id.fontSizeOneHundredSeventyFivePercent: + mainWebView.getSettings().setTextZoom(175); + return true; + + case R.id.fontSizeTwoHundredPercent: + mainWebView.getSettings().setTextZoom(200); + return true; + case R.id.share: Intent shareIntent = new Intent(); shareIntent.setAction(Intent.ACTION_SEND); @@ -627,9 +802,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation return true; case R.id.addToHomescreen: - // Show the CreateHomeScreenShortcut AlertDialog and name this instance "@string/create_shortcut". + // Show the `CreateHomeScreenShortcut` `AlertDialog` and name this instance `@string/create_shortcut`. DialogFragment createHomeScreenShortcutDialogFragment = new CreateHomeScreenShortcut(); - createHomeScreenShortcutDialogFragment.show(getFragmentManager(), "@string/create_shortcut"); + createHomeScreenShortcutDialogFragment.show(getFragmentManager(), getResources().getString(R.string.create_shortcut)); //Everything else will be handled by CreateHomeScreenShortcut and the associated listeners below. return true; @@ -652,7 +827,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation switch (menuItemId) { case R.id.home: - mainWebView.loadUrl(homepage); + mainWebView.loadUrl(homepage, customHeaders); break; case R.id.back: @@ -684,19 +859,19 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation break; case R.id.settings: - // Launch SettingsActivity. + // Launch `SettingsActivity`. Intent settingsIntent = new Intent(this, SettingsActivity.class); startActivity(settingsIntent); break; case R.id.guide: - // Launch GuideActivity. + // Launch `GuideActivity`. Intent guideIntent = new Intent(this, GuideActivity.class); startActivity(guideIntent); break; case R.id.about: - // Launch AboutActivity. + // Launch `AboutActivity`. Intent aboutIntent = new Intent(this, AboutActivity.class); startActivity(aboutIntent); break; @@ -723,6 +898,12 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Clear the back/forward history. mainWebView.clearHistory(); + // Clear any SSL certificate preferences. + MainWebViewActivity.mainWebView.clearSslPreferences(); + + // Clear `formattedUrlString`. + formattedUrlString = null; + // Destroy the internal state of the webview. mainWebView.destroy(); @@ -760,15 +941,18 @@ 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); + + // `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 - public void onCreateHomeScreenShortcutCancel(DialogFragment dialogFragment) { + public void onCancelCreateHomeScreenShortcut(DialogFragment dialogFragment) { // Do nothing because the user selected "Cancel". } @Override - public void onCreateHomeScreenShortcutCreate(DialogFragment dialogFragment) { + public void onCreateHomeScreenShortcut(DialogFragment dialogFragment) { // Get shortcutNameEditText from the alert dialog. EditText shortcutNameEditText = (EditText) dialogFragment.getDialog().findViewById(R.id.shortcut_name_edittext); @@ -786,6 +970,22 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation sendBroadcast(placeBookmarkShortcut); } + public void viewSslCertificate(View view) { + // Show the `ViewSslCertificate` `AlertDialog` and name this instance `@string/view_ssl_certificate`. + DialogFragment viewSslCertificateDialogFragment = new ViewSslCertificate(); + viewSslCertificateDialogFragment.show(getFragmentManager(), getResources().getString(R.string.view_ssl_certificate)); + } + + @Override + public void onSslErrorCancel() { + sslErrorHandler.cancel(); + } + + @Override + public void onSslErrorProceed() { + sslErrorHandler.proceed(); + } + // Override onBackPressed to handle the navigation drawer and mainWebView. @Override public void onBackPressed() { @@ -864,22 +1064,77 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation } } - mainWebView.loadUrl(formattedUrlString); + mainWebView.loadUrl(formattedUrlString, customHeaders); // Hides the keyboard so we can see the webpage. InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Activity.INPUT_METHOD_SERVICE); inputMethodManager.hideSoftInputFromWindow(mainWebView.getWindowToken(), 0); } - private void updatePrivacyIcon() { + public static void updatePrivacyIcons(Activity activity) { + // Get handles for the icons. + MenuItem privacyIcon = mainMenu.findItem(R.id.toggleJavaScript); + MenuItem firstPartyCookiesIcon = mainMenu.findItem(R.id.toggleFirstPartyCookies); + MenuItem thirdPartyCookiesIcon = mainMenu.findItem(R.id.toggleThirdPartyCookies); + 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_warning); + } else { + // First-party cookies are disabled. + firstPartyCookiesIcon.setIcon(R.drawable.cookies_disabled); + } + + // Update `thirdPartyCookiesIcon`. + if (firstPartyCookiesEnabled) { + if (thirdPartyCookiesEnabled) { + // Third-party cookies are enabled. Bad! + thirdPartyCookiesIcon.setIcon(R.drawable.cookies_critical); + } else { + // Third-party cookies are disabled. + thirdPartyCookiesIcon.setIcon(R.drawable.cookies_disabled); + } + } else { + // First-party cookies are disabled, so third-party cookies are ghosted. + thirdPartyCookiesIcon.setIcon(R.drawable.cookies_ghosted); + } + + // Update `domStorageIcon`. + if (javaScriptEnabled) { + if (domStorageEnabled) { + domStorageIcon.setIcon(R.drawable.dom_storage_enabled); + } else { + domStorageIcon.setIcon(R.drawable.dom_storage_disabled); + } + } else { + domStorageIcon.setIcon(R.drawable.dom_storage_ghosted); + } + + // Update `formDataIcon`. + if (saveFormDataEnabled) { + formDataIcon.setIcon(R.drawable.form_data_enabled); + } else { + formDataIcon.setIcon(R.drawable.form_data_disabled); + } + + // `invalidateOptionsMenu` calls `onPrepareOptionsMenu()` and redraws the icons in the `AppBar`. + ActivityCompat.invalidateOptionsMenu(activity); } }