diff options
Diffstat (limited to 'app/src/main/java/dev')
| -rw-r--r-- | app/src/main/java/dev/tablaster/dashpanel/MainActivity.kt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/src/main/java/dev/tablaster/dashpanel/MainActivity.kt b/app/src/main/java/dev/tablaster/dashpanel/MainActivity.kt index e575f36..a746fd8 100644 --- a/app/src/main/java/dev/tablaster/dashpanel/MainActivity.kt +++ b/app/src/main/java/dev/tablaster/dashpanel/MainActivity.kt @@ -117,9 +117,14 @@ class MainActivity : AppCompatActivity() { } if (hardwareAcceleration) webView.setLayerType(View.LAYER_TYPE_HARDWARE, null) - val currentUrl = webView.url - val currentOrigin = currentUrl?.toUri()?.origin() - val targetOrigin = url.toUri().origin() + val currentUri = webView.url?.toUri() + val targetUri = url.toUri() + + val currentOrigin = currentUri?.let { + "${it.scheme}://${it.host}:${it.port.takeIf { p -> p != -1 } ?: it.defaultPortForScheme()}" + } + val targetOrigin = "${targetUri.scheme}://${targetUri.host}:${targetUri.port.takeIf { p -> p != -1 } ?: targetUri.defaultPortForScheme()}" + if (currentOrigin != targetOrigin) { Log.d(TAG, "WebView origin changed: $currentOrigin -> $targetOrigin. Reloading.") webView.loadUrl(url) |