X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FWebview.java;h=50d67ac5a6162e0b671393961d3630c5549ddb85;hb=308e3d588ca43d02a5704a70875f54cb7e07efb8;hp=16c524159d605fe17219b89f4a8420e0c2d21b4c;hpb=273f3823a4bc9d82d993786b6a606f12101552b9;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 16c52415..50d67ac5 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java +++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java @@ -1,10 +1,19 @@ package com.stoutner.privacybrowser; +import android.annotation.SuppressLint; +import android.annotation.TargetApi; import android.app.Activity; +import android.content.ClipData; +import android.content.ClipboardManager; +import android.content.Context; import android.content.Intent; +import android.graphics.Bitmap; import android.net.Uri; +import android.os.Build; import android.os.Bundle; +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; @@ -14,45 +23,112 @@ 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 final String homepage = "https://www.duckduckgo.com"; + private String formattedUrlString; + private 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); - mainWebView = (WebView) findViewById(R.id.mainWebView); - progressBar = (ProgressBar) findViewById(R.id.progressBar); + final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); + + 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); + + // Set the "go" button on the keyboard to load the URL in urlTextBox. + EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); + 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(); + } 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; + } + }); + } - // 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 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) { - urlTextBox.setText(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) { + if (actionBar != null) { + EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); + 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; + + if (actionBar != null) { + EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); + 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); + // Make sure that actionBar is not null. + if (actionBar != null) { + ProgressBar progressBar = (ProgressBar) actionBar.getCustomView().findViewById(R.id.progressBar); + progressBar.setProgress(progress); + if (progress < 100) { + progressBar.setVisibility(View.VISIBLE); + } else { + progressBar.setVisibility(View.GONE); + } + } + } + + // Set the favorite icon when it changes. + @Override + public void onReceivedIcon(WebView view, Bitmap icon) { + // Make sure that actionBar is not null. + if (actionBar != null) { + ImageView favoriteIcon = (ImageView) actionBar.getCustomView().findViewById(R.id.favoriteIcon); + favoriteIcon.setImageBitmap(Bitmap.createScaledBitmap(icon, 64, 64, true)); } } }); @@ -60,8 +136,10 @@ public class Webview extends AppCompatActivity { // Allow pinch to zoom. mainWebView.getSettings().setBuiltInZoomControls(true); - // Hide zoom controls. - mainWebView.getSettings().setDisplayZoomControls(false); + // Hide zoom controls API is 11 or greater. + if (Build.VERSION.SDK_INT >= 11) { + mainWebView.getSettings().setDisplayZoomControls(false); + } // Enable JavaScript. mainWebView.getSettings().setJavaScriptEnabled(true); @@ -73,18 +151,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. @@ -92,25 +161,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. - loadUrlFromTextBox(mainWebView); - return true; - } - // Do not consume the event. - return false; - } - }); - } @Override @@ -120,19 +172,66 @@ public class Webview extends AppCompatActivity { return true; } + // @TargetApi(11) turns off the errors regarding copy and paste, which are removied from view in menu_webview.xml for lower version of Android. @Override + @TargetApi(11) public boolean onOptionsItemSelected(MenuItem menuItem) { int menuItemId = menuItem.getItemId(); + ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); + ActionBar actionBar = getSupportActionBar(); 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.refresh: + mainWebView.loadUrl(formattedUrlString); + break; + case R.id.back: mainWebView.goBack(); break; + case R.id.forward: mainWebView.goForward(); break; + + case R.id.copyURL: + // Make sure that actionBar is not null. + if (actionBar != null) { + EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); + clipboard.setPrimaryClip(ClipData.newPlainText("URL", urlTextBox.getText())); + } + break; + + case R.id.pasteURL: + // Make sure that actionBar is not null. + if (actionBar != null) { + ClipData.Item clipboardData = clipboard.getPrimaryClip().getItemAt(0); + EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); + urlTextBox.setText(clipboardData.coerceToText(this)); + try { + loadUrlFromTextBox(); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + } + break; + + case R.id.shareURL: + // Make sure that actionBar is not null. + if (actionBar != null) { + EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); + Intent shareIntent = new Intent(); + shareIntent.setAction(Intent.ACTION_SEND); + shareIntent.putExtra(Intent.EXTRA_TEXT, urlTextBox.getText().toString()); + shareIntent.setType("text/plain"); + startActivity(Intent.createChooser(shareIntent, "Share URL")); + } + break; } return super.onOptionsItemSelected(menuItem); @@ -141,6 +240,8 @@ public class Webview extends AppCompatActivity { // Override onBackPressed so that if mainWebView can go back it does when the system back button is pressed. @Override public void onBackPressed() { + final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); + if (mainWebView.canGoBack()) { mainWebView.goBack(); } else { @@ -148,39 +249,54 @@ public class Webview extends AppCompatActivity { } } - public void loadUrlFromTextBox(View view) { - // 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(); + public void loadUrlFromTextBox() throws UnsupportedEncodingException { + // Make sure that actionBar is not null. + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); + EditText urlTextBox = (EditText) actionBar.getCustomView().findViewById(R.id.urlTextBox); - // Don't do anything unless unformattedUrlString is at least 6 characters long. - if (unformattedUrlString.length() < 6) { return; } + // Get the text from urlTextInput and convert it to a string. + String unformattedUrlString = urlTextBox.getText().toString(); + URL unformattedUrl = null; + Uri.Builder formattedUri = new Uri.Builder(); - // Add correct protocol formatting to the beginning of the URL if needed. - final String firstSixCharacters = unformattedUrlString.substring(0, 6); + // 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()) { - 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; + } - final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); + // 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(); + } - // Place the URL text back in the address bar and load the website. - urlTextBox.setText(formattedUrlString); - mainWebView.loadUrl(formattedUrlString); + // The ternary operator (? :) makes sure that a null pointer exception is not thrown, which would happen if .get was called on a null value. + 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(); + + } else { + // Sanitize the search input and convert it to a DuckDuckGo search. + final String encodedUrlString = URLEncoder.encode(unformattedUrlString, "UTF-8"); + formattedUrlString = "https://duckduckgo.com/?q=" + encodedUrlString; + } + + mainWebView.loadUrl(formattedUrlString); - // Hides the keyboard so we can see the webpage. - InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Activity.INPUT_METHOD_SERVICE); - inputMethodManager.hideSoftInputFromWindow(mainWebView.getWindowToken(), 0); + // Hides the keyboard so we can see the webpage. + InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Activity.INPUT_METHOD_SERVICE); + inputMethodManager.hideSoftInputFromWindow(mainWebView.getWindowToken(), 0); + } } }