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=bc8dd08d1bf555a0c68fff887f524bdccca11746;hpb=c386d4c28669c3180d2fad08ec63da972b4d86ec;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 bc8dd08d..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,10 +33,11 @@ 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.
-        // Save the URL to urlTextBox before loading mainWebView.
+        // Save the URL to formattedUrlString and update urlTextBox before loading mainWebView.
         mainWebView.setWebViewClient(new WebViewClient() {
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                urlTextBox.setText(url);
+                formattedUrlString=url;
+                urlTextBox.setText(formattedUrlString);
                 mainWebView.loadUrl(url);
                 return true;
             }
@@ -48,12 +46,12 @@ public class Webview extends AppCompatActivity {
         // 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);
             }
         });
 
@@ -73,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.
@@ -125,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;