From 39a7356ed15b111fd940fc4bb8059f7130a1542e Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Fri, 9 Jun 2023 22:45:13 -0400
Subject: [PATCH] Directly track current WebView URL instead of relying on
 state

State approach doesn't work well for client-side routed apps like MangaDex.

Fixes #9576
---
 .../webview/WebViewScreenContent.kt           | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt b/app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt
index 1c7923b03..18c1d9517 100644
--- a/app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt
+++ b/app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt
@@ -14,7 +14,10 @@ import androidx.compose.material.icons.outlined.ArrowForward
 import androidx.compose.material.icons.outlined.Close
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -43,13 +46,14 @@ fun WebViewScreenContent(
 ) {
     val state = rememberWebViewState(url = url, additionalHttpHeaders = headers)
     val navigator = rememberWebViewNavigator()
+    var currentUrl by remember { mutableStateOf(url) }
 
     Scaffold(
         topBar = {
             Box {
                 AppBar(
                     title = state.pageTitle ?: initialTitle,
-                    subtitle = state.lastLoadedUrl,
+                    subtitle = currentUrl,
                     navigateUp = onNavigateUp,
                     navigationIcon = Icons.Outlined.Close,
                     actions = {
@@ -81,15 +85,15 @@ fun WebViewScreenContent(
                                 ),
                                 AppBar.OverflowAction(
                                     title = stringResource(R.string.action_share),
-                                    onClick = { onShare(state.lastLoadedUrl ?: url) },
+                                    onClick = { onShare(currentUrl) },
                                 ),
                                 AppBar.OverflowAction(
                                     title = stringResource(R.string.action_open_in_browser),
-                                    onClick = { onOpenInBrowser(state.lastLoadedUrl ?: url) },
+                                    onClick = { onOpenInBrowser(currentUrl) },
                                 ),
                                 AppBar.OverflowAction(
                                     title = stringResource(R.string.pref_clear_cookies),
-                                    onClick = { onClearCookies(state.lastLoadedUrl ?: url) },
+                                    onClick = { onClearCookies(currentUrl) },
                                 ),
                             ),
                         )
@@ -116,7 +120,22 @@ fun WebViewScreenContent(
             object : AccompanistWebViewClient() {
                 override fun onPageStarted(view: WebView, url: String?, favicon: Bitmap?) {
                     super.onPageStarted(view, url, favicon)
-                    url?.let { onUrlChange(it) }
+                    url?.let {
+                        currentUrl = it
+                        onUrlChange(it)
+                    }
+                }
+
+                override fun doUpdateVisitedHistory(
+                    view: WebView,
+                    url: String?,
+                    isReload: Boolean,
+                ) {
+                    super.doUpdateVisitedHistory(view, url, isReload)
+                    url?.let {
+                        currentUrl = it
+                        onUrlChange(it)
+                    }
                 }
 
                 override fun shouldOverrideUrlLoading(