Merge remote-tracking branch 'origin/v3' into v3

This commit is contained in:
Salakar 2017-08-17 16:25:39 +01:00
commit 202ad29f1c
1 changed files with 1 additions and 3 deletions

View File

@ -34,8 +34,6 @@ NSDictionary *convertFIRRemoteConfigValueToNSDictionary(FIRRemoteConfigValue *va
return @{@"stringValue": value.stringValue ?: [NSNull null], @"numberValue": value.numberValue ?: [NSNull null], @"dataValue": value.dataValue ? [value.dataValue base64EncodedStringWithOptions:0] : [NSNull null], @"boolValue": @(value.boolValue), @"source": convertFIRRemoteConfigSourceToNSString(value.source)}; return @{@"stringValue": value.stringValue ?: [NSNull null], @"numberValue": value.numberValue ?: [NSNull null], @"dataValue": value.dataValue ? [value.dataValue base64EncodedStringWithOptions:0] : [NSNull null], @"boolValue": @(value.boolValue), @"source": convertFIRRemoteConfigSourceToNSString(value.source)};
} }
@interface RNFirebaseRemoteConfig ()
@property(nonatomic, readwrite, weak) FIRRemoteConfig *remoteConfig; @property(nonatomic, readwrite, weak) FIRRemoteConfig *remoteConfig;
@end @end
@ -137,6 +135,6 @@ RCT_EXPORT_METHOD(setDefaultsFromResource:
@end @end
#else #else
@implementation RNFirebaseConfig @implementation RNFirebaseRemoteConfig
@end @end
#endif #endif