From 04c8bdc8af8fa2009504d64ffc50776c9e029470 Mon Sep 17 00:00:00 2001
From: maxli <maxli@tencent.com>
Date: Thu, 11 Aug 2022 12:42:14 +0800
Subject: [PATCH] fix(android): set init complete after bridge ready

---
 .../hippy/bridge/HippyBridgeManagerImpl.java    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/android/sdk/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManagerImpl.java b/android/sdk/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManagerImpl.java
index 8938b6b9e..71c4c8580 100644
--- a/android/sdk/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManagerImpl.java
+++ b/android/sdk/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManagerImpl.java
@@ -275,39 +275,40 @@ public class HippyBridgeManagerImpl implements HippyBridgeManager, HippyBridge.B
                                     String info =
                                             "initJSBridge error: result=" + result + ", reason="
                                                     + reason;
-                                    reportException(new Throwable(info));
+                                    RuntimeException exception = new RuntimeException(info);
+                                    if (callback != null) {
+                                        callback.callback(false, exception);
+                                    }
+                                    return;
                                 }
-
                                 if (enableTurbo()) {
                                     mTurboModuleManager = new TurboModuleManager(mContext);
                                     mTurboModuleManager.install(mHippyBridge.getV8RuntimeId());
                                 }
-
                                 if (mThirdPartyAdapter != null) {
                                     mThirdPartyAdapter.onRuntimeInit(mHippyBridge.getV8RuntimeId());
                                 }
                                 mContext.getStartTimeMonitor()
                                         .startEvent(
                                                 HippyEngineMonitorEvent.ENGINE_LOAD_EVENT_LOAD_COMMONJS);
-
+                                mIsInit = true;
                                 if (mCoreBundleLoader != null) {
                                     mCoreBundleLoader
                                             .load(mHippyBridge, new NativeCallback(mHandler) {
                                                 @Override
                                                 public void Call(long result, Message message,
                                                         String action, String reason) {
-                                                    mIsInit = result == 0;
                                                     RuntimeException exception = null;
-                                                    if (!mIsInit) {
+                                                    boolean ret = (result == 0);
+                                                    if (!ret) {
                                                         exception = new RuntimeException(
                                                                 "load coreJsBundle failed, check your core jsBundle:"
                                                                         + reason);
                                                     }
-                                                    callback.callback(mIsInit, exception);
+                                                    callback.callback(ret, exception);
                                                 }
                                             });
                                 } else {
-                                    mIsInit = true;
                                     callback.callback(mIsInit, null);
                                 }
                             }