jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't die when flipper isn't initialized and a plugin is used

Browse Source 
Summary: This diff makes sure that the app doesn't die, or dies in a meaningful way if things are misconfigured.

Reviewed By: passy

Differential Revision: D19468273

fbshipit-source-id: 2471c263391906113446af57d795d1199eb1730e
This commit is contained in:
Michel Weststrate
2020-01-23 07:09:51 -08:00
committed by Facebook Github Bot
parent 0fa0899299
commit e306aeb010
4 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperModule.java
View File

@@ -7,6 +7,7 @@
package com.facebook.flipper.reactnative;
import com.facebook.react.bridge.Callback;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;
@@ -40,8 +41,9 @@ public class FlipperModule extends ReactContextBaseJavaModule {
}
@ReactMethod
public void registerPlugin(final String pluginId, final Boolean inBackground) {
this.manager.registerPlugin(this, pluginId, inBackground);
public void registerPlugin(
final String pluginId, final Boolean inBackground, final Callback statusCallback) {
this.manager.registerPlugin(this, pluginId, inBackground, statusCallback);
}
@ReactMethod

13
react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPluginManager.java
View File

@@ -12,6 +12,7 @@ import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.FlipperClient;
import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.FlipperResponder;
import com.facebook.react.bridge.Callback;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
@@ -51,7 +52,15 @@ public class FlipperReactNativeJavaScriptPluginManager {
}
public void registerPlugin(
FlipperModule module, final String pluginId, final Boolean inBackground) {
FlipperModule module,
final String pluginId,
final Boolean inBackground,
final Callback statusCallback) {
if (this.flipperClient == null) {
// Flipper is not available in this build
statusCallback.invoke("noflipper");
return;
}
FlipperReactNativeJavaScriptPlugin existing = getPlugin(pluginId);
if (existing != null) {
// Make sure events are emitted on the right application context
@@ -60,6 +69,7 @@ public class FlipperReactNativeJavaScriptPluginManager {
if (existing.isConnected()) {
existing.fireOnConnect();
}
statusCallback.invoke("ok");
return;
}
// we always create a new plugin class on the fly,
@@ -69,6 +79,7 @@ public class FlipperReactNativeJavaScriptPluginManager {
// inner class with no new members
};
this.flipperClient.addPlugin(plugin);
statusCallback.invoke("ok");
}
public void send(String pluginId, String method, String data) {