X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FMainWebViewActivity.java;h=64dd8dbf31eddfafc785ef3c42bea88e50acb811;hb=49203907d4d15ba2e63d6a9151c8550bc2388d3b;hp=5d2307338092869f09aa82b47f3a7f3273772dfd;hpb=81aeaac4229700db3255a6d6c02a8bda18b403e6;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 5d230733..64dd8dbf 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java @@ -1,7 +1,7 @@ /** * Copyright 2015-2016 Soren Stoutner . * - * This file is part of Privacy Browser. + * This file is part of Privacy Browser . * * Privacy Browser is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,7 +30,9 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; +import android.support.design.widget.Snackbar; import android.support.v4.app.DialogFragment; +import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatDialogFragment; @@ -40,7 +42,6 @@ import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.view.Window; import android.view.inputmethod.InputMethodManager; import android.webkit.CookieManager; import android.webkit.DownloadListener; @@ -53,6 +54,7 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.Toast; + import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; @@ -90,14 +92,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome private EditText urlTextBox; @Override - // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled. + // 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") protected void onCreate(Bundle savedInstanceState) { - // Window.FEATURE_ACTION_BAR_OVERLAY must be enabled to set the app bar to HideOnContentScroll. It must be set before any content is added to the activity. - if (Build.VERSION.SDK_INT >= 11) { - requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY); - } - super.onCreate(savedInstanceState); setContentView(R.layout.activity_webview); @@ -106,23 +103,26 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome setSupportActionBar(supportAppBar); final FrameLayout fullScreenVideoFrameLayout = (FrameLayout) findViewById(R.id.fullScreenVideoFrameLayout); - final Activity mainWebViewActivity = this; + // We need to use the SupportActionBar from android.support.v7.app.ActionBar until the minimum API is >= 21. final ActionBar appBar = getSupportActionBar(); - mainWebView = (WebView) findViewById(R.id.mainWebView); + // Setup AdView for the free flavor. + final View adView = findViewById(R.id.adView); - if (appBar != null) { - /* TODO Enable app bar scrolling. - // Scroll the app bar, but only if the API supports overlay mode (>= 11). - if (Build.VERSION.SDK_INT >= 11) { - appBar.setHideOnContentScrollEnabled(true); + // Implement swipe to refresh + final SwipeRefreshLayout swipeToRefresh = (SwipeRefreshLayout) findViewById(R.id.swipeRefreshLayout); + swipeToRefresh.setColorSchemeResources(R.color.blue); + swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { + @Override + public void onRefresh() { + mainWebView.reload(); } - */ + }); - // Remove the title from the app bar. - appBar.setDisplayShowTitleEnabled(false); + mainWebView = (WebView) findViewById(R.id.mainWebView); + if (appBar != null) { // Add the custom url_bar layout, which shows the favoriteIcon, urlTextBar, and progressBar. appBar.setCustomView(R.layout.url_bar); appBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); @@ -157,12 +157,6 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome return true; } - /* These errors do not provide any useful information and clutter the screen. - public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) { - Toast.makeText(mainWebViewActivity, "Error loading " + request + " Error: " + error, Toast.LENGTH_SHORT).show(); - } - */ - // Update the URL in urlTextBox when the page starts to load. @Override public void onPageStarted(WebView view, String url, Bitmap favicon) { @@ -173,7 +167,11 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome @Override public void onPageFinished(WebView view, String url) { formattedUrlString = url; - urlTextBox.setText(formattedUrlString); + + // Only update urlTextBox if the user is not typing in it. + if (!urlTextBox.hasFocus()) { + urlTextBox.setText(formattedUrlString); + } } }); @@ -189,6 +187,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome progressBar.setVisibility(View.VISIBLE); } else { progressBar.setVisibility(View.GONE); + + //Stop the SwipeToRefresh indicator if it is running + swipeToRefresh.setRefreshing(false); } } } @@ -213,20 +214,23 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome appBar.hide(); } + // Show the fullScreenVideoFrameLayout. fullScreenVideoFrameLayout.addView(view); fullScreenVideoFrameLayout.setVisibility(View.VISIBLE); + // Hide the mainWebView. mainWebView.setVisibility(View.GONE); + // Hide the ad if this is the free flavor. + 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. */ // Set the one flag supported by API >= 14. - if (Build.VERSION.SDK_INT >= 14) { - view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION); - } + view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION); // Set the two flags that are supported by API >= 16. if (Build.VERSION.SDK_INT >= 16) { @@ -245,8 +249,13 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome appBar.show(); } + // Show the mainWebView. mainWebView.setVisibility(View.VISIBLE); + // Show the ad if this is the free flavor. + BannerAd.showAd(adView); + + // Hide the fullScreenVideoFrameLayout. fullScreenVideoFrameLayout.removeAllViews(); fullScreenVideoFrameLayout.setVisibility(View.GONE); } @@ -263,23 +272,20 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome // Add the URL as the description for the download. requestUri.setDescription(url); - // Show the download notification after the download is completed if the API is 11 or greater. - if (Build.VERSION.SDK_INT >= 11) { - requestUri.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); - } + // 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); - Toast.makeText(mainWebViewActivity, "Download started", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.download_started, Snackbar.LENGTH_SHORT).show(); } }); // Allow pinch to zoom. mainWebView.getSettings().setBuiltInZoomControls(true); - // Hide zoom controls if the API is 11 or greater. - if (Build.VERSION.SDK_INT >= 11) { - mainWebView.getSettings().setDisplayZoomControls(false); - } + // 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); @@ -306,7 +312,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome cookieManager = CookieManager.getInstance(); cookieManager.setAcceptCookie(cookiesEnabled); - // Set hompage initial status. + // Set homepage initial status. homepage = savedPreferences.getString("homepage", "https://www.duckduckgo.com"); // Get the intent information that started the app. @@ -325,6 +331,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome // Load the initial website. mainWebView.loadUrl(formattedUrlString); + + // Load the ad if this is the free flavor. + BannerAd.requestAd(adView); } @Override @@ -340,6 +349,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome // Load the website. mainWebView.loadUrl(formattedUrlString); + + // Clear the keyboard if displayed and remove the focus on the urlTextBar if it has it. + mainWebView.requestFocus(); } @Override @@ -401,8 +413,6 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome } @Override - // @TargetApi(11) turns off the errors regarding copy and paste, which are removed from view in menu_webview.xml for lower version of Android. - @TargetApi(11) // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled. @SuppressLint("SetJavaScriptEnabled") // removeAllCookies is deprecated, but it is required for API < 21. @@ -421,28 +431,28 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome mainWebView.getSettings().setJavaScriptEnabled(false); mainWebView.reload(); - // Update the toggleJavaScript icon and display a toast message. + // Update the toggleJavaScript icon and display a snackbar. if (domStorageEnabled || cookiesEnabled) { menuItem.setIcon(R.drawable.warning); if (domStorageEnabled && cookiesEnabled) { - Toast.makeText(getApplicationContext(), "JavaScript disabled, DOM Storage and Cookies still enabled", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.both_still_enabled, Snackbar.LENGTH_SHORT).show(); } else { if (domStorageEnabled) { - Toast.makeText(getApplicationContext(), "JavaScript disabled, DOM Storage still enabled", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_still_enabled, Snackbar.LENGTH_SHORT).show(); } else { - Toast.makeText(getApplicationContext(), "JavaScript disabled, Cookies still enabled", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.cookies_still_enabled, Snackbar.LENGTH_SHORT).show(); } } } else { menuItem.setIcon(R.drawable.privacy_mode); - Toast.makeText(getApplicationContext(), "Privacy Mode", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); } } else { javaScriptEnabled = true; menuItem.setIcon(R.drawable.javascript_enabled); mainWebView.getSettings().setJavaScriptEnabled(true); mainWebView.reload(); - Toast.makeText(getApplicationContext(), "JavaScript enabled", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.javascript_enabled, Snackbar.LENGTH_SHORT).show(); } return true; @@ -453,14 +463,14 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome mainWebView.getSettings().setDomStorageEnabled(false); mainWebView.reload(); - // Update the toggleJavaScript icon and display a toast message if appropriate. + // Update the toggleJavaScript icon and display a snackbar if appropriate. if (!javaScriptEnabled && !cookiesEnabled) { toggleJavaScript.setIcon(R.drawable.privacy_mode); - Toast.makeText(getApplicationContext(), "Privacy Mode", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); } else { if (cookiesEnabled) { toggleJavaScript.setIcon(R.drawable.warning); - Toast.makeText(getApplicationContext(), "Cookies still enabled", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.cookies_still_enabled, Snackbar.LENGTH_SHORT).show(); } // Else Do nothing because JavaScript is enabled. } } else { @@ -474,7 +484,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome toggleJavaScript.setIcon(R.drawable.warning); } // Else Do nothing because JavaScript is enabled. - Toast.makeText(getApplicationContext(), "DOM Storage enabled", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_enabled, Snackbar.LENGTH_SHORT).show(); } return true; @@ -501,14 +511,14 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome cookieManager.setAcceptCookie(false); mainWebView.reload(); - // Update the toggleJavaScript icon and display a toast message if appropriate. + // Update the toggleJavaScript icon and display a snackbar if appropriate. if (!javaScriptEnabled && !domStorageEnabled) { toggleJavaScript.setIcon(R.drawable.privacy_mode); - Toast.makeText(getApplicationContext(), "Privacy Mode", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.privacy_mode, Snackbar.LENGTH_SHORT).show(); } else { if (domStorageEnabled) { toggleJavaScript.setIcon(R.drawable.warning); - Toast.makeText(getApplicationContext(), "DOM Storage still enabled", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_enabled, Snackbar.LENGTH_SHORT).show(); } // Else Do nothing because JavaScript is enabled. } } else { @@ -522,14 +532,14 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome toggleJavaScript.setIcon(R.drawable.warning); } // Else Do nothing because JavaScript is enabled. - Toast.makeText(getApplicationContext(), "Cookies enabled", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.cookies_enabled, Snackbar.LENGTH_SHORT).show(); } return true; case R.id.clearDomStorage: WebStorage webStorage = WebStorage.getInstance(); webStorage.deleteAllData(); - Toast.makeText(getApplicationContext(), "DOM storage deleted", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.dom_storage_deleted, Snackbar.LENGTH_SHORT).show(); return true; case R.id.clearCookies: @@ -538,7 +548,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome } else { cookieManager.removeAllCookies(null); } - Toast.makeText(getApplicationContext(), "Cookies deleted", Toast.LENGTH_SHORT).show(); + Snackbar.make(findViewById(R.id.mainWebView), R.string.cookies_deleted, Snackbar.LENGTH_SHORT).show(); return true; case R.id.addToHomescreen: @@ -551,22 +561,18 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome case R.id.downloads: // Launch the system Download Manager. - Intent downloadManangerIntent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS); + Intent downloadManagerIntent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS); // Launch as a new task so that Download Manager and Privacy Browser show as separate windows in the recent tasks list. - downloadManangerIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + downloadManagerIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - startActivity(downloadManangerIntent); + startActivity(downloadManagerIntent); return true; case R.id.home: mainWebView.loadUrl(homepage); return true; - case R.id.refresh: - mainWebView.reload(); - return true; - case R.id.back: mainWebView.goBack(); return true; @@ -659,7 +665,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome } } - public void loadUrlFromTextBox() throws UnsupportedEncodingException { + private void loadUrlFromTextBox() throws UnsupportedEncodingException { // Get the text from urlTextBox and convert it to a string. String unformattedUrlString = urlTextBox.getText().toString(); URL unformattedUrl = null;