From 101715bf37c5ffc3b739bb6353637a2bcf1cc643 Mon Sep 17 00:00:00 2001
From: evilbunny2008 <34211365+evilbunny2008@users.noreply.github.com>
Date: Thu, 19 Jan 2023 14:01:25 +1100
Subject: [PATCH] Fixed radar/forecast page

---
 app/build.gradle                                            | 4 ++--
 app/src/main/java/com/odiousapps/weewxweather/Custom.java   | 2 ++
 app/src/main/java/com/odiousapps/weewxweather/Forecast.java | 3 +++
 app/src/main/java/com/odiousapps/weewxweather/Weather.java  | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 74ca3ea..9ef14bd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.odiousapps.weewxweather"
         minSdkVersion 23
         targetSdkVersion 33
-        versionCode 1000012
-        versionName "1.0.12"
+        versionCode 1000013
+        versionName "1.0.13"
     }
 
     buildTypes {
diff --git a/app/src/main/java/com/odiousapps/weewxweather/Custom.java b/app/src/main/java/com/odiousapps/weewxweather/Custom.java
index 6ecf22d..d42c3a7 100644
--- a/app/src/main/java/com/odiousapps/weewxweather/Custom.java
+++ b/app/src/main/java/com/odiousapps/weewxweather/Custom.java
@@ -10,6 +10,7 @@
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -55,6 +56,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 			Common.LogMessage("wv.getScrollY() == " + wv.getScrollY());
 			swipeLayout.setEnabled(wv.getScrollY() == 0);
 		});
+		wv.setWebViewClient(new WebViewClient());
 
 		wv.setOnKeyListener((v, keyCode, event) ->
 		{
diff --git a/app/src/main/java/com/odiousapps/weewxweather/Forecast.java b/app/src/main/java/com/odiousapps/weewxweather/Forecast.java
index 1849436..f1c3038 100644
--- a/app/src/main/java/com/odiousapps/weewxweather/Forecast.java
+++ b/app/src/main/java/com/odiousapps/weewxweather/Forecast.java
@@ -18,6 +18,7 @@
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -98,6 +99,8 @@ public boolean onConsoleMessage(ConsoleMessage cm)
 		});
 		wv2.getViewTreeObserver().addOnScrollChangedListener(() -> swipeLayout.setEnabled(wv2.getScrollY() == 0));
 
+		wv2.setWebViewClient(new WebViewClient());
+
 		forecast = rootView.findViewById(R.id.forecast);
 		im = rootView.findViewById(R.id.logo);
 
diff --git a/app/src/main/java/com/odiousapps/weewxweather/Weather.java b/app/src/main/java/com/odiousapps/weewxweather/Weather.java
index 21b6c16..3dbdc60 100644
--- a/app/src/main/java/com/odiousapps/weewxweather/Weather.java
+++ b/app/src/main/java/com/odiousapps/weewxweather/Weather.java
@@ -15,6 +15,7 @@
 import android.webkit.ConsoleMessage;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import android.widget.TextView;
 
 import java.io.File;
@@ -76,6 +77,8 @@ public boolean onConsoleMessage(ConsoleMessage cm)
 			}
 		});
 
+		forecast.setWebViewClient(new WebViewClient());
+
 		loadWebView();
 
 		File f2 = new File(common.context.getFilesDir(), "/radar.gif");