Check protocol/port when determining reload for WebView (#4297)

- When determining whether the WebView should be reloaded with the current server URL, also check that the protocol (http/https) and port (8123, 443, ...) match and if not reload.
2024-10-01 13:53:53 +00:00 · 2024-03-26 23:14:28 +01:00 · 2024-03-26 23:14:28 +01:00 · 5bf22b8631
parent de3a3481e2
commit 5bf22b8631
1 changed files with 6 additions and 1 deletions
--- a/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt
@ -100,7 +100,12 @@ class WebViewPresenterImpl @Inject constructor(
            loosing wifi signal and reopening app. Without this we would still be trying to use the
            internal url externally.
             */
-            if (oldUrlForServer != urlForServer || oldUrl?.host != url?.host) {
+            if (
+                oldUrlForServer != urlForServer ||
+                oldUrl?.protocol != url?.protocol ||
+                oldUrl?.host != url?.host ||
+                oldUrl?.port != url?.port
+            ) {
                view.loadUrl(
                    url = Uri.parse(url.toString())
                        .buildUpon()