@capgo/capacitor-updater 7.8.3 → 7.8.5

package/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java

@@ -59,7 +59,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String statsUrlDefault = "https://plugin.capgo.app/stats";
     private static final String channelUrlDefault = "https://plugin.capgo.app/channel_self";
 
-    private final String PLUGIN_VERSION = "7.8.3";
+    private final String PLUGIN_VERSION = "7.8.5";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -314,8 +314,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
                     PluginCall call = new PluginCall(
                         (com.getcapacitor.MessageHandler) msgHandler,
-                        "autoHideSplashscreen",
-                        PluginCall.CALLBACK_ID_DANGLING,
+                        "SplashScreen",
+                        "FAKE_CALLBACK_ID_HIDE",
                         "hide",
                         options
                     );
@@ -340,39 +340,52 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
     private void showSplashscreen() {
         try {
-            // Try to call the SplashScreen plugin directly through the bridge
+            // Show splashscreen immediately and synchronously when backgrounding
+            if (getBridge() == null) {
+                logger.warn("Bridge not ready for showing splashscreen with autoSplashscreen");
+                return;
+            }
+
+            // Execute immediately on current thread if it's main, otherwise post to main thread
+            if (android.os.Looper.myLooper() == android.os.Looper.getMainLooper()) {
+                showSplashscreenNow();
+            } else {
+                // Use runOnUiThread for immediate execution on main thread
+                if (getActivity() != null) {
+                    getActivity().runOnUiThread(() -> showSplashscreenNow());
+                } else {
+                    new android.os.Handler(android.os.Looper.getMainLooper()).post(() -> showSplashscreenNow());
+                }
+            }
+        } catch (Exception e) {
+            logger.error("Error showing splashscreen when backgrounding: " + e.getMessage());
+        }
+    }
+
+    private void showSplashscreenNow() {
+        try {
             PluginHandle splashScreenPlugin = getBridge().getPlugin("SplashScreen");
             if (splashScreenPlugin != null) {
-                try {
-                    // Create a plugin call for the show method using reflection to access private msgHandler
-                    JSObject options = new JSObject();
-                    java.lang.reflect.Field msgHandlerField = getBridge().getClass().getDeclaredField("msgHandler");
-                    msgHandlerField.setAccessible(true);
-                    Object msgHandler = msgHandlerField.get(getBridge());
-
-                    PluginCall call = new PluginCall(
-                        (com.getcapacitor.MessageHandler) msgHandler,
-                        "autoShowSplashscreen",
-                        PluginCall.CALLBACK_ID_DANGLING,
-                        "show",
-                        options
-                    );
+                JSObject options = new JSObject();
+                java.lang.reflect.Field msgHandlerField = getBridge().getClass().getDeclaredField("msgHandler");
+                msgHandlerField.setAccessible(true);
+                Object msgHandler = msgHandlerField.get(getBridge());
+
+                PluginCall call = new PluginCall(
+                    (com.getcapacitor.MessageHandler) msgHandler,
+                    "SplashScreen",
+                    "FAKE_CALLBACK_ID_SHOW",
+                    "show",
+                    options
+                );
 
-                    // Call the show method directly
-                    splashScreenPlugin.invoke("show", call);
-                    logger.info("Splashscreen shown automatically via direct plugin call");
-                } catch (Exception e) {
-                    logger.error("Failed to call SplashScreen show method: " + e.getMessage());
-                }
+                splashScreenPlugin.invoke("show", call);
+                logger.info("Splashscreen shown synchronously to prevent flash");
             } else {
-                logger.warn("autoSplashscreen: SplashScreen plugin not found. Install @capacitor/splash-screen plugin.");
+                logger.warn("autoSplashscreen: SplashScreen plugin not found");
             }
         } catch (Exception e) {
-            logger.error(
-                "Error showing splashscreen with autoSplashscreen: " +
-                e.getMessage() +
-                ". Make sure @capacitor/splash-screen plugin is installed and configured."
-            );
+            logger.error("Failed to show splashscreen synchronously: " + e.getMessage());
         }
     }
 
@@ -1519,6 +1532,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         CapacitorUpdaterPlugin.this.implementation.sendStats("app_moved_to_foreground", current.getVersionName());
         this.delayUpdateUtils.checkCancelDelay(DelayUpdateUtils.CancelDelaySource.FOREGROUND);
         this.delayUpdateUtils.unsetBackgroundTimestamp();
+
         if (
             CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() &&
             (this.backgroundDownloadTask == null || !this.backgroundDownloadTask.isAlive())
@@ -1533,10 +1547,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
     public void appMovedToBackground() {
         final BundleInfo current = CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
-        CapacitorUpdaterPlugin.this.implementation.sendStats("app_moved_to_background", current.getVersionName());
-        logger.info("Checking for pending update");
 
-        // Show splashscreen only if autoSplashscreen is enabled AND autoUpdate is enabled AND directUpdate would be used
+        // Show splashscreen FIRST, before any other background work to ensure launcher shows it
         if (this.autoSplashscreen) {
             boolean canShowSplashscreen = true;
 
@@ -1555,10 +1567,15 @@ public class CapacitorUpdaterPlugin extends Plugin {
             }
 
             if (canShowSplashscreen) {
+                logger.info("Showing splashscreen for launcher/task switcher");
                 this.showSplashscreen();
             }
         }
 
+        // Do other background work after splashscreen is shown
+        CapacitorUpdaterPlugin.this.implementation.sendStats("app_moved_to_background", current.getVersionName());
+        logger.info("Checking for pending update");
+
         try {
             // We need to set "backgrounded time"
             this.delayUpdateUtils.setBackgroundTimestamp(System.currentTimeMillis());

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -7,6 +7,42 @@
 import Foundation
 import Capacitor
 import Version
+import WebKit
+
+// Helper class to detect when WebView loading completes
+class WebViewLoadDelegate: NSObject, WKNavigationDelegate {
+    private let completion: (Bool) -> Void
+    private var hasCompleted = false
+    
+    init(completion: @escaping (Bool) -> Void) {
+        self.completion = completion
+        super.init()
+    }
+    
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        if !hasCompleted {
+            hasCompleted = true
+            webView.navigationDelegate = nil // Clean up
+            completion(true)
+        }
+    }
+    
+    func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
+        if !hasCompleted {
+            hasCompleted = true
+            webView.navigationDelegate = nil // Clean up
+            completion(false)
+        }
+    }
+    
+    func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
+        if !hasCompleted {
+            hasCompleted = true
+            webView.navigationDelegate = nil // Clean up
+            completion(false)
+        }
+    }
+}
 
 /**
  * Please read the Capacitor iOS Plugin Development Guide
@@ -50,7 +86,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isShakeMenuEnabled", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapgoUpdater()
-    private let PLUGIN_VERSION: String = "7.8.3"
+    private let PLUGIN_VERSION: String = "7.8.5"
     static let updateUrlDefault = "https://plugin.capgo.app/updates"
     static let statsUrlDefault = "https://plugin.capgo.app/stats"
     static let channelUrlDefault = "https://plugin.capgo.app/channel_self"
@@ -409,27 +445,62 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 logger.error("Cannot get capBridge")
                 return false
             }
+            
+            // Use semaphore to wait for WebView load completion
+            let loadSemaphore = DispatchSemaphore(value: 0)
+            var loadSuccess = false
+            
+            // Set up navigation delegate to detect when loading completes
+            let navigationDelegate = WebViewLoadDelegate { [weak self] success in
+                loadSuccess = success
+                if success {
+                    self?.checkAppReady()
+                    self?.notifyListeners("appReloaded", data: [:])
+                }
+                loadSemaphore.signal()
+            }
+            
             if keepUrlPathAfterReload {
                 DispatchQueue.main.async {
                     guard let url = vc.webView?.url else {
                         self.logger.error("vc.webView?.url is null?")
+                        loadSuccess = false
+                        loadSemaphore.signal()
                         return
                     }
                     capBridge.setServerBasePath(dest.path)
                     var urlComponents = URLComponents(url: capBridge.config.serverURL, resolvingAgainstBaseURL: false)!
                     urlComponents.path = url.path
                     if let finalUrl = urlComponents.url {
+                        vc.webView?.navigationDelegate = navigationDelegate
                         _ = vc.webView?.load(URLRequest(url: finalUrl))
+                    } else {
+                        loadSuccess = false
+                        loadSemaphore.signal()
                     }
                 }
             } else {
                 vc.setServerBasePath(path: dest.path)
-
+                // For setServerBasePath, we need to wait for the next page load
+                vc.webView?.navigationDelegate = navigationDelegate
+                // Trigger a reload to ensure the new path is loaded
+                DispatchQueue.main.async {
+                    vc.webView?.reload()
+                }
             }
-
-            self.checkAppReady()
-            self.notifyListeners("appReloaded", data: [:])
-            return true
+            
+            // Wait for load completion with timeout
+            let result = loadSemaphore.wait(timeout: .now() + 10) // 10 second timeout
+            
+            if result == .timedOut {
+                logger.error("Reload timed out after 10 seconds")
+                DispatchQueue.main.async {
+                    vc.webView?.navigationDelegate = nil // Clean up
+                }
+                return false
+            }
+            
+            return loadSuccess
         }
         return false
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "7.8.3",
+  "version": "7.8.5",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",