From c386d4c28669c3180d2fad08ec63da972b4d86ec Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Thu, 24 Sep 2015 16:09:27 -0700
Subject: [PATCH] Update urlTextBox on click.

---
 .idea/gradle.xml                              |  2 +-
 .idea/misc.xml                                |  2 +-
 app/app.iml                                   |  2 +-
 .../com/stoutner/privacybrowser/Webview.java  | 31 ++++++-------------
 app/src/main/res/layout/activity_webview.xml  |  2 +-
 5 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index bd4202cb..0833b17c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.4" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 95f0f031..6a1e020d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/app.iml b/app/app.iml
index 5faf5798..84d6657d 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -90,8 +90,8 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/src/main/java/com/stoutner/privacybrowser/Webview.java b/app/src/main/java/com/stoutner/privacybrowser/Webview.java
index cdb09a51..bc8dd08d 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java
@@ -36,7 +36,14 @@ 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 urlTextBox before loading mainWebView.
+        mainWebView.setWebViewClient(new WebViewClient() {
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                urlTextBox.setText(url);
+                mainWebView.loadUrl(url);
+                return true;
+            }
+        });
 
         // Update the progress bar when a page is loading.
         mainWebView.setWebChromeClient(new WebChromeClient() {
@@ -96,7 +103,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.
@@ -141,7 +148,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 +173,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.
diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index deb2b745..20dbfeb5 100644
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -22,7 +22,7 @@
         <Button
             android:id="@+id/goButton"
             android:text="@string/go_button"
-            android:onClick="loadUrl"
+            android:onClick="loadUrlFromTextBox"
             style="?android:attr/buttonStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
-- 
2.43.0