From f13613530948c04bf8c8153b441d78ba74f476c8 Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Wed, 2 Dec 2015 11:22:20 -0700
Subject: [PATCH] Refine progressBar height.  Create onReceivedError toast.

---
 app/src/main/AndroidManifest.xml                 |  3 +++
 .../com/stoutner/privacybrowser/Webview.java     | 16 ++++++++++++----
 app/src/main/res/layout/app_bar.xml              |  5 +++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 02deefac..1f558d1d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,9 @@
     package="com.stoutner.privacybrowser" >
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <!-- READ_EXTERNAL_STORAGE and WRITE_EXTERNAL_STORAGE are required to download files. -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
         android:allowBackup="false"
diff --git a/app/src/main/java/com/stoutner/privacybrowser/Webview.java b/app/src/main/java/com/stoutner/privacybrowser/Webview.java
index 50d67ac5..0de84bfb 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java
@@ -20,11 +20,15 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.webkit.WebChromeClient;
+import android.webkit.WebResourceError;
+import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
+import android.widget.Toast;
+
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -44,6 +48,7 @@ public class Webview extends AppCompatActivity {
         setContentView(R.layout.activity_webview);
 
         final WebView mainWebView = (WebView) findViewById(R.id.mainWebView);
+        final Activity mainWebViewActivity = this;
 
         final ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
@@ -77,14 +82,17 @@ public class Webview extends AppCompatActivity {
         }
 
         mainWebView.setWebViewClient(new WebViewClient() {
-            // 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 formattedUrlString and update urlTextBox before loading mainWebView.
+            // shouldOverrideUrlLoading makes this WebView the default handler for URLs inside the app, so that links are not kicked out to other apps.
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 mainWebView.loadUrl(url);
                 return true;
             }
 
+            public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
+                Toast.makeText(mainWebViewActivity, "Error loading " + request + "   Error: " + error, Toast.LENGTH_SHORT).show();
+            }
+
             // Update the URL in urlTextBox when the page starts to load.
             @Override
             public void onPageStarted(WebView view, String url, Bitmap favicon) {
@@ -136,7 +144,7 @@ public class Webview extends AppCompatActivity {
         // Allow pinch to zoom.
         mainWebView.getSettings().setBuiltInZoomControls(true);
 
-        // Hide zoom controls API is 11 or greater.
+        // Hide zoom controls if the API is 11 or greater.
         if (Build.VERSION.SDK_INT >= 11) {
             mainWebView.getSettings().setDisplayZoomControls(false);
         }
@@ -172,7 +180,7 @@ public class Webview extends AppCompatActivity {
         return true;
     }
 
-    // @TargetApi(11) turns off the errors regarding copy and paste, which are removied from view in menu_webview.xml for lower version of Android.
+    // @TargetApi(11) turns off the errors regarding copy and paste, which are removed from view in menu_webview.xml for lower version of Android.
     @Override
     @TargetApi(11)
     public boolean onOptionsItemSelected(MenuItem menuItem) {
diff --git a/app/src/main/res/layout/app_bar.xml b/app/src/main/res/layout/app_bar.xml
index d82f5ea6..a66e99f4 100644
--- a/app/src/main/res/layout/app_bar.xml
+++ b/app/src/main/res/layout/app_bar.xml
@@ -5,7 +5,7 @@
     android:id="@+id/addressBarFrameLayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content" >
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:id="@+id/addressBarLinearLayout"
@@ -34,11 +34,12 @@
     </LinearLayout>
 
     <!-- android:max changes the maximum ProgressBar value from 10000 to 100 to match progress percentage. -->
+    <!-- android:layout_height="2dp" works best for API 23 "Marshmallow", but "3dp" is required for visibility on API <= 22. -->
     <ProgressBar
         android:id="@+id/progressBar"
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="fill_parent"
-        android:layout_height="7dp"
+        android:layout_height="3dp"
         android:layout_gravity="bottom"
         android:max="100"
         android:progressTint="#FF0097FF"
-- 
2.43.0