From 37d3f43c291352865b1532384833932e485ee1ed Mon Sep 17 00:00:00 2001
From: julianharty <julianharty@gmail.com>
Date: Wed, 14 Aug 2019 12:41:20 +0100
Subject: [PATCH] Applied changes suggested in
 https://github.com/kiwix/kiwix-android/pull/1365

Additional testing notes available in #1364
---
 .../kiwixmobile/main/KiwixWebViewClient.java  | 20 +++++++++++--------
 .../kiwix/kiwixmobile/main/MainActivity.java  |  4 +++-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixWebViewClient.java b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixWebViewClient.java
index 5f7f4fdf6..1f560e9f7 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixWebViewClient.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixWebViewClient.java
@@ -92,15 +92,19 @@ public class KiwixWebViewClient extends WebViewClient {
 
   @Override
   public void onPageFinished(WebView view, String url) {
-    if (BuildConfig.IS_CUSTOM_APP && url.equals("content://" + BuildConfig.APPLICATION_ID + ".zim.base/null")) {
-      Log.e(TAG_KIWIX, "Abandoning WebView as there's a problem getting the content for this custom app.");
-      return;
-    }
-    if ((url.equals("content://" + BuildConfig.APPLICATION_ID + ".zim.base/null"))
-        && !BuildConfig.IS_CUSTOM_APP) {
-      inflateHomeView(view);
-      return;
+    boolean invalidUrl = url.equals("content://" + BuildConfig.APPLICATION_ID + ".zim.base/null");
+    Log.d(TAG_KIWIX, "invalidUrl = " + invalidUrl);
+
+    if (invalidUrl) {
+      if (BuildConfig.IS_CUSTOM_APP) {
+        Log.e(TAG_KIWIX, "Abandoning WebView as there's a problem getting the content for this custom app.");
+        return;
+      } else {
+        inflateHomeView(view);
+        return;
+      }
     }
+
     if (!url.equals("file:///android_asset/home.html")) {
       view.removeView(home);
     } else if (!BuildConfig.IS_CUSTOM_APP) {
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
index 5b4dd4f63..c8afe28bf 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
@@ -369,7 +369,9 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
       } else {
         Log.e(TAG_KIWIX, "Problem finding the content, no more OnCreate() code");
         // What should we do here? exit? I'll investigate empirically.
-        return;
+        // It seems unpredictable behaviour if the code returns at this point as yesterday
+        // it didn't crash yet today the app crashes because it tries to load books
+        // in onResume();
       }
 
     } else {