From 3a4c3ae3931a780109c121b02aa69d3d701502d8 Mon Sep 17 00:00:00 2001
From: Tom Sassen <tom.sassen@x-center.com>
Date: Sun, 14 Jan 2024 08:00:52 +0100
Subject: [PATCH] Add way to add multiple load handlers to CefClient, instead
 of only allowing one load handler.

---
 java/org/cef/CefClient.java                   | 30 +++++++-----
 .../cef/handler/CefLoadHandlerCollection.java | 46 +++++++++++++++++++
 2 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 java/org/cef/handler/CefLoadHandlerCollection.java

diff --git a/java/org/cef/CefClient.java b/java/org/cef/CefClient.java
index 90122936..eb264e29 100644
--- a/java/org/cef/CefClient.java
+++ b/java/org/cef/CefClient.java
@@ -28,6 +28,7 @@
 import org.cef.handler.CefKeyboardHandler;
 import org.cef.handler.CefLifeSpanHandler;
 import org.cef.handler.CefLoadHandler;
+import org.cef.handler.CefLoadHandlerCollection;
 import org.cef.handler.CefPrintHandler;
 import org.cef.handler.CefRenderHandler;
 import org.cef.handler.CefRequestHandler;
@@ -78,7 +79,7 @@ public class CefClient extends CefClientHandler
     private CefJSDialogHandler jsDialogHandler_ = null;
     private CefKeyboardHandler keyboardHandler_ = null;
     private CefLifeSpanHandler lifeSpanHandler_ = null;
-    private CefLoadHandler loadHandler_ = null;
+    private CefLoadHandlerCollection loadHandlers_ = null;
     private CefPrintHandler printHandler_ = null;
     private CefRequestHandler requestHandler_ = null;
     private boolean isDisposed_ = false;
@@ -616,38 +617,45 @@ private void cleanupBrowser(int identifier) {
     // CefLoadHandler
 
     public CefClient addLoadHandler(CefLoadHandler handler) {
-        if (loadHandler_ == null) loadHandler_ = handler;
+        if (loadHandlers_ == null) loadHandlers_ = new CefLoadHandlerCollection();
+        loadHandlers_.add(handler);
         return this;
     }
 
     public void removeLoadHandler() {
-        loadHandler_ = null;
+        loadHandlers_ = null;
+    }
+    
+    @Override
+    public void removeLoadHandler(CefLoadHandler handler) {
+        if(loadHandlers_ == null) return;
+        loadHandlers_.remove(handler);
     }
 
     @Override
     public void onLoadingStateChange(
             CefBrowser browser, boolean isLoading, boolean canGoBack, boolean canGoForward) {
-        if (loadHandler_ != null && browser != null)
-            loadHandler_.onLoadingStateChange(browser, isLoading, canGoBack, canGoForward);
+        if (loadHandlers_ != null && browser != null)
+            loadHandlers_.onLoadingStateChange(browser, isLoading, canGoBack, canGoForward);
     }
 
     @Override
     public void onLoadStart(CefBrowser browser, CefFrame frame, TransitionType transitionType) {
-        if (loadHandler_ != null && browser != null)
-            loadHandler_.onLoadStart(browser, frame, transitionType);
+        if (loadHandlers_ != null && browser != null)
+            loadHandlers_.onLoadStart(browser, frame, transitionType);
     }
 
     @Override
     public void onLoadEnd(CefBrowser browser, CefFrame frame, int httpStatusCode) {
-        if (loadHandler_ != null && browser != null)
-            loadHandler_.onLoadEnd(browser, frame, httpStatusCode);
+        if (loadHandlers_ != null && browser != null)
+            loadHandlers_.onLoadEnd(browser, frame, httpStatusCode);
     }
 
     @Override
     public void onLoadError(CefBrowser browser, CefFrame frame, ErrorCode errorCode,
             String errorText, String failedUrl) {
-        if (loadHandler_ != null && browser != null)
-            loadHandler_.onLoadError(browser, frame, errorCode, errorText, failedUrl);
+        if (loadHandlers_ != null && browser != null)
+            loadHandlers_.onLoadError(browser, frame, errorCode, errorText, failedUrl);
     }
 
     // CefPrintHandler
diff --git a/java/org/cef/handler/CefLoadHandlerCollection.java b/java/org/cef/handler/CefLoadHandlerCollection.java
new file mode 100644
index 00000000..25f14630
--- /dev/null
+++ b/java/org/cef/handler/CefLoadHandlerCollection.java
@@ -0,0 +1,46 @@
+// Copyright (c) 2014 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+
+package org.cef.handler;
+
+import org.cef.browser.CefBrowser;
+import org.cef.browser.CefFrame;
+import org.cef.network.CefRequest;
+
+import java.util.ArrayList;
+
+/**
+ * Convenience class to handle multiple load handlers. 
+ */
+public class CefLoadHandlerCollection extends ArrayList<CefLoadHandler> implements CefLoadHandler {
+        
+    @Override
+    public void onLoadingStateChange(CefBrowser browser, boolean isLoading, boolean canGoBack, boolean canGoForward) {
+        for(CefLoadHandler handler:this){
+            handler.onLoadingStateChange(browser, isLoading, canGoBack, canGoForward);
+        }
+    }
+
+    @Override
+    public void onLoadStart(CefBrowser browser, CefFrame frame, CefRequest.TransitionType transitionType) {
+        for(CefLoadHandler handler:this){
+            handler.onLoadStart(browser, frame, transitionType);
+        }
+    }
+
+    @Override
+    public void onLoadEnd(CefBrowser browser, CefFrame frame, int httpStatusCode) {
+        for(CefLoadHandler handler:this){
+            handler.onLoadEnd(browser, frame, httpStatusCode);
+        }
+    }
+
+    @Override
+    public void onLoadError(CefBrowser browser, CefFrame frame, ErrorCode errorCode, String errorText, String failedUrl) {
+        for(CefLoadHandler handler:this){
+            handler.onLoadError(browser, frame, errorCode, errorText, failedUrl);
+        }
+    }
+    
+}