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

upgrade status-go

This commit is contained in:
Roman Volosovskyi 2017-06-05 18:35:02 +03:00 committed by Roman Volosovskyi
parent 024cf6d6b8
commit e164a7a375
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/react-native-status/android/build.gradle
View File

@ -15,5 +15,5 @@ android {
dependencies { dependencies {
compile 'com.facebook.react:react-native:+' compile 'com.facebook.react:react-native:+'
compile 'com.instabug.library:instabug:3+' compile 'com.instabug.library:instabug:3+'
compile(group: 'status-im', name: 'status-go', version: 'jail-signals-gfe007d5', ext: 'aar') compile(group: 'status-im', name: 'status-go', version: 'whisper-on-geth1.6.1', ext: 'aar')
} }

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

@ -141,7 +141,8 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
} }
String config; String config;
String defaultConfig = Statusgo.GenerateConfig(dataFolder, 3); int devCluster = this.debug ? 1 : 0;
String defaultConfig = Statusgo.GenerateConfig(dataFolder, 3, devCluster);
try { try {
JSONObject jsonConfig = new JSONObject(defaultConfig); JSONObject jsonConfig = new JSONObject(defaultConfig);
String gethLogFileName = "geth.log"; String gethLogFileName = "geth.log";

7
modules/react-native-status/ios/RCTStatus/RCTStatus.m
View File

@ -202,7 +202,12 @@ RCT_EXPORT_METHOD(startNode:(RCTResponseSenderBlock)onResultCallback) {
NSLog(@"error %@", error); NSLog(@"error %@", error);
}else }else
NSLog(@"folderName: %@", folderName); NSLog(@"folderName: %@", folderName);
char *configChars = GenerateConfig([folderName.path UTF8String], 3); #if DEBUG
int devCluster = 1;
#else
int devCluster = 0;
#endif
char *configChars = GenerateConfig([folderName.path UTF8String], 3, devCluster);
NSString *config = [NSString stringWithUTF8String: configChars]; NSString *config = [NSString stringWithUTF8String: configChars];
NSData *configData = [config dataUsingEncoding:NSUTF8StringEncoding]; NSData *configData = [config dataUsingEncoding:NSUTF8StringEncoding];
NSDictionary *resultingConfigJson = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:nil]; NSDictionary *resultingConfigJson = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:nil];

2
modules/react-native-status/ios/RCTStatus/pom.xml
View File

@ -25,7 +25,7 @@
<artifactItem> <artifactItem>
<groupId>status-im</groupId> <groupId>status-im</groupId>
<artifactId>status-go-ios-simulator</artifactId> <artifactId>status-go-ios-simulator</artifactId>
<version>jail-signals-gfe007d5</version> <version>whisper-on-geth1.6.1</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
<outputDirectory>./</outputDirectory> <outputDirectory>./</outputDirectory>