From 1c5cf7fe4bd7491809cee2da4232a49628f50e69 Mon Sep 17 00:00:00 2001 From: Pedro Pombeiro Date: Mon, 8 Jan 2018 14:39:29 +0100 Subject: [PATCH] [fix #2925] Fix messed-up merge in b87a52e2d Signed-off-by: Pedro Pombeiro --- .../src/main/java/im/status/ethereum/module/StatusModule.java | 2 +- modules/react-native-status/ios/RCTStatus/RCTStatus.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java index 6f8647c930..756348cc18 100644 --- a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java +++ b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java @@ -229,7 +229,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL Log.d(TAG, "StartNode result: " + res); } else { - Log.e(TAG, "StartNode result: " + res); + Log.e(TAG, "StartNode failed: " + res); } Log.d(TAG, "Geth node started"); status.sendMessage(); diff --git a/modules/react-native-status/ios/RCTStatus/RCTStatus.m b/modules/react-native-status/ios/RCTStatus/RCTStatus.m index edeb232088..8f42782237 100644 --- a/modules/react-native-status/ios/RCTStatus/RCTStatus.m +++ b/modules/react-native-status/ios/RCTStatus/RCTStatus.m @@ -203,7 +203,7 @@ RCT_EXPORT_METHOD(startNode:(NSString *)configString) { [resultingConfigJson setValue:newKeystoreUrl.path forKey:@"KeyStoreDir"]; [resultingConfigJson setValue:[NSNumber numberWithBool:[logLevel length] != 0] forKey:@"LogEnabled"]; [resultingConfigJson setValue:logUrl.path forKey:@"LogFile"]; - [resultingConfigJson setValue:([logLevel length] == 0 ? "ERROR" : logLevel) forKey:@"LogLevel"]; + [resultingConfigJson setValue:([logLevel length] == 0 ? [NSString stringWithUTF8String: "ERROR"] : logLevel) forKey:@"LogLevel"]; if(upstreamURL != nil) { [resultingConfigJson setValue:[NSNumber numberWithBool:YES] forKeyPath:@"UpstreamConfig.Enabled"];