X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FWebview.java;h=a627a780f4af35d5661ee2f7dd2bdd182e4bba4a;hb=405b0fa00eef8a6239f1f7ae6b0db06edb23ccb9;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..a627a780 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java
@@ -16,9 +16,6 @@ import android.webkit.WebViewClient;
 import android.widget.EditText;
 import android.widget.ProgressBar;
 
-import java.net.URL;
-
-
 public class Webview extends AppCompatActivity {
 
     static String formattedUrlString;
@@ -36,17 +33,25 @@ public class Webview extends AppCompatActivity {
         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(url);
+                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);
                 }
-                progressBar.setProgress(progress);
             }
         });
 
@@ -66,18 +71,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();
+            Webview.formattedUrlString = intentUriData.toString();
         }
 
         // If formattedUrlString is null assign the homepage to it.
@@ -96,7 +92,7 @@ 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.
-                    loadUrl(mainWebView);
+                    loadUrlFromTextBox(mainWebView);
                     return true;
                 }
                 // Do not consume the event.
@@ -118,8 +114,11 @@ public class Webview extends AppCompatActivity {
         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;
@@ -141,7 +140,7 @@ public class Webview extends AppCompatActivity {
         }
     }
 
-    public void loadUrl(View view) {
+    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();
@@ -166,24 +165,6 @@ public class Webview extends AppCompatActivity {
                 formattedUrlString = "http://" + unformattedUrlString;
         }
 
-        /*
-        // Parse the unformattedURLString into a Uri.
-
-        final Uri uriData = Uri.parse(unformattedUrlString);
-
-        // Convert the Uri to a URL, chicking for any problems with the formatting.
-        URL urlData = null;
-
-        try {
-            urlData = new URL(uriData.getScheme(), uriData.getHost(), uriData.getPath());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        //  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.