From f804c7bad4fe681dc2e748e381bb2c1ee6f9e25e Mon Sep 17 00:00:00 2001
From: Szymon Stasik <ciekawy@gmail.com>
Date: Sat, 14 Oct 2023 18:05:56 +0200
Subject: [PATCH 1/3] fix #6615

---
 android/capacitor/src/main/assets/native-bridge.js | 12 ++++++------
 core/native-bridge.ts                              | 14 +++++++-------
 ios/Capacitor/Capacitor/assets/native-bridge.js    | 12 ++++++------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/android/capacitor/src/main/assets/native-bridge.js b/android/capacitor/src/main/assets/native-bridge.js
index 58d694077e..9c64f44ca2 100644
--- a/android/capacitor/src/main/assets/native-bridge.js
+++ b/android/capacitor/src/main/assets/native-bridge.js
@@ -311,15 +311,15 @@ var nativeBridge = (function (exports) {
                     typeof c.dir === 'function');
             };
             const serializeConsoleMessage = (msg) => {
-                if (typeof msg === 'object') {
-                    try {
+                try {
+                    if (typeof msg === 'object') {
                         msg = JSON.stringify(msg);
                     }
-                    catch (e) {
-                        // ignore
-                    }
+                    return String(msg);
+                }
+                catch (e) {
+                    return '??';
                 }
-                return String(msg);
             };
             const platform = getPlatformId(win);
             if (platform == 'android' || platform == 'ios') {
diff --git a/core/native-bridge.ts b/core/native-bridge.ts
index fc466eac76..dcd8807a23 100644
--- a/core/native-bridge.ts
+++ b/core/native-bridge.ts
@@ -336,15 +336,15 @@ const initBridge = (w: any): void => {
     };
 
     const serializeConsoleMessage = (msg: any): string => {
-      if (typeof msg === 'object') {
-        try {
-          msg = JSON.stringify(msg);
-        } catch (e) {
-          // ignore
+      try {
+        if (typeof msg === 'object') {
+            msg = JSON.stringify(msg);
         }
+        return String(msg);
+      }
+      catch (e) {
+        return '??';
       }
-
-      return String(msg);
     };
 
     const platform = getPlatformId(win);
diff --git a/ios/Capacitor/Capacitor/assets/native-bridge.js b/ios/Capacitor/Capacitor/assets/native-bridge.js
index 58d694077e..9c64f44ca2 100644
--- a/ios/Capacitor/Capacitor/assets/native-bridge.js
+++ b/ios/Capacitor/Capacitor/assets/native-bridge.js
@@ -311,15 +311,15 @@ var nativeBridge = (function (exports) {
                     typeof c.dir === 'function');
             };
             const serializeConsoleMessage = (msg) => {
-                if (typeof msg === 'object') {
-                    try {
+                try {
+                    if (typeof msg === 'object') {
                         msg = JSON.stringify(msg);
                     }
-                    catch (e) {
-                        // ignore
-                    }
+                    return String(msg);
+                }
+                catch (e) {
+                    return '??';
                 }
-                return String(msg);
             };
             const platform = getPlatformId(win);
             if (platform == 'android' || platform == 'ios') {

From ef6eda9cf4b94bc5887a8fe6bdd33d4af2f8bffb Mon Sep 17 00:00:00 2001
From: Szymon Stasik <ciekawy@gmail.com>
Date: Thu, 7 Mar 2024 16:16:52 +0100
Subject: [PATCH 2/3] fmt

---
 core/native-bridge.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/native-bridge.ts b/core/native-bridge.ts
index d4e77bdbfc..187d0b9d47 100644
--- a/core/native-bridge.ts
+++ b/core/native-bridge.ts
@@ -410,11 +410,10 @@ const initBridge = (w: any): void => {
     const serializeConsoleMessage = (msg: any): string => {
       try {
         if (typeof msg === 'object') {
-            msg = JSON.stringify(msg);
+          msg = JSON.stringify(msg);
         }
         return String(msg);
-      }
-      catch (e) {
+      } catch (e) {
         return '??';
       }
     };

From 434f9a4ae164e15e0ce524a9e42aeac8dee00775 Mon Sep 17 00:00:00 2001
From: Szymon Stasik <ciekawy@gmail.com>
Date: Thu, 7 Mar 2024 16:35:05 +0100
Subject: [PATCH 3/3] return empty string for non serializable objects

---
 android/capacitor/src/main/assets/native-bridge.js | 2 +-
 core/native-bridge.ts                              | 2 +-
 ios/Capacitor/Capacitor/assets/native-bridge.js    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/capacitor/src/main/assets/native-bridge.js b/android/capacitor/src/main/assets/native-bridge.js
index 39a29b55eb..8c3104e738 100644
--- a/android/capacitor/src/main/assets/native-bridge.js
+++ b/android/capacitor/src/main/assets/native-bridge.js
@@ -386,7 +386,7 @@ var nativeBridge = (function (exports) {
                     return String(msg);
                 }
                 catch (e) {
-                    return '??';
+                    return '';
                 }
             };
             const platform = getPlatformId(win);
diff --git a/core/native-bridge.ts b/core/native-bridge.ts
index 187d0b9d47..96c86ca3b7 100644
--- a/core/native-bridge.ts
+++ b/core/native-bridge.ts
@@ -414,7 +414,7 @@ const initBridge = (w: any): void => {
         }
         return String(msg);
       } catch (e) {
-        return '??';
+        return '';
       }
     };
 
diff --git a/ios/Capacitor/Capacitor/assets/native-bridge.js b/ios/Capacitor/Capacitor/assets/native-bridge.js
index 39a29b55eb..8c3104e738 100644
--- a/ios/Capacitor/Capacitor/assets/native-bridge.js
+++ b/ios/Capacitor/Capacitor/assets/native-bridge.js
@@ -386,7 +386,7 @@ var nativeBridge = (function (exports) {
                     return String(msg);
                 }
                 catch (e) {
-                    return '??';
+                    return '';
                 }
             };
             const platform = getPlatformId(win);