X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FWebview.java;h=a0455bc9394b9c03399968b243f99bee61f787d1;hb=b552bcdeaf58d3c98b534826cd434300028bd1b6;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..a0455bc9 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java +++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java @@ -36,10 +36,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; } @@ -73,18 +74,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.