Merge branch 'next-release'

Author: torchhound

.circleci/config.yml

@@ -17,7 +17,7 @@ jobs:
       - run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false" >> ~/.gradle/gradle.properties
       - run: sdkmanager "system-images;android-24;default;armeabi-v7a"
       - run: sdkmanager --licenses
-      - run: sudo apt-get install libpulse0
+      - run: sudo apt-get update && sudo apt-get install libpulse0
       - run: echo no | avdmanager create avd -n rn-android -f -k "system-images;android-24;default;armeabi-v7a"
       - run: 
           command: emulator -avd rn-android -netdelay none -netspeed full -no-audio -no-window -no-snapshot -use-system-libs -no-boot-anim

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to the LaunchDarkly React Native SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [2.0.1] - 2019-06-27
+### Fixed
+- Listeners on Android now have the proper event emitter key and work properly.
+- Flag values in the object returned by `allFlags`  will no longer be Strings when they should be JSON Objects on Android.
+
+### Changed
+- Updated Android Client SDK to version 2.8.5
+- Updated iOS Client SDK to version 4.1.2
+
 ## [2.0.0] - 2019-06-27
 ### Fixed
 - Changes polling mode to not be ignored in config.

android/build.gradle

@@ -48,7 +48,7 @@ allprojects {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.launchdarkly:launchdarkly-android-client-sdk:2.8.4'
+    implementation 'com.launchdarkly:launchdarkly-android-client-sdk:2.8.5'
     implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation "com.google.code.gson:gson:2.8.5"
 }

android/src/main/java/com/reactlibrary/LaunchdarklyReactNativeClientModule.java

@@ -22,6 +22,8 @@
 import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonParseException;
 import com.launchdarkly.android.FeatureFlagChangeListener;
 import com.launchdarkly.android.LDClient;
 import com.launchdarkly.android.LDConfig;
@@ -601,7 +603,18 @@ public void allFlags(Promise promise) {
             if (entry.getValue() == null) {
                 response.putNull(entry.getKey());
             } else if (entry.getValue() instanceof String) {
-                response.putString(entry.getKey(), (String) entry.getValue());
+                try {
+                    JsonElement parsedJson = new JsonParser().parse((String) entry.getValue());
+                    if (parsedJson.isJsonObject()) {
+                        response.putMap(entry.getKey(), fromJsonObject((JsonObject) parsedJson.getAsJsonObject()));
+                    } else if (parsedJson.isJsonArray()) {
+                        response.putArray(entry.getKey(), fromJsonArray((JsonArray) parsedJson.getAsJsonArray()));
+                    } else {
+                        response.putString(entry.getKey(),(String) entry.getValue());
+                    }
+                } catch (JsonParseException e) {
+                    response.putString(entry.getKey(),(String) entry.getValue());
+                }
             } else if (entry.getValue() instanceof Boolean) {
                 response.putBoolean(entry.getKey(), (Boolean) entry.getValue());
             } else if (entry.getValue() instanceof Double) {
@@ -825,7 +838,7 @@ public void onFeatureFlagChange(String flagKey) {
 
                 getReactApplicationContext()
                         .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                        .emit(EVENT_PREFIX.concat(flagKey), result);
+                        .emit(EVENT_PREFIX, result);
             }
         };
 

ios/LaunchdarklyReactNativeClient.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "LaunchdarklyReactNativeClient"
-  s.version      = "2.0.0"
+  s.version      = "2.0.1"
   s.summary      = "LaunchdarklyReactNativeClient"
   s.description  = <<-DESC
                   LaunchdarklyReactNativeClient
@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
   s.swift_version = "5.0"
 
   s.dependency "React"
-  s.dependency "LaunchDarkly", "4.1.0"
+  s.dependency "LaunchDarkly", "4.1.2"
 
 end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "launchdarkly-react-native-client-sdk",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "",
   "main": "index.js",
   "scripts": {