codeplay-common 4.9.3 → 4.9.4

package/files/buildCodeplay/codeplayBeforeBuild-6.4.js

@@ -1,3 +1,4 @@
+// Version 6.5: recreate failed WebViews, defer background recovery, and suppress foreground recovery toasts.
 const fs = require('fs');
 const path = require('path');
 const plist = require('plist');
@@ -1191,6 +1192,8 @@ if (!fs.existsSync(bridgeWebViewClientFilePath)) {
 }
 
 let fileContent = fs.readFileSync(bridgeWebViewClientFilePath, 'utf8');
+const bridgeWebViewLineEnding = fileContent.includes('\r\n') ? '\r\n' : '\n';
+fileContent = fileContent.replace(/\r\n/g, '\n');
 
 // Define old and new code
 const oldCodeStart = `@Override
@@ -1208,7 +1211,8 @@ const oldCodeStart = `@Override
         return result;
     }`;
 
-const newCode = `@Override
+// Match the previous patch so existing projects migrate without reinstalling Capacitor.
+const legacyReloadCode = `@Override
     public boolean onRenderProcessGone(WebView view, RenderProcessGoneDetail detail) {
         super.onRenderProcessGone(view, detail);
 
@@ -1244,15 +1248,104 @@ const newCode = `@Override
         return result;
     }`;
 
-// Step 1: Update method if needed
+const newCode = `// Codeplay WebView renderer recovery (before-build 6.5).
+    private boolean codeplayRendererRecoveryPending = false;
+    private static long codeplayRendererRecoveryWindowStart = -1L;
+    private static int codeplayRendererRecoveryCount = 0;
+
+    @Override
+    public boolean onRenderProcessGone(WebView view, RenderProcessGoneDetail detail) {
+        if (codeplayRendererRecoveryPending) return true;
+
+        boolean handled = false;
+        List<WebViewListener> webViewListeners = bridge.getWebViewListeners();
+        if (webViewListeners != null) {
+            for (WebViewListener listener : webViewListeners) {
+                handled = listener.onRenderProcessGone(view, detail) || handled;
+            }
+        }
+        if (handled) return true;
+
+        codeplayRendererRecoveryPending = true;
+        final androidx.appcompat.app.AppCompatActivity activity = bridge.getActivity();
+        final boolean wasInForeground = activity != null && activity.getLifecycle()
+            .getCurrentState().isAtLeast(androidx.lifecycle.Lifecycle.State.STARTED);
+
+        // A terminated renderer's WebView must never be loaded or reloaded again.
+        if (view.getParent() instanceof android.view.ViewGroup) {
+            ((android.view.ViewGroup) view.getParent()).removeView(view);
+        }
+        view.destroy();
+
+        if (activity == null || activity.isFinishing() || activity.isDestroyed()) return true;
+
+        final android.os.Handler mainHandler = new android.os.Handler(android.os.Looper.getMainLooper());
+        final Runnable recover = () -> {
+            if (activity.isFinishing() || activity.isDestroyed()) return;
+
+            // Static counters survive Activity recreation and prevent an automatic restart loop.
+            long now = android.os.SystemClock.elapsedRealtime();
+            if (codeplayRendererRecoveryWindowStart < 0L ||
+                now - codeplayRendererRecoveryWindowStart >= 60000L) {
+                codeplayRendererRecoveryWindowStart = now;
+                codeplayRendererRecoveryCount = 0;
+            }
+
+            if (codeplayRendererRecoveryCount >= 3) {
+                new android.app.AlertDialog.Builder(activity)
+                    .setTitle("Unable to restore the app")
+                    .setMessage("The app could not recover automatically. Please try again.")
+                    .setCancelable(false)
+                    .setPositiveButton("Try again", (dialog, which) -> {
+                        codeplayRendererRecoveryWindowStart = -1L;
+                        codeplayRendererRecoveryCount = 0;
+                        if (!activity.isFinishing() && !activity.isDestroyed()) activity.recreate();
+                    })
+                    .setNegativeButton("Close", (dialog, which) -> activity.finish())
+                    .show();
+                return;
+            }
+
+            codeplayRendererRecoveryCount++;
+            if (!wasInForeground) {
+                Toast.makeText(activity.getApplicationContext(), "Restoring your app…", Toast.LENGTH_SHORT).show();
+            }
+            activity.recreate();
+        };
+
+        if (wasInForeground) {
+            mainHandler.post(recover);
+        } else {
+            // Do not allocate another renderer while the app is hidden and memory may still be low.
+            activity.getLifecycle().addObserver(new androidx.lifecycle.LifecycleEventObserver() {
+                @Override
+                public void onStateChanged(
+                    androidx.lifecycle.LifecycleOwner source,
+                    androidx.lifecycle.Lifecycle.Event event
+                ) {
+                    if (event == androidx.lifecycle.Lifecycle.Event.ON_RESUME) {
+                        source.getLifecycle().removeObserver(this);
+                        mainHandler.post(recover);
+                    } else if (event == androidx.lifecycle.Lifecycle.Event.ON_DESTROY) {
+                        source.getLifecycle().removeObserver(this);
+                    }
+                }
+            });
+        }
+        return true;
+    }`;
+
+// Step 1: Update the stock method or migrate the previous reload-based patch.
 let updated = false;
 
-if (fileContent.includes(oldCodeStart)) {
-  console.log('✅ Found old onRenderProcessGone method. Replacing it...');
+if (fileContent.includes(newCode)) {
+  console.log('ℹ️  Method already updated. No changes needed in "BridgeWebViewClient.java".');
+} else if (fileContent.includes(legacyReloadCode)) {
+  fileContent = fileContent.replace(legacyReloadCode, newCode);
+  updated = true;
+} else if (fileContent.includes(oldCodeStart)) {
   fileContent = fileContent.replace(oldCodeStart, newCode);
   updated = true;
-} else if (fileContent.includes(newCode)) {
-  console.log('ℹ️  Method already updated. No changes needed in "BridgeWebViewClient.java".');
 } else {
   console.error('❌ Error: Neither old nor new code found. Unexpected content.');
   process.exit(1);
@@ -1280,7 +1373,7 @@ if (!fileContent.includes(importToast)) {
 
 // Step 3: Save if updated
 if (updated) {
-  fs.writeFileSync(bridgeWebViewClientFilePath, fileContent, 'utf8');
+  fs.writeFileSync(bridgeWebViewClientFilePath, fileContent.replace(/\n/g, bridgeWebViewLineEnding), 'utf8');
   console.log('✅ File updated successfully.');
 } else {
   console.log('ℹ️  No changes needed.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeplay-common",
-  "version": "4.9.3",
+  "version": "4.9.4",
   "description": "Common build scripts and files",
   "scripts": {
 	"postinstall": "node scripts/sync-files.js",