X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FWebview.java;h=c75c35766ca9fcadd4882fc025c38a1330afa990;hb=b0c8d9ec536bf5ce9ed832f46254fbb3125419bd;hp=a627a780f4af35d5661ee2f7dd2bdd182e4bba4a;hpb=405b0fa00eef8a6239f1f7ae6b0db06edb23ccb9;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 a627a780..c75c3576 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java +++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java @@ -4,23 +4,31 @@ import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.support.v4.widget.SwipeRefreshLayout; 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.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 final String homepage = "https://www.duckduckgo.com"; @Override @@ -29,16 +37,38 @@ public class Webview extends AppCompatActivity { 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); + // 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. // Save the URL to formattedUrlString and update urlTextBox before loading mainWebView. mainWebView.setWebViewClient(new WebViewClient() { public boolean shouldOverrideUrlLoading(WebView view, String url) { - formattedUrlString=url; + formattedUrlString = url; urlTextBox.setText(formattedUrlString); - mainWebView.loadUrl(url); + mainWebView.loadUrl(formattedUrlString); return true; } }); @@ -51,6 +81,8 @@ public class Webview extends AppCompatActivity { progressBar.setVisibility(View.VISIBLE); } else { progressBar.setVisibility(View.GONE); + // Stop the refreshing indicator if it is running. + swipeToRefresh.setRefreshing(false); } } }); @@ -92,7 +124,11 @@ public class Webview extends AppCompatActivity { if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) { // Load the URL into the mainWebView and consume the event. - loadUrlFromTextBox(mainWebView); + try { + loadUrlFromTextBox(mainWebView); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } return true; } // Do not consume the event. @@ -140,34 +176,51 @@ public class Webview extends AppCompatActivity { } } - public void loadUrlFromTextBox(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(); + } - final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); + 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(); + + formattedUri.scheme(scheme).authority(authority).path(path).query(query).fragment(fragment); + formattedUrlString = formattedUri.build().toString(); + + } else { + // Sanitize the search input. + final String encodedUrlString = URLEncoder.encode(unformattedUrlString, "UTF-8"); + formattedUrlString = "https://duckduckgo.com/?q=" + encodedUrlString; + } - // 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);