status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

don't call OnBatchComplete on specific modules unless we need to 

Summary:
Don't call OnBatchComplete on NativeModules that have'nt been initialized.
Also a follow up to D4479604. This also removes the extra allocation of OnBatchCompleteListener per NativeModule that implements OnBatchCompleteListener.

This means NativeModules which implement OnBatchCompleteListener will have to be explicitly initialized or called into before the OnBatchCompleteListener of that NativeModule will be triggered.

Reviewed By: javache

Differential Revision: D4483682

fbshipit-source-id: 6a9431c82f72d17605d1c1e0ee9194f8d8fc2ddc
This commit is contained in:
Aaron Chiu 2017-02-09 22:16:14 -08:00 committed by Facebook Github Bot
parent 6a5225fb22
commit 53a7d5822b
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java
View File

@ -113,18 +113,10 @@ public class NativeModuleRegistryBuilder {
}
public NativeModuleRegistry build() {
ArrayList<OnBatchCompleteListener> batchCompleteListenerModules = new ArrayList<>();
ArrayList<ModuleHolder> batchCompleteListenerModules = new ArrayList<>();
for (Map.Entry<Class<? extends NativeModule>, ModuleHolder> entry : mModules.entrySet()) {
Class<? extends NativeModule> type = entry.getKey();
if (OnBatchCompleteListener.class.isAssignableFrom(type)) {
final ModuleHolder moduleHolder = entry.getValue();
batchCompleteListenerModules.add(new OnBatchCompleteListener() {
@Override
public void onBatchComplete() {
OnBatchCompleteListener listener = (OnBatchCompleteListener) moduleHolder.getModule();
listener.onBatchComplete();
}
});
if (OnBatchCompleteListener.class.isAssignableFrom(entry.getKey())) {
batchCompleteListenerModules.add(entry.getValue());
}
}

4
ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ModuleHolder.java
View File

@ -67,6 +67,10 @@ public class ModuleHolder {
}
}
public synchronized boolean isInitialized() {
return mModule != null;
}
public synchronized void destroy() {
if (mModule != null) {
mModule.onCatalystInstanceDestroy();

11
ReactAndroid/src/main/java/com/facebook/react/cxxbridge/NativeModuleRegistry.java
View File

@ -15,7 +15,6 @@ import java.util.List;
import java.util.Map;
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.BaseJavaModule;
import com.facebook.react.bridge.NativeModule;
import com.facebook.react.bridge.OnBatchCompleteListener;
import com.facebook.react.bridge.ReactMarker;
@ -28,11 +27,11 @@ import com.facebook.systrace.Systrace;
public class NativeModuleRegistry {
private final Map<Class<? extends NativeModule>, ModuleHolder> mModules;
private final ArrayList<OnBatchCompleteListener> mBatchCompleteListenerModules;
private final ArrayList<ModuleHolder> mBatchCompleteListenerModules;
public NativeModuleRegistry(
Map<Class<? extends NativeModule>, ModuleHolder> modules,
ArrayList<OnBatchCompleteListener> batchCompleteListenerModules) {
ArrayList<ModuleHolder> batchCompleteListenerModules) {
mModules = modules;
mBatchCompleteListenerModules = batchCompleteListenerModules;
}
@ -92,8 +91,10 @@ public class NativeModuleRegistry {
}
public void onBatchComplete() {
for (int i = 0; i < mBatchCompleteListenerModules.size(); i++) {
mBatchCompleteListenerModules.get(i).onBatchComplete();
for (ModuleHolder moduleHolder : mBatchCompleteListenerModules) {
if (moduleHolder.isInitialized()) {
((OnBatchCompleteListener) moduleHolder.getModule()).onBatchComplete();
}
}
}