X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FWebview.java;h=5f1e87239a5a009f22d67723638928c8f7aed975;hb=ed666e35740078d91a7cb786e56c71afeab9c909;hp=7d5b63fda042f7577743acfb58cc74c183b36ff9;hpb=6e2e99a589d3027b908106f60cc03cf4fcbfdb43;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 7d5b63fd..5f1e8723 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java +++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java @@ -3,12 +3,14 @@ package com.stoutner.privacybrowser; import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.Activity; +import android.app.DownloadManager; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; @@ -18,12 +20,18 @@ import android.view.Menu; import android.view.MenuItem; 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.RelativeLayout; +import android.widget.Toast; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; @@ -31,12 +39,8 @@ import java.net.URLEncoder; public class Webview extends AppCompatActivity { - static String formattedUrlString; - static WebView mainWebView; - static ProgressBar progressBar; - static EditText urlTextBox; - static ImageView favoriteIcon; - static final String homepage = "https://www.duckduckgo.com/"; + private String formattedUrlString; + private String homepage = "https://www.duckduckgo.com/"; // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled. @SuppressLint("SetJavaScriptEnabled") @@ -46,7 +50,10 @@ public class Webview extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_webview); - mainWebView = (WebView) findViewById(R.id.mainWebView); + final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); + final FrameLayout fullScreenVideoFrameLayout = (FrameLayout) findViewById(R.id.fullScreenVideoFrameLayout); + final RelativeLayout rootRelativeLayout = (RelativeLayout) findViewById(R.id.rootRelativeLayout); + final Activity mainWebViewActivity = this; final ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { @@ -57,82 +64,156 @@ public class Webview extends AppCompatActivity { actionBar.setCustomView(R.layout.app_bar); actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); - // Initialize the variables for favoriteIcon, urlTextBox, and progressBar - favoriteIcon = (ImageView) actionBar.getCustomView().findViewById(R.id.favoriteIcon); - urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); - progressBar = (ProgressBar) actionBar.getCustomView().findViewById(R.id.progressBar); + // Set the "go" button on the keyboard to load the URL in urlTextBox. + EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); + 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)) { + // Load the URL into the mainWebView and consume the event. + try { + loadUrlFromTextBox(); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + // If the enter key was pressed, consume the event. + return true; + } + // If any other key was pressed, do not consume the event. + return false; + } + }); } mainWebView.setWebViewClient(new WebViewClient() { - - // setWebViewClient makes this WebView the default handler for URLs inside the app, so that links are not kicked out to other apps. - // Save the URL to formattedUrlString and update urlTextBox before loading mainWebView. + // 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; } + public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) { + Toast.makeText(mainWebViewActivity, "Error loading " + request + " Error: " + error, Toast.LENGTH_LONG).show(); + } + // Update the URL in urlTextBox when the page starts to load. @Override public void onPageStarted(WebView view, String url, Bitmap favicon) { - urlTextBox.setText(url); + if (actionBar != null) { + EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); + urlTextBox.setText(url); + } } // Update formattedUrlString and urlTextBox. It is necessary to do this after the page finishes loading because the final URL can change during load. @Override public void onPageFinished(WebView view, String url) { formattedUrlString = url; - urlTextBox.setText(formattedUrlString); + + if (actionBar != null) { + EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); + urlTextBox.setText(formattedUrlString); + } } }); mainWebView.setWebChromeClient(new WebChromeClient() { - // Update the progress bar when a page is loading. @Override public void onProgressChanged(WebView view, int progress) { - progressBar.setProgress(progress); - if (progress < 100) { - progressBar.setVisibility(View.VISIBLE); - } else { - progressBar.setVisibility(View.GONE); + // Make sure that actionBar is not null. + if (actionBar != null) { + ProgressBar progressBar = (ProgressBar) actionBar.getCustomView().findViewById(R.id.progressBar); + progressBar.setProgress(progress); + if (progress < 100) { + progressBar.setVisibility(View.VISIBLE); + } else { + progressBar.setVisibility(View.GONE); + } } } // Set the favorite icon when it changes. @Override public void onReceivedIcon(WebView view, Bitmap icon) { - favoriteIcon.setImageBitmap(Bitmap.createScaledBitmap(icon, 64, 64, true)); + // Make sure that actionBar is not null. + if (actionBar != null) { + ImageView favoriteIcon = (ImageView) actionBar.getCustomView().findViewById(R.id.favoriteIcon); + favoriteIcon.setImageBitmap(Bitmap.createScaledBitmap(icon, 64, 64, true)); + } + } + + // Enter full screen video + @Override + public void onShowCustomView(View view, CustomViewCallback callback) { + 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() { + getSupportActionBar().show(); + + mainWebView.setVisibility(View.VISIBLE); + + fullScreenVideoFrameLayout.removeAllViews(); + fullScreenVideoFrameLayout.setVisibility(View.GONE); } }); - // Set the "go" button on the keyboard to load the URL. - urlTextBox.setOnKeyListener(new View.OnKeyListener() { - public boolean onKey(View v, int keyCode, KeyEvent event) { + mainWebView.setDownloadListener(new DownloadListener() { + // Launch the Android download manager when a link leads to a download. + @Override + public void onDownloadStart(String url, String userAgent, String contentDisposition, String mimetype, long contentLength) { + DownloadManager downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE); + DownloadManager.Request requestUri = new DownloadManager.Request(Uri.parse(url)); - // 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)) { - // Load the URL into the mainWebView and consume the event. - try { - loadUrlFromTextBox(mainWebView); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - // If the enter key was pressed, consume the event. - return true; + // 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); } - // If any other key was pressed, do not consume the event. - return false; + + downloadManager.enqueue(requestUri); + Toast.makeText(mainWebViewActivity, "Download started", Toast.LENGTH_SHORT).show(); } }); // Allow pinch to zoom. mainWebView.getSettings().setBuiltInZoomControls(true); - // Hide zoom controls. - mainWebView.getSettings().setDisplayZoomControls(false); + // Hide zoom controls if the API is 11 or greater. + if (Build.VERSION.SDK_INT >= 11) { + mainWebView.getSettings().setDisplayZoomControls(false); + } // Enable JavaScript. mainWebView.getSettings().setJavaScriptEnabled(true); @@ -165,12 +246,14 @@ public class Webview extends AppCompatActivity { return true; } - // @TargetApi(11) turns off the errors regarding copy and paste, which are removied from view in menu_webview.xml for lower version of Android. + // @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) 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) { @@ -191,26 +274,47 @@ public class Webview extends AppCompatActivity { break; case R.id.copyURL: - clipboard.setPrimaryClip(ClipData.newPlainText("URL", urlTextBox.getText())); + // Make sure that actionBar is not null. + if (actionBar != null) { + EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); + clipboard.setPrimaryClip(ClipData.newPlainText("URL", urlTextBox.getText())); + } break; case R.id.pasteURL: - ClipData.Item clipboardData = clipboard.getPrimaryClip().getItemAt(0); - urlTextBox.setText(clipboardData.coerceToText(this)); - try { - loadUrlFromTextBox(mainWebView); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); + // Make sure that actionBar is not null. + if (actionBar != null) { + ClipData.Item clipboardData = clipboard.getPrimaryClip().getItemAt(0); + EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); + urlTextBox.setText(clipboardData.coerceToText(this)); + try { + loadUrlFromTextBox(); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } } break; case R.id.shareURL: - Intent shareIntent = new Intent(); - shareIntent.setAction(Intent.ACTION_SEND); - shareIntent.putExtra(Intent.EXTRA_TEXT, urlTextBox.getText().toString()); - shareIntent.setType("text/plain"); - startActivity(Intent.createChooser(shareIntent, "Share URL")); + // Make sure that actionBar is not null. + if (actionBar != null) { + EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); + Intent shareIntent = new Intent(); + shareIntent.setAction(Intent.ACTION_SEND); + shareIntent.putExtra(Intent.EXTRA_TEXT, urlTextBox.getText().toString()); + shareIntent.setType("text/plain"); + startActivity(Intent.createChooser(shareIntent, "Share URL")); + } break; + + case R.id.downloads: + // Launch the system Download Manager. + Intent downloadManangerIntent = 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); + + startActivity(downloadManangerIntent); } return super.onOptionsItemSelected(menuItem); @@ -219,6 +323,8 @@ public class Webview extends AppCompatActivity { // Override onBackPressed so that if mainWebView can go back it does when the system back button is pressed. @Override public void onBackPressed() { + final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); + if (mainWebView.canGoBack()) { mainWebView.goBack(); } else { @@ -226,47 +332,54 @@ public class Webview extends AppCompatActivity { } } - public void loadUrlFromTextBox(View view) throws UnsupportedEncodingException { - // Get the text from urlTextInput and convert it to a string. - String unformattedUrlString = urlTextBox.getText().toString(); - URL unformattedUrl = null; - Uri.Builder formattedUri = new Uri.Builder(); + public void loadUrlFromTextBox() throws UnsupportedEncodingException { + // Make sure that actionBar is not null. + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); + EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); - // Check to see if unformattedUrlString is a valid URL. Otherwise, convert it into a Duck Duck Go search. - if (Patterns.WEB_URL.matcher(unformattedUrlString).matches()) { + // Get the text from urlTextInput and convert it to a string. + String unformattedUrlString = urlTextBox.getText().toString(); + URL unformattedUrl = null; + Uri.Builder formattedUri = new Uri.Builder(); - // Add http:// at the beginning if it is missing. Otherwise the app will segfault. - if (!unformattedUrlString.startsWith("http")) { - unformattedUrlString = "http://" + unformattedUrlString; - } + // Check to see if unformattedUrlString is a valid URL. Otherwise, convert it into a Duck Duck Go search. + if (Patterns.WEB_URL.matcher(unformattedUrlString).matches()) { - // Convert unformattedUrlString to a URL, then to a URI, and then back to a string, which sanitizes the input and adds in any missing components. - try { - unformattedUrl = new URL(unformattedUrlString); - } catch (MalformedURLException e) { - e.printStackTrace(); - } + // Add http:// at the beginning if it is missing. Otherwise the app will segfault. + if (!unformattedUrlString.startsWith("http")) { + unformattedUrlString = "http://" + unformattedUrlString; + } - // The ternary operator (? :) makes sure that a null pointer exception is not thrown, which would happen if .get was called on a null value. - final String scheme = unformattedUrl != null ? unformattedUrl.getProtocol() : null; - final String authority = unformattedUrl != null ? unformattedUrl.getAuthority() : null; - final String path = unformattedUrl != null ? unformattedUrl.getPath() : null; - final String query = unformattedUrl != null ? unformattedUrl.getQuery() : null; - final String fragment = unformattedUrl != null ? unformattedUrl.getRef() : null; + // Convert unformattedUrlString to a URL, then to a URI, and then back to a string, which sanitizes the input and adds in any missing components. + try { + unformattedUrl = new URL(unformattedUrlString); + } catch (MalformedURLException e) { + e.printStackTrace(); + } - formattedUri.scheme(scheme).authority(authority).path(path).query(query).fragment(fragment); - formattedUrlString = formattedUri.build().toString(); + // The ternary operator (? :) makes sure that a null pointer exception is not thrown, which would happen if .get was called on a null value. + final String scheme = unformattedUrl != null ? unformattedUrl.getProtocol() : null; + final String authority = unformattedUrl != null ? unformattedUrl.getAuthority() : null; + final String path = unformattedUrl != null ? unformattedUrl.getPath() : null; + final String query = unformattedUrl != null ? unformattedUrl.getQuery() : null; + final String fragment = unformattedUrl != null ? unformattedUrl.getRef() : null; - } else { - // Sanitize the search input. - final String encodedUrlString = URLEncoder.encode(unformattedUrlString, "UTF-8"); - formattedUrlString = "https://duckduckgo.com/?q=" + encodedUrlString; - } + formattedUri.scheme(scheme).authority(authority).path(path).query(query).fragment(fragment); + formattedUrlString = formattedUri.build().toString(); - mainWebView.loadUrl(formattedUrlString); + } else { + // Sanitize the search input and convert it to a DuckDuckGo search. + final String encodedUrlString = URLEncoder.encode(unformattedUrlString, "UTF-8"); + formattedUrlString = "https://duckduckgo.com/?q=" + encodedUrlString; + } + + mainWebView.loadUrl(formattedUrlString); - // Hides the keyboard so we can see the webpage. - InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Activity.INPUT_METHOD_SERVICE); - inputMethodManager.hideSoftInputFromWindow(mainWebView.getWindowToken(), 0); + // Hides the keyboard so we can see the webpage. + InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Activity.INPUT_METHOD_SERVICE); + inputMethodManager.hideSoftInputFromWindow(mainWebView.getWindowToken(), 0); + } } }