X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FMainWebViewActivity.java;h=c7dddad31434d1ee4fb07b155b49c68946f1fbf8;hb=8498a3be7602976764d5b707fda012519deb88b4;hp=9e2d04966bea426ec9b6f00cce75ddb015cfb235;hpb=77756d29db4d52a35a3999f67b101e22525c97e2;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 9e2d0496..c7dddad3 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java @@ -67,7 +67,7 @@ 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 and 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; // mainMenu is public static so it can be accessed from SettingsFragment. It is also used in onCreateOptionsMenu() and onOptionsItemSelected(). @@ -78,7 +78,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation 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(). + // 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; @@ -124,6 +124,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation // 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() { @Override @@ -168,6 +169,7 @@ 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. @@ -239,6 +241,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation } // 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); @@ -249,9 +252,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation BannerAd.hideAd(adView); /* SYSTEM_UI_FLAG_HIDE_NAVIGATION hides the navigation bars on the bottom or right of the screen. - ** 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. - */ + * 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); @@ -280,6 +283,7 @@ 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); } @@ -445,9 +449,6 @@ 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); - /* toggleSaveFormData does nothing until database storage is implemented. - MenuItem toggleSaveFormData = menu.findItem(R.id.toggleSaveFormData); - */ // Set the initial status of the privacy icon. updatePrivacyIcon(); @@ -456,9 +457,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation toggleFirstPartyCookies.setChecked(firstPartyCookiesEnabled); toggleThirdPartyCookies.setChecked(thirdPartyCookiesEnabled); toggleDomStorage.setChecked(domStorageEnabled); - /* toggleSaveFormData does nothing until database storage is implemented. - toggleSaveFormData.setChecked(saveFormDataEnabled); - */ return true; } @@ -492,9 +490,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation public boolean onOptionsItemSelected(MenuItem menuItem) { int menuItemId = menuItem.getItemId(); - // Some options need to update the drawable for toggleJavaScript. - MenuItem toggleJavaScript = mainMenu.findItem(R.id.toggleJavaScript); - // Set the commands that relate to the menu entries. switch (menuItemId) { case R.id.toggleJavaScript: @@ -647,15 +642,15 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation break; case R.id.settings: - // Launch PreferenceFragment. - Intent intent = new Intent(this, SettingsActivity.class); - startActivity(intent); + // Launch SettingsActivity. + Intent settingsIntent = new Intent(this, SettingsActivity.class); + startActivity(settingsIntent); break; case R.id.about: - // Show the AboutDialog AlertDialog and name this instance aboutDialog. - AppCompatDialogFragment aboutDialog = new AboutDialog(); - aboutDialog.show(getSupportFragmentManager(), "aboutDialog"); + // Launch AboutActivity. + Intent aboutIntent = new Intent(this, AboutActivity.class); + startActivity(aboutIntent); break; case R.id.clearAndExit: @@ -702,13 +697,10 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation public void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); - // Update the status of the drawerToggle icon. - drawerToggle.onConfigurationChanged(newConfig); - // Reload the ad if this is the free flavor. BannerAd.reloadAfterRotate(adView, getApplicationContext(), getString(R.string.ad_id)); - // Reinitialize the adView variable, as the View will have been removed and readded. + // 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); } @@ -746,6 +738,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. if (mainWebView.canGoBack()) { mainWebView.goBack(); } else {