X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FWebview.java;h=7e87fdfdde415fd4de5765fd526c4988b3cd0fa5;hb=20d57b6738e2676b9bf4c902d0d825b2c5ad6e8d;hp=c75c35766ca9fcadd4882fc025c38a1330afa990;hpb=b0c8d9ec536bf5ce9ed832f46254fbb3125419bd;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 c75c3576..7e87fdfd 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java +++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java @@ -1,10 +1,13 @@ package com.stoutner.privacybrowser; +import android.annotation.SuppressLint; import android.app.Activity; import android.content.Intent; +import android.graphics.Bitmap; 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; @@ -12,11 +15,13 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewTreeObserver; +import android.view.Window; import android.view.inputmethod.InputMethodManager; 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; @@ -29,17 +34,37 @@ public class Webview extends AppCompatActivity { static WebView mainWebView; static ProgressBar progressBar; static SwipeRefreshLayout swipeToRefresh; + static EditText urlTextBox; + static ImageView favoriteIcon; static final String homepage = "https://www.duckduckgo.com"; + // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled. + @SuppressLint("SetJavaScriptEnabled") + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_webview); - final EditText urlTextBox = (EditText) findViewById(R.id.urlTextBox); swipeToRefresh = (SwipeRefreshLayout) findViewById(R.id.swipeRefreshLayoutContainer); mainWebView = (WebView) findViewById(R.id.mainWebView); - progressBar = (ProgressBar) findViewById(R.id.progressBar); + + final ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + // Remove the title from the action bar. + actionBar.setDisplayShowTitleEnabled(false); + + // Add the custom app_bar layout, which shows the favoriteIcon, urlTextBar, and progressBar. + 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); + + //actionBar.setHideOnContentScrollEnabled(true); + } // Implement swipe down to refresh. swipeToRefresh.setColorSchemeColors(0xFF0097FF); @@ -62,29 +87,72 @@ 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) { + mainWebView.loadUrl(url); + return true; + } + + // Update the URL in urlTextBox when the page starts to load. + @Override + public void onPageStarted(WebView view, String url, Bitmap favicon) { + 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); - mainWebView.loadUrl(formattedUrlString); - return true; } }); - // 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) { progressBar.setVisibility(View.VISIBLE); } else { progressBar.setVisibility(View.GONE); + // Stop the refreshing indicator if it is running. swipeToRefresh.setRefreshing(false); } } + + // Set the favorite icon when it changes. + @Override + public void onReceivedIcon(WebView view, Bitmap icon) { + favoriteIcon.setImageBitmap(Bitmap.createScaledBitmap(icon, 64, 64, true)); + } + }); + + // 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; + } }); // Allow pinch to zoom. @@ -105,7 +173,7 @@ public class Webview extends AppCompatActivity { if (intent.getData() != null) { // Get the intent data and convert it to a string. final Uri intentUriData = intent.getData(); - Webview.formattedUrlString = intentUriData.toString(); + formattedUrlString = intentUriData.toString(); } // If formattedUrlString is null assign the homepage to it. @@ -113,29 +181,8 @@ public class Webview extends AppCompatActivity { formattedUrlString = homepage; } - // Place the formattedUrlString in the address bar and load the website. - urlTextBox.setText(formattedUrlString); + // Load the initial website. 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 @@ -148,16 +195,17 @@ 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) { case R.id.home: mainWebView.loadUrl(homepage); break; + case R.id.back: mainWebView.goBack(); break; + case R.id.forward: mainWebView.goForward(); break; @@ -178,12 +226,9 @@ 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(); - String scheme; // 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()) { @@ -200,16 +245,12 @@ public class Webview extends AppCompatActivity { e.printStackTrace(); } - if (unformattedUrl.getProtocol() != null) { - scheme = unformattedUrl.getProtocol(); - } else { - scheme = "http"; - } - - final String authority = unformattedUrl.getAuthority(); - final String path = unformattedUrl.getPath(); - final String query = unformattedUrl.getQuery(); - final String fragment = unformattedUrl.getRef(); + // The ternary operator (? :) makes sure that unformattedUrl.get() does not cause a null pointer exception. + 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; formattedUri.scheme(scheme).authority(authority).path(path).query(query).fragment(fragment); formattedUrlString = formattedUri.build().toString(); @@ -220,8 +261,6 @@ public class Webview extends AppCompatActivity { formattedUrlString = "https://duckduckgo.com/?q=" + encodedUrlString; } - // Place formattedUrlString back in the address bar and load the website. - urlTextBox.setText(formattedUrlString); mainWebView.loadUrl(formattedUrlString); // Hides the keyboard so we can see the webpage.