Skip to content
This repository was archived by the owner on Sep 4, 2021. It is now read-only.

Updates for RN 0.35 #19

Open
drudge wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Updates for RN 0.35 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af19ead
Updates for RN 0.35
drudge Oct 14, 2016
1dad97c
Fix release bundle loader
drudge Oct 19, 2016
7dfd7f2
Guard against using reactContext when it is null
drudge Oct 19, 2016
d7cc150
Stop worker so it is removed from workers map once terminated
drudge Oct 23, 2016
41795eb
Clean up context checks
drudge Oct 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions android/src/main/java/co/apptailor/Worker/JSWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,29 @@ public void runFromContext(ReactApplicationContext context, ReactContextBuilder
}

public void postMessage(String message) {
reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
if (reactContext != null) {
reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
.emit("WorkerMessage", message);
}
}

public void onHostResume() {
reactContext.onHostResume(null);
if (reactContext != null) {
reactContext.onHostResume(null);
}
}

public void onHostPause() {
reactContext.onHostPause();
if (reactContext != null) {
reactContext.onHostPause();
}
}

public void terminate() {
if (reactContext == null) {
return;
if (reactContext != null) {
reactContext.onHostPause();
reactContext.destroy();
reactContext = null;
}

reactContext.onHostPause();
reactContext.destroy();
reactContext = null;
}
}
6 changes: 3 additions & 3 deletions android/src/main/java/co/apptailor/Worker/WorkerModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.facebook.react.ReactApplication;
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.ReactPackage;
import com.facebook.react.bridge.JSBundleLoader;
import com.facebook.react.cxxbridge.JSBundleLoader;
import com.facebook.react.bridge.LifecycleEventListener;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
Expand Down Expand Up @@ -149,7 +149,7 @@ public void onHostDestroy() {
@Override
public void run() {
for (int workerId : workers.keySet()) {
workers.get(workerId).terminate();
stopWorker(workerId);
}
}
});
Expand Down Expand Up @@ -177,7 +177,7 @@ private JSBundleLoader createDevBundleLoader(String jsFileName, String jsFileSlu

private JSBundleLoader createReleaseBundleLoader(String jsFileName, String jsFileSlug) {
Log.d(TAG, "createReleaseBundleLoader - reading file from assets");
return JSBundleLoader.createFileLoader(getReactApplicationContext(), "assets://workers/" + jsFileSlug + ".bundle");
return JSBundleLoader.createAssetLoader(getReactApplicationContext(), "assets://workers/" + jsFileSlug + ".bundle");
}

private ReactInstanceManager getReactInstanceManager() {
Expand Down
12 changes: 6 additions & 6 deletions android/src/main/java/co/apptailor/Worker/core/ReactContextBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

import com.facebook.react.ReactPackage;
import com.facebook.react.bridge.CatalystInstance;
import com.facebook.react.bridge.CatalystInstanceImpl;
import com.facebook.react.bridge.JSBundleLoader;
import com.facebook.react.bridge.JSCJavaScriptExecutor;
import com.facebook.react.bridge.JavaScriptExecutor;
import com.facebook.react.cxxbridge.CatalystInstanceImpl;
import com.facebook.react.cxxbridge.JSBundleLoader;
import com.facebook.react.cxxbridge.JSCJavaScriptExecutor;
import com.facebook.react.cxxbridge.JavaScriptExecutor;
import com.facebook.react.bridge.JavaScriptModule;
import com.facebook.react.bridge.JavaScriptModuleRegistry;
import com.facebook.react.bridge.NativeModule;
import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
import com.facebook.react.bridge.NativeModuleRegistry;
import com.facebook.react.cxxbridge.NativeModuleRegistry;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.WritableNativeMap;
import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
Expand Down Expand Up @@ -50,7 +50,7 @@ public ReactContextBuilder setReactPackages(ArrayList<ReactPackage> reactPackage
}

public ReactApplicationContext build() throws Exception {
JavaScriptExecutor jsExecutor = new JSCJavaScriptExecutor.Factory().create(new WritableNativeMap());
JavaScriptExecutor jsExecutor = new JSCJavaScriptExecutor.Factory(new WritableNativeMap()).create();

// fresh new react context
final ReactApplicationContext reactContext = new ReactApplicationContext(parentContext);
Expand Down
2 changes: 2 additions & 0 deletions android/src/main/java/co/apptailor/Worker/core/UIManagerStubModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;

public class UIManagerStubModule extends ReactContextBaseJavaModule {

public UIManagerStubModule(ReactApplicationContext reactContext) {
super(reactContext);
}

@ReactMethod
@Override
public String getName() {
return "UIManager";
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-workers",
"version": "0.3.1",
"version": "0.4.0",
"description": "react native web workers",
"main": "index.js",
"scripts": {
Expand Down