X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FMainWebViewActivity.java;h=e59168fe0519bafa3248031b73604a420a72a87f;hb=8951c7351854bbfc9f2815e74b81cc2a4d606bf0;hp=de910d5084ac1e47586a17bbf303b7526c857f17;hpb=44014ce1673cb4cbfcdaeceac59c067a5074b35c;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 de910d50..e59168fe 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java @@ -21,6 +21,7 @@ package com.stoutner.privacybrowser; import android.annotation.SuppressLint; import android.app.Activity; +import android.app.DialogFragment; import android.app.DownloadManager; import android.content.Intent; import android.content.SharedPreferences; @@ -32,14 +33,12 @@ 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.DialogFragment; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; -import android.support.v7.app.AppCompatDialogFragment; import android.support.v7.widget.Toolbar; import android.util.Patterns; import android.view.KeyEvent; @@ -53,6 +52,7 @@ import android.webkit.WebChromeClient; import android.webkit.WebStorage; import android.webkit.WebView; import android.webkit.WebViewClient; +import android.webkit.WebViewDatabase; import android.widget.EditText; import android.widget.FrameLayout; import android.widget.ImageView; @@ -65,44 +65,70 @@ import java.net.URLEncoder; // 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. + // `favoriteIcon` is public static so it can be accessed from `CreateHomeScreenShortcut`, `BookmarksActivity`, 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(). + + // 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; + // 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(). 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; + + // 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(). 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; - // formattedUrlString is used in onCreate(), onOptionsItemSelected(), onCreateHomeScreenShortcutCreate(), and loadUrlFromTextBox(). - private String formattedUrlString; + // privacyIcon is used in onCreateOptionsMenu() and updatePrivacyIcon(). private MenuItem privacyIcon; + // urlTextBox is used in onCreate(), onOptionsItemSelected(), and loadUrlFromTextBox(). private EditText urlTextBox; + // adView is used in onCreate() and onConfigurationChanged(). private View adView; @@ -204,18 +230,15 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Update the progress bar when a page is loading. @Override public void onProgressChanged(WebView view, int progress) { - // Make sure that appBar is not null. - if (appBar != null) { - ProgressBar progressBar = (ProgressBar) appBar.getCustomView().findViewById(R.id.progressBar); - progressBar.setProgress(progress); - if (progress < 100) { - progressBar.setVisibility(View.VISIBLE); - } else { - progressBar.setVisibility(View.GONE); + ProgressBar progressBar = (ProgressBar) appBar.getCustomView().findViewById(R.id.progressBar); + progressBar.setProgress(progress); + if (progress < 100) { + progressBar.setVisibility(View.VISIBLE); + } else { + progressBar.setVisibility(View.GONE); - //Stop the SwipeToRefresh indicator if it is running - swipeToRefresh.setRefreshing(false); - } + //Stop the SwipeToRefresh indicator if it is running + swipeToRefresh.setRefreshing(false); } } @@ -225,19 +248,15 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Save a copy of the favorite icon for use if a shortcut is added to the home screen. favoriteIcon = icon; - // Place the favorite icon in the appBar if it is not null. - if (appBar != null) { - ImageView imageViewFavoriteIcon = (ImageView) appBar.getCustomView().findViewById(R.id.favoriteIcon); - imageViewFavoriteIcon.setImageBitmap(Bitmap.createScaledBitmap(icon, 64, 64, true)); - } + // Place the favorite icon in the appBar. + ImageView imageViewFavoriteIcon = (ImageView) appBar.getCustomView().findViewById(R.id.favoriteIcon); + imageViewFavoriteIcon.setImageBitmap(Bitmap.createScaledBitmap(icon, 64, 64, true)); } // Enter full screen video @Override public void onShowCustomView(View view, CustomViewCallback callback) { - if (appBar != null) { - appBar.hide(); - } + appBar.hide(); // Show the fullScreenVideoFrameLayout. assert fullScreenVideoFrameLayout != null; //This assert removes the incorrect warning on the following line that fullScreenVideoFrameLayout might be null. @@ -254,26 +273,12 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation * SYSTEM_UI_FLAG_FULLSCREEN hides the status bar across the top of the screen. * SYSTEM_UI_FLAG_IMMERSIVE_STICKY makes the navigation and status bars ghosted overlays and automatically rehides them. */ - - // Set the one flag supported by API >= 14. - view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION); - - // Set the two flags that are supported by API >= 16. - if (Build.VERSION.SDK_INT >= 16) { - view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN); - } - - // Set all three flags that are supported by API >= 19. - if (Build.VERSION.SDK_INT >= 19) { - view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); - } + view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); } // Exit full screen video public void onHideCustomView() { - if (appBar != null) { - appBar.show(); - } + appBar.show(); // Show the mainWebView. mainWebView.setVisibility(View.VISIBLE); @@ -342,6 +347,10 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation 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) { @@ -436,7 +445,7 @@ 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; @@ -448,6 +457,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation 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 privacy icon. updatePrivacyIcon(); @@ -456,6 +466,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation toggleFirstPartyCookies.setChecked(firstPartyCookiesEnabled); toggleThirdPartyCookies.setChecked(thirdPartyCookiesEnabled); toggleDomStorage.setChecked(domStorageEnabled); + toggleSaveFormData.setChecked(saveFormDataEnabled); return true; } @@ -470,14 +481,23 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation toggleThirdPartyCookies.setEnabled(false); } + // 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()); + // Run all the other default commands. super.onPrepareOptionsMenu(menu); - // return true displays the menu. + // `return true` displays the menu. return true; } @@ -505,7 +525,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation if (javaScriptEnabled) { Snackbar.make(findViewById(R.id.mainWebView), R.string.javascript_enabled, Snackbar.LENGTH_SHORT).show(); } else { - if (domStorageEnabled || firstPartyCookiesEnabled) { + 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(); @@ -559,8 +579,19 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // Apply the new DOM Storage status. mainWebView.getSettings().setDomStorageEnabled(domStorageEnabled); - // Update the privacy icon. - updatePrivacyIcon(); + // Reload the WebView. + mainWebView.reload(); + return true; + + case R.id.toggleSaveFormData: + // Switch the status of saveFormDataEnabled. + saveFormDataEnabled = !saveFormDataEnabled; + + // Update the menu checkbox. + menuItem.setChecked(saveFormDataEnabled); + + // Apply the new form data status. + mainWebView.getSettings().setSaveFormData(saveFormDataEnabled); // Reload the WebView. mainWebView.reload(); @@ -581,6 +612,12 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_deleted, Snackbar.LENGTH_SHORT).show(); return true; + case R.id.clearFormData: + WebViewDatabase mainWebViewDatabase = WebViewDatabase.getInstance(this); + mainWebViewDatabase.clearFormData(); + mainWebView.reload(); + return true; + case R.id.share: Intent shareIntent = new Intent(); shareIntent.setAction(Intent.ACTION_SEND); @@ -590,9 +627,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation return true; case R.id.addToHomescreen: - // Show the CreateHomeScreenShortcut AlertDialog and name this instance createShortcut. - AppCompatDialogFragment shortcutDialog = new CreateHomeScreenShortcut(); - shortcutDialog.show(getSupportFragmentManager(), "createShortcut"); + // Show the CreateHomeScreenShortcut AlertDialog and name this instance "@string/create_shortcut". + DialogFragment createHomeScreenShortcutDialogFragment = new CreateHomeScreenShortcut(); + createHomeScreenShortcutDialogFragment.show(getFragmentManager(), "@string/create_shortcut"); //Everything else will be handled by CreateHomeScreenShortcut and the associated listeners below. return true; @@ -630,6 +667,12 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation } break; + case R.id.bookmarks: + // Launch BookmarksActivity. + Intent bookmarksIntent = new Intent(this, BookmarksActivity.class); + startActivity(bookmarksIntent); + break; + case R.id.downloads: // Launch the system Download Manager. Intent downloadManagerIntent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS); @@ -646,6 +689,12 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation startActivity(settingsIntent); break; + case R.id.guide: + // Launch GuideActivity. + Intent guideIntent = new Intent(this, GuideActivity.class); + startActivity(guideIntent); + break; + case R.id.about: // Launch AboutActivity. Intent aboutIntent = new Intent(this, AboutActivity.class); @@ -653,10 +702,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation break; case R.id.clearAndExit: - // Clear DOM storage. - WebStorage domStorage = WebStorage.getInstance(); - domStorage.deleteAllData(); - // Clear cookies. The commands changed slightly in API 21. if (Build.VERSION.SDK_INT >= 21) { cookieManager.removeAllCookies(null); @@ -664,12 +709,22 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation cookieManager.removeAllCookie(); } + // Clear DOM storage. + WebStorage domStorage = WebStorage.getInstance(); + domStorage.deleteAllData(); + + // Clear form data. + WebViewDatabase formData = WebViewDatabase.getInstance(this); + formData.clearFormData(); + // Clear cache. The argument of "true" includes disk files. mainWebView.clearCache(true); // Clear the back/forward history. mainWebView.clearHistory(); + formattedUrlString = null; + // Destroy the internal state of the webview. mainWebView.destroy(); @@ -710,14 +765,14 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation } @Override - public void onCreateHomeScreenShortcutCancel(DialogFragment dialog) { + public void onCreateHomeScreenShortcutCancel(DialogFragment dialogFragment) { // Do nothing because the user selected "Cancel". } @Override - public void onCreateHomeScreenShortcutCreate(DialogFragment dialog) { + public void onCreateHomeScreenShortcutCreate(DialogFragment dialogFragment) { // Get shortcutNameEditText from the alert dialog. - EditText shortcutNameEditText = (EditText) dialog.getDialog().findViewById(R.id.shortcutNameEditText); + EditText shortcutNameEditText = (EditText) dialogFragment.getDialog().findViewById(R.id.shortcut_name_edittext); // Create the bookmark shortcut based on formattedUrlString. Intent bookmarkShortcut = new Intent(); @@ -743,7 +798,7 @@ 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 on the following line that mainWebView might be null. + 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 { @@ -770,8 +825,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation } private void loadUrlFromTextBox() throws UnsupportedEncodingException { - // Get the text from urlTextBox and convert it to a string. - String unformattedUrlString = urlTextBox.getText().toString(); + // 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(); + URL unformattedUrl = null; Uri.Builder formattedUri = new Uri.Builder(); @@ -821,7 +877,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation if (javaScriptEnabled) { privacyIcon.setIcon(R.drawable.javascript_enabled); } else { - if (domStorageEnabled || firstPartyCookiesEnabled) { + if (firstPartyCookiesEnabled) { privacyIcon.setIcon(R.drawable.warning); } else { privacyIcon.setIcon(R.drawable.privacy_mode);