X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FWebview.java;h=3c69aa70b469330ba1d4e46c5a85b0d05196a7d8;hb=d4c20feb706c664c377409b36cf159424c0740b1;hp=6e8f237e0f5beb7937776bbb7bb653a317ec5709;hpb=9523d99614150970890e0d01cf0bf5e38c6ccf14;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 6e8f237e..3c69aa70 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java +++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java @@ -3,24 +3,29 @@ package com.stoutner.privacybrowser; import android.app.Activity; import android.content.Intent; import android.net.Uri; -import android.support.v7.app.ActionBarActivity; import android.os.Bundle; +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.inputmethod.InputMethodManager; +import android.webkit.WebChromeClient; import android.webkit.WebView; import android.webkit.WebViewClient; import android.widget.EditText; - +import android.widget.ProgressBar; +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; import java.net.URL; +import java.net.URLEncoder; - -public class Webview extends ActionBarActivity { +public class Webview extends AppCompatActivity { static String formattedUrlString; static WebView mainWebView; + static ProgressBar progressBar; static final String homepage = "https://www.duckduckgo.com"; @Override @@ -30,9 +35,30 @@ public class Webview extends ActionBarActivity { final EditText urlTextBox = (EditText) findViewById(R.id.urlTextBox); mainWebView = (WebView) findViewById(R.id.mainWebView); + progressBar = (ProgressBar) findViewById(R.id.progressBar); // 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()); + // Save the URL to formattedUrlString and update urlTextBox before loading mainWebView. + mainWebView.setWebViewClient(new WebViewClient() { + public boolean shouldOverrideUrlLoading(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() { + public void onProgressChanged(WebView view, int progress) { + progressBar.setProgress(progress); + if (progress < 100) { + progressBar.setVisibility(View.VISIBLE); + } else { + progressBar.setVisibility(View.GONE); + } + } + }); // Allow pinch to zoom. mainWebView.getSettings().setBuiltInZoomControls(true); @@ -50,18 +76,9 @@ public class Webview extends ActionBarActivity { 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(); + Webview.formattedUrlString = intentUriData.toString(); } // If formattedUrlString is null assign the homepage to it. @@ -80,7 +97,11 @@ public class Webview extends ActionBarActivity { if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) { // Load the URL into the mainWebView and consume the event. - loadUrl(mainWebView); + try { + loadUrlFromTextBox(mainWebView); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } return true; } // Do not consume the event. @@ -102,8 +123,11 @@ public class Webview extends ActionBarActivity { 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; @@ -125,52 +149,51 @@ public class Webview extends ActionBarActivity { } } - 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(); + final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); + String unformattedUrlString = urlTextBox.getText().toString(); + URL unformattedUrl = null; + Uri.Builder formattedUri = new Uri.Builder(); + String scheme; - // 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); + // Add http:// at the beginning if it is missing. Otherwise the app will segfault. + if (!unformattedUrlString.startsWith("http")) { + unformattedUrlString = "http://" + unformattedUrlString; + } - switch (firstSixCharacters) { - case "http:/": - formattedUrlString = unformattedUrlString; - break; - case "https:": - formattedUrlString = unformattedUrlString; - break; - case "ftp://": - formattedUrlString = unformattedUrlString; - break; - default: - formattedUrlString = "http://" + unformattedUrlString; - } + // 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(); + } - /* - // Parse the unformattedURLString into a Uri. + if (unformattedUrl.getProtocol() != null) { + scheme = unformattedUrl.getProtocol(); + } else { + scheme = "http"; + } - final Uri uriData = Uri.parse(unformattedUrlString); + final String authority = unformattedUrl.getAuthority(); + final String path = unformattedUrl.getPath(); + final String query = unformattedUrl.getQuery(); + final String fragment = unformattedUrl.getRef(); - // 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. + // Place formattedUrlString back in the address bar and load the website. urlTextBox.setText(formattedUrlString); mainWebView.loadUrl(formattedUrlString);