[sc-149512] Android reason fixes (#120)

launchdarkly · Apr 14, 2022 · 067354d · 067354d
1 parent 285aa05
commit 067354d
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/android/src/main/java/com/launchdarkly/reactnative/LaunchdarklyReactNativeClientModule.java b/android/src/main/java/com/launchdarkly/reactnative/LaunchdarklyReactNativeClientModule.java
@@ -434,19 +434,30 @@ private ObjectBuilder objectBuilderFromDetail(EvaluationDetail<?> detail) {
         ObjectBuilder resultMap = LDValue.buildObject();
         if (!detail.isDefaultValue()) {
             resultMap.put("variationIndex", detail.getVariationIndex());
+        } else {
+            resultMap.put("variationIndex", LDValue.ofNull());
         }
         EvaluationReason reason = detail.getReason();
+        if (reason == null) {
+            resultMap.put("reason", LDValue.ofNull());
+            return resultMap;
+        }
         ObjectBuilder reasonMap = LDValue.buildObject();
         reasonMap.put("kind", reason.getKind().name());
         switch (reason.getKind()) {
             case RULE_MATCH:
                 reasonMap.put("ruleIndex", reason.getRuleIndex());
-                if (reason.getRuleId() != null) {
-                    reasonMap.put("ruleId", reason.getRuleId());
+                reasonMap.put("ruleId", reason.getRuleId());
+                if (reason.isInExperiment()) {
+                    reasonMap.put("inExperiment", true);
                 }
                 break;
             case PREREQUISITE_FAILED: reasonMap.put("prerequisiteKey", reason.getPrerequisiteKey()); break;
             case ERROR: reasonMap.put("errorKind", reason.getErrorKind().name()); break;
+            case FALLTHROUGH:
+                if (reason.isInExperiment()) {
+                    reasonMap.put("inExperiment", true);
+                }
             default: break;
         }
         resultMap.put("reason", reasonMap.build());