X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FWebview.java;h=1fd1554828b983ada48c87c2f924fc93529d48b1;hb=4b39729bc94e87fe56f63bc3ddd9c6287610a47a;hp=cdb09a51560de21027d33f69a02432598a8d75e3;hpb=fda0da47d78471ff653a84832723a52551d32a21;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 cdb09a51..1fd15548 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java +++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java @@ -2,28 +2,38 @@ package com.stoutner.privacybrowser; 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; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.view.ViewTreeObserver; 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; import java.net.URL; - +import java.net.URLEncoder; public class Webview extends AppCompatActivity { static String formattedUrlString; static WebView mainWebView; static ProgressBar progressBar; + static SwipeRefreshLayout swipeToRefresh; + static EditText urlTextBox; + static ImageView favoriteIcon; static final String homepage = "https://www.duckduckgo.com"; @Override @@ -31,22 +41,105 @@ public class Webview extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_webview); - final EditText urlTextBox = (EditText) findViewById(R.id.urlTextBox); + urlTextBox = (EditText) findViewById(R.id.urlTextBox); + 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); + swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { + @Override + public void onRefresh() { + mainWebView.loadUrl(formattedUrlString); + } + }); + + // Only enable swipeToRefresh if is mainWebView is scrolled to the top. + mainWebView.getViewTreeObserver().addOnScrollChangedListener(new ViewTreeObserver.OnScrollChangedListener() { + @Override + public void onScrollChanged() { + if (mainWebView.getScrollY() == 0) { + swipeToRefresh.setEnabled(true); + } else { + swipeToRefresh.setEnabled(false); + } + } + }); - // setWebViewClient makes this WebView the default handler for URLs inside the app, so that links are not kicked out to other apps. - mainWebView.setWebViewClient(new WebViewClient()); + 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); + } + }); - // 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); } - progressBar.setProgress(progress); + } + + // 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; } }); @@ -66,18 +159,9 @@ public class Webview extends AppCompatActivity { final Intent intent = getIntent(); if (intent.getData() != null) { - // Get the intent data. + // Get the intent data and convert it to a string. final Uri intentUriData = intent.getData(); - - // Try to parse the intent data and store it in urlData. - URL urlData = null; - try { - urlData = new URL(intentUriData.getScheme(), intentUriData.getHost(), intentUriData.getPath()); - } catch (Exception e) { - e.printStackTrace(); - } - - Webview.formattedUrlString = urlData.toString(); + formattedUrlString = intentUriData.toString(); } // If formattedUrlString is null assign the homepage to it. @@ -85,25 +169,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. - loadUrl(mainWebView); - return true; - } - // Do not consume the event. - return false; - } - }); - } @Override @@ -116,13 +183,17 @@ public class Webview extends AppCompatActivity { @Override public boolean onOptionsItemSelected(MenuItem menuItem) { int menuItemId = menuItem.getItemId(); - final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); - // Use the menu items to go forward or back. + // 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; @@ -141,53 +212,43 @@ public class Webview extends AppCompatActivity { } } - public void loadUrl(View view) { + 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 String unformattedUrlString = urlTextBox.getText().toString(); + String unformattedUrlString = urlTextBox.getText().toString(); + URL unformattedUrl = null; + Uri.Builder formattedUri = new Uri.Builder(); - // Don't do anything unless unformattedUrlString is at least 6 characters long. - if (unformattedUrlString.length() < 6) { return; } + // 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()) { - // Add correct protocol formatting to the beginning of the URL if needed. - final String firstSixCharacters = unformattedUrlString.substring(0, 6); - - switch (firstSixCharacters) { - case "http:/": - formattedUrlString = unformattedUrlString; - break; - case "https:": - formattedUrlString = unformattedUrlString; - break; - case "ftp://": - formattedUrlString = unformattedUrlString; - break; - default: - formattedUrlString = "http://" + unformattedUrlString; - } + // Add http:// at the beginning if it is missing. Otherwise the app will segfault. + if (!unformattedUrlString.startsWith("http")) { + unformattedUrlString = "http://" + unformattedUrlString; + } - /* - // Parse the unformattedURLString into a Uri. + // 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(); + } - final Uri uriData = Uri.parse(unformattedUrlString); + // 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; - // Convert the Uri to a URL, chicking for any problems with the formatting. - URL urlData = null; + formattedUri.scheme(scheme).authority(authority).path(path).query(query).fragment(fragment); + formattedUrlString = formattedUri.build().toString(); - try { - urlData = new URL(uriData.getScheme(), uriData.getHost(), uriData.getPath()); - } catch (Exception e) { - e.printStackTrace(); + } else { + // Sanitize the search input. + final String encodedUrlString = URLEncoder.encode(unformattedUrlString, "UTF-8"); + formattedUrlString = "https://duckduckgo.com/?q=" + encodedUrlString; } - // Convert urlData to a string, which is reqauired by loadUrl method. - formattedUrlString = urlData.toString(); - */ - - final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); - - // Place the URL text back in the address bar and load the website. - urlTextBox.setText(formattedUrlString); mainWebView.loadUrl(formattedUrlString); // Hides the keyboard so we can see the webpage.