X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FWebview.java;h=de16eae6c0d79fe2c26e5d62c5b83e942107242e;hp=ce6fdb88ebb998db6a8f6cd30c59a328e6a802b6;hb=73053015235f9e857e020e7fefeea31dba6af9fb;hpb=699ac2de82f0cc7cc5edc2eaa331ba377cfbacf3 diff --git a/app/src/main/java/com/stoutner/privacybrowser/Webview.java b/app/src/main/java/com/stoutner/privacybrowser/Webview.java index ce6fdb88..de16eae6 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java +++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java @@ -2,9 +2,13 @@ package com.stoutner.privacybrowser; import android.app.Activity; import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.util.Patterns; import android.view.KeyEvent; @@ -13,10 +17,12 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewTreeObserver; import android.view.inputmethod.InputMethodManager; +import android.webkit.ClientCertRequest; import android.webkit.WebChromeClient; import android.webkit.WebView; import android.webkit.WebViewClient; import android.widget.EditText; +import android.widget.ImageView; import android.widget.ProgressBar; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; @@ -30,6 +36,7 @@ public class Webview extends AppCompatActivity { static ProgressBar progressBar; static SwipeRefreshLayout swipeToRefresh; static EditText urlTextBox; + static ImageView favoriteIcon; static final String homepage = "https://www.duckduckgo.com"; @Override @@ -41,6 +48,14 @@ public class Webview extends AppCompatActivity { swipeToRefresh = (SwipeRefreshLayout) findViewById(R.id.swipeRefreshLayoutContainer); mainWebView = (WebView) findViewById(R.id.mainWebView); progressBar = (ProgressBar) findViewById(R.id.progressBar); + favoriteIcon = (ImageView) findViewById(R.id.favoriteIcon); + + // Remove the title from the action bar. + final ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.setDisplayShowTitleEnabled(false); + // actionBar.setHideOnContentScrollEnabled(true); + } // Implement swipe down to refresh. swipeToRefresh.setColorSchemeColors(0xFF0097FF); @@ -63,19 +78,30 @@ public class Webview extends AppCompatActivity { } }); - // 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. 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. + @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { formattedUrlString = url; urlTextBox.setText(formattedUrlString); mainWebView.loadUrl(formattedUrlString); return true; } + + @Override + public void onPageFinished(WebView view, String url) { + // Update the URL in urlTextBox. It is necessary to do this after the page finishes loading to get the final URL, which can change during load. + formattedUrlString = mainWebView.getUrl(); + urlTextBox.setText(formattedUrlString); + } }); - // Update the progress bar when a page is loading. 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) { @@ -85,11 +111,34 @@ public class Webview extends AppCompatActivity { // Stop the refreshing indicator if it is running. swipeToRefresh.setRefreshing(false); + } + } - // Update the URL in urlTextBox. It is necessary to do this after the page finishes loading to get the final URL, which can change during load. - formattedUrlString = mainWebView.getUrl(); - urlTextBox.setText(formattedUrlString); + // Set the favorite icon if it changes. + @Override + public void onReceivedIcon(WebView view, Bitmap icon) { + favoriteIcon.setImageBitmap(icon); + } + }); + + // 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) { + + // 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; } + // If any other key was pressed, do not consume the event. + return false; } }); @@ -122,26 +171,6 @@ public class Webview extends AppCompatActivity { // Place the formattedUrlString in the address bar and load the website. urlTextBox.setText(formattedUrlString); mainWebView.loadUrl(formattedUrlString); - - // 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) { - // If the event is a key-down event on the "enter" button - 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(); - } - return true; - } - // Do not consume the event. - return false; - } - }); - } @Override @@ -154,7 +183,6 @@ public class Webview extends AppCompatActivity { @Override public boolean onOptionsItemSelected(MenuItem menuItem) { int menuItemId = menuItem.getItemId(); - final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); // Sets the commands that relate to the menu entries. switch (menuItemId) { @@ -163,6 +191,7 @@ public class Webview extends AppCompatActivity { urlTextBox.setText(formattedUrlString); mainWebView.loadUrl(formattedUrlString); break; + case R.id.back: mainWebView.goBack(); @@ -170,6 +199,7 @@ public class Webview extends AppCompatActivity { formattedUrlString = mainWebView.getOriginalUrl(); urlTextBox.setText(formattedUrlString); break; + case R.id.forward: mainWebView.goForward(); @@ -198,8 +228,6 @@ public class Webview extends AppCompatActivity { public void loadUrlFromTextBox(View view) throws UnsupportedEncodingException { // Get the text from urlTextInput and convert it to a string. - final EditText urlTextBox = (EditText) findViewById(R.id.urlTextBox); - final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); String unformattedUrlString = urlTextBox.getText().toString(); URL unformattedUrl = null; Uri.Builder formattedUri = new Uri.Builder();