X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FWebview.java;h=a1eb26be2f675c78012256a6dde4dca3a796f18f;hb=83814718eb36f98212441127b47d199c62e85920;hp=116360d0e27448473af6a83540f79c6bee5ee562;hpb=3e02a4c1e5eb1639caad22b0ff229a6b4bc4aecd;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/Webview.java b/app/src/main/java/com/stoutner/privacybrowser/Webview.java index 116360d0..a1eb26be 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java +++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java @@ -1,6 +1,24 @@ +/** + * Copyright 2015-2016 Soren Stoutner . + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privacy Browser is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Privacy Browser. If not, see . + */ + package com.stoutner.privacybrowser; -import android.Manifest; import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.Activity; @@ -9,16 +27,14 @@ import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; -import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.os.Environment; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import android.support.v4.app.DialogFragment; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; +import android.support.v7.app.AppCompatDialogFragment; import android.util.Patterns; import android.view.KeyEvent; import android.view.Menu; @@ -27,25 +43,34 @@ import android.view.View; import android.view.inputmethod.InputMethodManager; import android.webkit.DownloadListener; import android.webkit.WebChromeClient; -import android.webkit.WebResourceError; -import android.webkit.WebResourceRequest; import android.webkit.WebView; import android.webkit.WebViewClient; import android.widget.EditText; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.Toast; - -import java.io.File; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.net.URLEncoder; -public class Webview extends AppCompatActivity { +public class Webview extends AppCompatActivity implements CreateHomeScreenShortcut.CreateHomeScreenSchortcutListener { + // favoriteIcon is public static so it can be accessed from CreateHomeScreenShortcut. + public static Bitmap favoriteIcon; + // mainWebView is used in onCreate and onOptionsItemSelected. + private WebView mainWebView; + // formattedUrlString is used in onCreate, onOptionsItemSelected, onCreateHomeScreenShortcutCreate, and loadUrlFromTextBox. private String formattedUrlString; + // homepage is used in onCreate and onOptionsItemSelected. private String homepage = "https://www.duckduckgo.com/"; + // enableJavaScript is used in onCreate and onOptionsItemSelected. + private boolean enableJavaScript; + // enableDomStorage is used in onCreate and onOptionsItemSelected. + private boolean enableDomStorage; + // actionBar is used in onCreate and onOptionsItemSelected. + private ActionBar actionBar; // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled. @SuppressLint("SetJavaScriptEnabled") @@ -55,10 +80,12 @@ public class Webview extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_webview); - final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); + final FrameLayout fullScreenVideoFrameLayout = (FrameLayout) findViewById(R.id.fullScreenVideoFrameLayout); final Activity mainWebViewActivity = this; - final ActionBar actionBar = getSupportActionBar(); + mainWebView = (WebView) findViewById(R.id.mainWebView); + actionBar = getSupportActionBar(); + if (actionBar != null) { // Remove the title from the action bar. actionBar.setDisplayShowTitleEnabled(false); @@ -72,8 +99,7 @@ public class Webview extends AppCompatActivity { urlTextBox.setOnKeyListener(new View.OnKeyListener() { public boolean onKey(View v, int keyCode, KeyEvent event) { // If the event is a key-down event on the "enter" button, load the URL. - if ((event.getAction() == KeyEvent.ACTION_DOWN) && - (keyCode == KeyEvent.KEYCODE_ENTER)) { + if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) { // Load the URL into the mainWebView and consume the event. try { loadUrlFromTextBox(); @@ -82,9 +108,10 @@ public class Webview extends AppCompatActivity { } // If the enter key was pressed, consume the event. return true; + } else { + // If any other key was pressed, do not consume the event. + return false; } - // If any other key was pressed, do not consume the event. - return false; } }); } @@ -97,9 +124,11 @@ public class Webview extends AppCompatActivity { 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_LONG).show(); + Toast.makeText(mainWebViewActivity, "Error loading " + request + " Error: " + error, Toast.LENGTH_SHORT).show(); } + */ // Update the URL in urlTextBox when the page starts to load. @Override @@ -141,14 +170,63 @@ public class Webview extends AppCompatActivity { // Set the favorite icon when it changes. @Override public void onReceivedIcon(WebView view, Bitmap icon) { - // Make sure that actionBar is not null. + // 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 actionBar if it is not null. if (actionBar != null) { - ImageView favoriteIcon = (ImageView) actionBar.getCustomView().findViewById(R.id.favoriteIcon); - favoriteIcon.setImageBitmap(Bitmap.createScaledBitmap(icon, 64, 64, true)); + ImageView imageViewFavoriteIcon = (ImageView) actionBar.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 (getSupportActionBar() != null) { + getSupportActionBar().hide(); + } + + fullScreenVideoFrameLayout.addView(view); + fullScreenVideoFrameLayout.setVisibility(View.VISIBLE); + + mainWebView.setVisibility(View.GONE); + + /* 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); + } + + // 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); } } + + // Exit full screen video + public void onHideCustomView() { + if (getSupportActionBar() != null) { + getSupportActionBar().show(); + } + + mainWebView.setVisibility(View.VISIBLE); + + fullScreenVideoFrameLayout.removeAllViews(); + fullScreenVideoFrameLayout.setVisibility(View.GONE); + } }); + // Allow the downloading of files. mainWebView.setDownloadListener(new DownloadListener() { // Launch the Android download manager when a link leads to a download. @Override @@ -177,11 +255,13 @@ public class Webview extends AppCompatActivity { mainWebView.getSettings().setDisplayZoomControls(false); } - // Enable JavaScript. - mainWebView.getSettings().setJavaScriptEnabled(true); + // Set JavaScript initial status. + enableJavaScript = true; + mainWebView.getSettings().setJavaScriptEnabled(enableJavaScript); - // Enable DOM Storage. - mainWebView.getSettings().setDomStorageEnabled(true); + // Set DOM Storage initial status. + enableDomStorage = true; + mainWebView.getSettings().setDomStorageEnabled(enableDomStorage); // Get the intent information that started the app. final Intent intent = getIntent(); @@ -205,35 +285,72 @@ public class Webview extends AppCompatActivity { public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. getMenuInflater().inflate(R.menu.menu_webview, menu); + MenuItem toggleJavaScriptMenuItem = menu.findItem(R.id.toggleJavaScript); + MenuItem toggleDomStorageMenuItem = menu.findItem(R.id.toggleDomStorage); + + // Set the JavaScript menu item checkbox initial status. + toggleJavaScriptMenuItem.setChecked(enableJavaScript); + + // Set the DOM Storage menu item checkbox initial status. + toggleDomStorageMenuItem.setChecked(enableDomStorage); + return true; } - // @TargetApi(11) turns off the errors regarding copy and paste, which are removed from view in menu_webview.xml for lower version of Android. @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") public boolean onOptionsItemSelected(MenuItem menuItem) { int menuItemId = menuItem.getItemId(); ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); - ActionBar actionBar = getSupportActionBar(); - final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); // Sets the commands that relate to the menu entries. switch (menuItemId) { + case R.id.toggleJavaScript: + if (enableJavaScript) { + enableJavaScript = false; + menuItem.setChecked(false); + mainWebView.getSettings().setJavaScriptEnabled(false); + mainWebView.loadUrl(formattedUrlString); + } else { + enableJavaScript = true; + menuItem.setChecked(true); + mainWebView.getSettings().setJavaScriptEnabled(true); + mainWebView.loadUrl(formattedUrlString); + } + return true; + + case R.id.toggleDomStorage: + if (enableDomStorage) { + enableDomStorage = false; + menuItem.setChecked(false); + mainWebView.getSettings().setDomStorageEnabled(false); + mainWebView.loadUrl(formattedUrlString); + } else { + enableDomStorage = true; + menuItem.setChecked(true); + mainWebView.getSettings().setDomStorageEnabled(true); + mainWebView.loadUrl(formattedUrlString); + } + return true; + case R.id.home: mainWebView.loadUrl(homepage); - break; + return true; case R.id.refresh: mainWebView.loadUrl(formattedUrlString); - break; + return true; case R.id.back: mainWebView.goBack(); - break; + return true; case R.id.forward: mainWebView.goForward(); - break; + return true; case R.id.copyURL: // Make sure that actionBar is not null. @@ -241,7 +358,7 @@ public class Webview extends AppCompatActivity { EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); clipboard.setPrimaryClip(ClipData.newPlainText("URL", urlTextBox.getText())); } - break; + return true; case R.id.pasteURL: // Make sure that actionBar is not null. @@ -255,7 +372,7 @@ public class Webview extends AppCompatActivity { e.printStackTrace(); } } - break; + return true; case R.id.shareURL: // Make sure that actionBar is not null. @@ -267,7 +384,15 @@ public class Webview extends AppCompatActivity { shareIntent.setType("text/plain"); startActivity(Intent.createChooser(shareIntent, "Share URL")); } - break; + return true; + + case R.id.addToHomescreen: + // Show the CreateHomeScreenShortcut AlertDialog and name this instance createShortcut. + AppCompatDialogFragment shortcutDialog = new CreateHomeScreenShortcut(); + shortcutDialog.show(getSupportFragmentManager(), "createShortcut"); + + //Everything else will be handled by CreateHomeScreenShortcut and the associated listeners below. + return true; case R.id.downloads: // Launch the system Download Manager. @@ -277,9 +402,41 @@ public class Webview extends AppCompatActivity { downloadManangerIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(downloadManangerIntent); + return true; + + case R.id.about: + // Show the AboutDialog AlertDialog and name this instance aboutDialog. + AppCompatDialogFragment aboutDialog = new AboutDialog(); + aboutDialog.show(getSupportFragmentManager(), "aboutDialog"); + return true; + + default: + return super.onOptionsItemSelected(menuItem); } + } - return super.onOptionsItemSelected(menuItem); + @Override + public void onCreateHomeScreenShortcutCancel(DialogFragment dialog) { + // Do nothing because the user selected "Cancel". + } + + @Override + public void onCreateHomeScreenShortcutCreate(DialogFragment dialog) { + // Get shortcutNameEditText from the alert dialog. + EditText shortcutNameEditText = (EditText) dialog.getDialog().findViewById(R.id.shortcutNameEditText); + + // Create the bookmark shortcut based on formattedUrlString. + Intent bookmarkShortcut = new Intent(); + bookmarkShortcut.setAction(Intent.ACTION_VIEW); + bookmarkShortcut.setData(Uri.parse(formattedUrlString)); + + // Place the bookmark shortcut on the home screen. + Intent placeBookmarkShortcut = new Intent(); + placeBookmarkShortcut.putExtra("android.intent.extra.shortcut.INTENT", bookmarkShortcut); + placeBookmarkShortcut.putExtra("android.intent.extra.shortcut.NAME", shortcutNameEditText.getText().toString()); + placeBookmarkShortcut.putExtra("android.intent.extra.shortcut.ICON", favoriteIcon); + placeBookmarkShortcut.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); + sendBroadcast(placeBookmarkShortcut); } // Override onBackPressed so that if mainWebView can go back it does when the system back button is pressed. @@ -344,4 +501,4 @@ public class Webview extends AppCompatActivity { inputMethodManager.hideSoftInputFromWindow(mainWebView.getWindowToken(), 0); } } -} +} \ No newline at end of file