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=02613821fa21e4b2e3f4601e91e68828b93135fe;hpb=f5eaa704a5cc7e2240e10d40517980c7152af958;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 02613821..7e87fdfd 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java +++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java @@ -1,5 +1,6 @@ package com.stoutner.privacybrowser; +import android.annotation.SuppressLint; import android.app.Activity; import android.content.Intent; import android.graphics.Bitmap; @@ -14,6 +15,7 @@ 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; @@ -36,22 +38,32 @@ public class Webview extends AppCompatActivity { 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); - 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) { + // Remove the title from the action bar. actionBar.setDisplayShowTitleEnabled(false); - // actionBar.setHideOnContentScrollEnabled(true); + + // 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. @@ -217,7 +229,6 @@ public class Webview extends AppCompatActivity { 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()) { @@ -234,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(); @@ -254,7 +261,6 @@ public class Webview extends AppCompatActivity { formattedUrlString = "https://duckduckgo.com/?q=" + encodedUrlString; } - // Place formattedUrlString back in the address bar and load the website. mainWebView.loadUrl(formattedUrlString); // Hides the keyboard so we can see the webpage.