make sure second pane webview is used

plateaukao · Dec 14, 2021 · 4e903af · 4e903af
1 parent db96936
commit 4e903af
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt b/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt
@@ -1364,6 +1364,17 @@ open class BrowserActivity : ComponentActivity(), BrowserController, OnClickList
 
     }
 
+    override fun loadInSecondPane(url: String): Boolean =
+            if (config.twoPanelLinkHere &&
+                    isTwoPaneControllerInitialized() &&
+                    twoPaneController.isSecondPaneDisplayed()
+            ) {
+                toggleSplitScreen(url)
+                true
+            } else {
+                false
+            }
+
     private fun showContextMenuLinkDialog(url: String?, hitTestResult: HitTestResult) {
         if (url == null &&
                 !listOf(HitTestResult.IMAGE_TYPE, HitTestResult.IMAGE_ANCHOR_TYPE, HitTestResult.SRC_IMAGE_ANCHOR_TYPE, HitTestResult.ANCHOR_TYPE)

diff --git a/app/src/main/java/de/baumann/browser/browser/BrowserController.java b/app/src/main/java/de/baumann/browser/browser/BrowserController.java
@@ -20,4 +20,5 @@ public interface BrowserController {
     void addHistory(String url);
     boolean onHideCustomView();
     boolean handleKeyEvent(KeyEvent event);
+    boolean loadInSecondPane(String url);
 }
diff --git a/app/src/main/java/de/baumann/browser/view/NinjaWebView.kt b/app/src/main/java/de/baumann/browser/view/NinjaWebView.kt
@@ -238,12 +238,21 @@ class NinjaWebView : WebView, AlbumController, KoinComponent {
         }
     }
 
+    override fun loadUrl(url: String, additionalHttpHeaders: MutableMap<String, String>) {
+        if (browserController?.loadInSecondPane(url) == true) {
+            return
+        }
+
+        super.loadUrl(url, additionalHttpHeaders)
+    }
+
     @SuppressLint("SetJavaScriptEnabled")
     override fun loadUrl(url: String) {
         dTLoadUrl = DebugT("loadUrl")
         albumTitle = ""
 
-        if (url.trim { it <= ' ' }.isEmpty()) {
+        val processedUrl = url.trim { it <= ' ' }
+        if (processedUrl.isEmpty()) {
             NinjaToast.show(context, R.string.toast_load_error)
             return
         }
@@ -260,7 +269,11 @@ class NinjaWebView : WebView, AlbumController, KoinComponent {
             return
         }
 
-        super.loadUrl(BrowserUnit.queryWrapper(context, url.trim { it <= ' ' }), requestHeaders)
+        if (browserController?.loadInSecondPane(processedUrl) == true) {
+            return
+        }
+
+        super.loadUrl(BrowserUnit.queryWrapper(context, processedUrl), requestHeaders)
     }
 
     override fun getAlbumView(): View = album.albumView