status-im/realm-js
2
0
Fork 0
mirror of https://github.com/status-im/realm-js.git synced 2025-02-18 17:47:32 +00:00
Code Issues Projects Releases Wiki Activity

Running chrome debug mode request on UI thread + using Facebook SoLoader instead of the Relinker + cleaning dependencies

Browse Source
This commit is contained in:
Nabil Hachicha 2016-01-21 13:36:54 +00:00
parent bd379dd376
commit bf80fca2c0
5 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/ReactExample/run-android.sh
View File

@ -2,5 +2,4 @@
rm -rf node_modules/realm rm -rf node_modules/realm
npm install realm npm install realm
adb forward tcp:8082 tcp:8082 adb forward tcp:8082 tcp:8082
adb reverse tcp:8081 tcp:8081
react-native run-android react-native run-android

1
react-native/android/app/build.gradle
View File

@ -147,7 +147,6 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.github.KeepSafe:ReLinker:1.1'
compile 'org.nanohttpd:nanohttpd:2.2.0' compile 'org.nanohttpd:nanohttpd:2.2.0'
compile 'com.facebook.react:react-native:0.18.0-patched' compile 'com.facebook.react:react-native:0.18.0-patched'
compile 'org.webkit:android-jsc:r174650' compile 'org.webkit:android-jsc:r174650'

50
react-native/android/app/src/main/java/com/reacttests/RealmReactAndroid.java
View File

@ -5,7 +5,6 @@ import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod; import com.facebook.react.bridge.ReactMethod;
import com.getkeepsafe.relinker.ReLinker;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import android.widget.Toast; import android.widget.Toast;
@ -14,6 +13,10 @@ import android.util.Log;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
import fi.iki.elonen.NanoHTTPD; import fi.iki.elonen.NanoHTTPD;
import android.os.Handler;
import android.os.Looper;
import java.util.concurrent.CountDownLatch;
import com.facebook.soloader.SoLoader;
public class RealmReactAndroid extends ReactContextBaseJavaModule { public class RealmReactAndroid extends ReactContextBaseJavaModule {
private static final String DURATION_SHORT_KEY = "SHORT"; private static final String DURATION_SHORT_KEY = "SHORT";
@ -23,6 +26,7 @@ public class RealmReactAndroid extends ReactContextBaseJavaModule {
private static final int DEFAULT_PORT = 8082; private static final int DEFAULT_PORT = 8082;
private AndroidWebServer webServer; private AndroidWebServer webServer;
private long rpcServerPtr; private long rpcServerPtr;
private Handler handler = new Handler(Looper.getMainLooper());
public RealmReactAndroid(ReactApplicationContext reactContext) { public RealmReactAndroid(ReactApplicationContext reactContext) {
super(reactContext); super(reactContext);
@ -31,7 +35,7 @@ public class RealmReactAndroid extends ReactContextBaseJavaModule {
} catch (IOException e) { } catch (IOException e) {
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
ReLinker.loadLibrary(reactContext, "realmreact"); SoLoader.loadLibrary("realmreact");
} }
@Override @Override
@ -43,7 +47,7 @@ public class RealmReactAndroid extends ReactContextBaseJavaModule {
public Map<String, Object> getConstants() { public Map<String, Object> getConstants() {
long contexts = injectRealmJsContext(filesDirPath); long contexts = injectRealmJsContext(filesDirPath);
Log.i("RealmReactAndroid", "Initialized " + contexts + " contexts"); Log.i("RealmReactAndroid", "Initialized " + contexts + " contexts");
if (contexts == 0) { if (contexts == 0) {// we're running in Chrome debug mode
startWebServer(); startWebServer();
} }
return new HashMap<>(); return new HashMap<>();
@ -56,12 +60,6 @@ public class RealmReactAndroid extends ReactContextBaseJavaModule {
webServer.stop(); webServer.stop();
} }
} }
// @ReactMethod
// public void setUpChromeDebugMode() {
// startWebServer();
// // setupChromeDebugModeRealmJsContext();
// }
///FIXME find the right callback to call webServerstop
private void startWebServer() { private void startWebServer() {
rpcServerPtr = setupChromeDebugModeRealmJsContext(); rpcServerPtr = setupChromeDebugModeRealmJsContext();
webServer = new AndroidWebServer(DEFAULT_PORT); webServer = new AndroidWebServer(DEFAULT_PORT);
@ -85,16 +83,8 @@ public class RealmReactAndroid extends ReactContextBaseJavaModule {
@Override @Override
public Response serve(IHTTPSession session) { public Response serve(IHTTPSession session) {
String cmdUri = session.getUri(); final String cmdUri = session.getUri();
Log.v("AndroidWebServer", "Session Uri: " + cmdUri + " Mehtod: " + session.getMethod().name()); Log.v("AndroidWebServer", "Session Uri: " + cmdUri + " Mehtod: " + session.getMethod().name());
// String msg = "<html><body><h1>Hello server</h1>\n";
// Map<String, String> parms = session.getParms();
// if (parms.get("username") == null) {
// msg += "<form action='?' method='get'>\n <p>Your name: <input type='text' name='username'></p>\n" + "</form>\n";
// } else {
// msg += "<p>Hello, " + parms.get("username") + "!</p>";
// }
// return newFixedLengthResponse( msg + "</body></html>\n" );
final HashMap<String, String> map = new HashMap<String, String>(); final HashMap<String, String> map = new HashMap<String, String>();
try { try {
session.parseBody(map); session.parseBody(map);
@ -104,10 +94,26 @@ public class RealmReactAndroid extends ReactContextBaseJavaModule {
e.printStackTrace(); e.printStackTrace();
} }
final String json = map.get("postData"); final String json = map.get("postData");
String jsonResponse = processChromeDebugCommand(rpcServerPtr, cmdUri, json); Log.v("AndroidWebServer", "Post Data: \n" + json + "\n Thread id: " + Thread.currentThread().getName());
Response response = newFixedLengthResponse(jsonResponse); final String[] jsonResponse = new String[1];
response.addHeader("Access-Control-Allow-Origin", "http://localhost:8081"); final CountDownLatch latch = new CountDownLatch(1);
return response; // Process the command on the UI thread
handler.post(new Runnable() {
@Override
public void run() {
jsonResponse[0] = processChromeDebugCommand(rpcServerPtr, cmdUri, json);
latch.countDown();
}
});
try {
latch.await();
Response response = newFixedLengthResponse(jsonResponse[0]);
response.addHeader("Access-Control-Allow-Origin", "http://localhost:8081");
return response;
} catch (InterruptedException e) {
e.printStackTrace();
return null;
}
} }
} }

1
react-native/android/build.gradle
View File

@ -17,6 +17,5 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() jcenter()
maven { url "https://jitpack.io" }
} }
} }

1
tests/react-test-app/android/build.gradle
View File

@ -19,6 +19,5 @@ allprojects {
jcenter { jcenter {
url "http://dl.bintray.com/mkonicek/maven" url "http://dl.bintray.com/mkonicek/maven"
} }
maven { url "https://jitpack.io" }
} }
} }