diff --git a/app/src/main/java/io/lbry/browser/MainActivity.java b/app/src/main/java/io/lbry/browser/MainActivity.java index f5281a1..f5b0d6f 100644 --- a/app/src/main/java/io/lbry/browser/MainActivity.java +++ b/app/src/main/java/io/lbry/browser/MainActivity.java @@ -106,9 +106,9 @@ public class MainActivity extends FragmentActivity implements DefaultHardwareBac */ private boolean serviceRunning; private CheckSdkReadyTask checkSdkReadyTask; - private boolean lbrySdkReady; private boolean receivedStopService; private PermissionListener permissionListener; + public static boolean lbrySdkReady; protected String getMainComponentName() { return "LBRYApp"; diff --git a/app/src/main/java/io/lbry/browser/reactmodules/FirebaseModule.java b/app/src/main/java/io/lbry/browser/reactmodules/FirebaseModule.java index f23aa8e..74dfe9c 100644 --- a/app/src/main/java/io/lbry/browser/reactmodules/FirebaseModule.java +++ b/app/src/main/java/io/lbry/browser/reactmodules/FirebaseModule.java @@ -77,8 +77,8 @@ public class FirebaseModule extends ReactContextBaseJavaModule { @ReactMethod public void logException(boolean fatal, String message, String error) { Bundle bundle = new Bundle(); - bundle.putString("message", message); - bundle.putString("error", error); + bundle.putString("exception_message", message); + bundle.putString("exception_error", error); if (firebaseAnalytics != null) { firebaseAnalytics.logEvent(fatal ? "reactjs_exception" : "reactjs_warning", bundle); } diff --git a/app/src/main/java/io/lbry/browser/reactmodules/UtilityModule.java b/app/src/main/java/io/lbry/browser/reactmodules/UtilityModule.java index d008170..aac2e99 100644 --- a/app/src/main/java/io/lbry/browser/reactmodules/UtilityModule.java +++ b/app/src/main/java/io/lbry/browser/reactmodules/UtilityModule.java @@ -23,10 +23,12 @@ import android.view.WindowManager; import com.facebook.react.bridge.Callback; import com.facebook.react.bridge.Promise; import com.facebook.react.bridge.ReactApplicationContext; +import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactMethod; import com.facebook.react.common.MapBuilder; +import com.facebook.react.modules.core.DeviceEventManagerModule; import com.squareup.picasso.Picasso; import java.io.File; @@ -509,6 +511,15 @@ public class UtilityModule extends ReactContextBaseJavaModule { promise.resolve(platform); } + @ReactMethod + public void checkSdkReady() { + // check that the sdk ready when the service is already running so that we can send the ready event + ReactContext reactContext = (ReactContext) context; + if (MainActivity.lbrySdkReady && reactContext != null) { + reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit("onSdkReady", null); + } + } + @ReactMethod public void log(String tag, String message) { android.util.Log.d(tag, message);