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

Cleanup 3/n

Browse Source 
Summary: Same treatment for FlipperReactNativeJavaScriptPlugin.

Reviewed By: mweststrate

Differential Revision: D19471257

fbshipit-source-id: b51d92074ae411c089f0010057f2b61ef6500de0
This commit is contained in:
Pascal Hartig
2020-01-24 06:58:38 -08:00
committed by Facebook Github Bot
parent 4e77b37831
commit 2ec539acb1
2 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
react-native/react-native-flipper/android/src/main/java/com/facebook/flipper/reactnative/FlipperReactNativeJavaScriptPlugin.java
View File

@@ -26,63 +26,61 @@ import com.facebook.react.bridge.WritableMap;
* to the Flipper Desktop client. * to the Flipper Desktop client.
*/ */
public abstract class FlipperReactNativeJavaScriptPlugin implements FlipperPlugin { public abstract class FlipperReactNativeJavaScriptPlugin implements FlipperPlugin {
String pluginId; private final String mPluginId;
boolean inBackground; private final boolean mInBackground;
FlipperConnection connection; private FlipperConnection mConnection;
FlipperModule module; private FlipperModule mModule;
public FlipperReactNativeJavaScriptPlugin( FlipperReactNativeJavaScriptPlugin(FlipperModule module, String pluginId, boolean inBackground) {
FlipperModule module, String pluginId, boolean inBackground) { mPluginId = pluginId;
this.pluginId = pluginId; mModule = module;
this.module = module; mInBackground = inBackground;
this.inBackground = inBackground;
this.module = module;
} }
@Override @Override
public String getId() { public String getId() {
return pluginId; return mPluginId;
} }
@Override @Override
public void onConnect(FlipperConnection connection) throws Exception { public void onConnect(FlipperConnection connection) {
this.connection = connection; mConnection = connection;
this.fireOnConnect(); fireOnConnect();
} }
public void fireOnConnect() { void fireOnConnect() {
if (!isConnected()) { if (!isConnected()) {
throw new RuntimeException("Plugin not connected " + pluginId); throw new RuntimeException("Plugin not connected " + mPluginId);
} }
this.module.sendJSEvent("react-native-flipper-plugin-connect", getPluginParams()); mModule.sendJSEvent("react-native-flipper-plugin-connect", getPluginParams());
} }
@Override @Override
public void onDisconnect() { public void onDisconnect() {
this.module.sendJSEvent("react-native-flipper-plugin-disconnect", getPluginParams()); mModule.sendJSEvent("react-native-flipper-plugin-disconnect", getPluginParams());
this.connection = null; mConnection = null;
} }
@Override @Override
public boolean runInBackground() { public boolean runInBackground() {
return inBackground; return mInBackground;
} }
public boolean isConnected() { boolean isConnected() {
return connection != null; return mConnection != null;
} }
public FlipperConnection getConnection() { FlipperConnection getConnection() {
return connection; return mConnection;
} }
public void setModule(FlipperModule module) { void setModule(FlipperModule module) {
this.module = module; mModule = module;
} }
WritableMap getPluginParams() { private WritableMap getPluginParams() {
WritableMap params = Arguments.createMap(); final WritableMap params = Arguments.createMap();
params.putString("plugin", pluginId); params.putString("plugin", mPluginId);
return params; return params;
} }
} }

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

@@ -56,7 +56,7 @@ final class FlipperReactNativeJavaScriptPluginManager {
final String pluginId, final String pluginId,
final Boolean inBackground, final Boolean inBackground,
final Callback statusCallback) { final Callback statusCallback) {
if (this.flipperClient == null) { if (mFlipperClient == null) {
// Flipper is not available in this build // Flipper is not available in this build
statusCallback.invoke("noflipper"); statusCallback.invoke("noflipper");
return; return;