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

execute ParseJail synchronously: allows to avoid synchronization deadlocks inside com.github.ericwlange:AndroidJSCore at JSContext instantiation

This commit is contained in:
Roman Volosovskyi 2017-12-11 08:55:19 +02:00
parent 10da67a63f
commit bd017457e3
No known key found for this signature in database
GPG Key ID: 37135489EAE4B2D7
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.jenkins
View File

@ -7,4 +7,4 @@ MAINNET_NETWORKS_ENABLED=1
ERC20_ENABLED=1 ERC20_ENABLED=1
OFFLINE_INBOX_ENABLED=0 OFFLINE_INBOX_ENABLED=0
LOG_LEVEL=debug LOG_LEVEL=debug
JSC_ENABLED=0 JSC_ENABLED=1

11
modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
View File

@ -179,7 +179,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
String gethLogFileName = "geth.log"; String gethLogFileName = "geth.log";
jsonConfig.put("LogEnabled", false); jsonConfig.put("LogEnabled", false);
jsonConfig.put("LogFile", gethLogFileName); jsonConfig.put("LogFile", gethLogFileName);
jsonConfig.put("LogLevel", "DEBUG"); jsonConfig.put("LogLevel", "INFO");
jsonConfig.put("DataDir", root + customConfig.get("DataDir")); jsonConfig.put("DataDir", root + customConfig.get("DataDir"));
jsonConfig.put("NetworkId", customConfig.get("NetworkId")); jsonConfig.put("NetworkId", customConfig.get("NetworkId"));
try { try {
@ -509,24 +509,17 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
@ReactMethod @ReactMethod
public void parseJail(final String chatId, final String js, final Callback callback) { public void parseJail(final String chatId, final String js, final Callback callback) {
Log.d(TAG, "parseJail chatId:" + chatId); Log.d(TAG, "parseJail chatId:" + chatId);
Log.d(TAG, js); //Log.d(TAG, js);
if (!checkAvailability()) { if (!checkAvailability()) {
callback.invoke(false); callback.invoke(false);
return; return;
} }
Thread thread = new Thread() {
@Override
public void run() {
String res = jail.parseJail(chatId, js); String res = jail.parseJail(chatId, js);
Log.d(TAG, res); Log.d(TAG, res);
Log.d(TAG, "endParseJail"); Log.d(TAG, "endParseJail");
callback.invoke(res); callback.invoke(res);
} }
};
thread.start();
}
@ReactMethod @ReactMethod
public void callJail(final String chatId, final String path, final String params, final Callback callback) { public void callJail(final String chatId, final String path, final String params, final Callback callback) {