maintaining same output in android as it is from IOS (#32)

Co-authored-by: mnoman09 <m.nomanshoaib09@gmail.com>

Author: mnoman09

android/src/main/java/com/optimizely/optimizely_flutter_sdk/OptimizelyFlutterClient.java

@@ -199,8 +199,7 @@ protected void activate(ArgumentsParser argumentsParser, @NonNull Result result)
 
         try {
             Variation variation = optimizelyClient.activate(experimentKey, userId, attributes);
-            String variationKey = variation != null ? variation.getKey() : null;
-            result.success(createResponse(Collections.singletonMap(RequestParameterKey.VARIATION_KEY, variationKey)));
+            result.success(createResponse(Collections.singletonMap(RequestParameterKey.VARIATION_KEY, variation.getKey())));
         } catch (Exception ex) {
             result.success(createResponse(ex.getMessage()));
         }
@@ -225,8 +224,7 @@ protected void getVariation(ArgumentsParser argumentsParser, @NonNull Result res
 
         try {
             Variation variation = optimizelyClient.getVariation(experimentKey, userId, attributes);
-            String variationKey = variation != null ? variation.getKey() : null;
-            result.success(createResponse(Collections.singletonMap(RequestParameterKey.VARIATION_KEY, variationKey)));
+            result.success(createResponse(Collections.singletonMap(RequestParameterKey.VARIATION_KEY, variation.getKey())));
         } catch (Exception ex) {
             result.success(createResponse(ex.getMessage()));
         }
@@ -276,9 +274,9 @@ protected void setForcedVariation(ArgumentsParser argumentsParser, @NonNull Resu
         }
 
         String variationKey = argumentsParser.getVariationKey();
-        optimizelyClient.setForcedVariation(experimentKey, userId, variationKey);
+        Boolean success = optimizelyClient.setForcedVariation(experimentKey, userId, variationKey);
 
-        result.success(createResponse());
+        result.success(createResponse(success));
     }
 
     protected void decide(ArgumentsParser argumentsParser, @NonNull Result result) {
@@ -532,10 +530,19 @@ protected void addNotificationListener(ArgumentsParser argumentsParser, @NonNull
             case NotificationType.ACTIVATE: {
                 notificationId = optimizelyClient.getNotificationCenter().addNotificationHandler(ActivateNotification.class, activateNotification -> {
                     Map<String, Object> notificationMap = new HashMap<>();
-                    notificationMap.put(ActivateListenerKeys.EXPERIMENT_KEY, activateNotification.getExperiment().getKey());
+
+                    Map<String, String> experimentMap = new HashMap<>();
+                    experimentMap.put(ActivateListenerKeys.ID, activateNotification.getExperiment().getId());
+                    experimentMap.put(ActivateListenerKeys.KEY, activateNotification.getExperiment().getKey());
+
+                    Map<String, String> variationMap = new HashMap<>();
+                    variationMap.put(ActivateListenerKeys.ID, activateNotification.getVariation().getId());
+                    variationMap.put(ActivateListenerKeys.KEY, activateNotification.getVariation().getKey());
+
+                    notificationMap.put(ActivateListenerKeys.EXPERIMENT, experimentMap);
                     notificationMap.put(ActivateListenerKeys.USER_ID, activateNotification.getUserId());
                     notificationMap.put(ActivateListenerKeys.ATTRIBUTES, activateNotification.getAttributes());
-                    notificationMap.put(ActivateListenerKeys.VARIATION_KEY, activateNotification.getVariation().getKey());
+                    notificationMap.put(ActivateListenerKeys.VARIATION, variationMap);
                     invokeNotification(id, NotificationType.ACTIVATE, notificationMap);
                 });
                 break;
@@ -599,6 +606,11 @@ private OptimizelyUserContext getUserContext(ArgumentsParser argumentsParser) {
         return response;
     }
 
+    // Create response with success, empty reason and null object response
+    private Map<String, ?> createResponse(Boolean success) {
+        return createResponse(success, null, "");
+    }
+
     // Create response with empty reason and null object response when success is true
     private Map<String, ?> createResponse() {
         return createResponse(true, null, "");

android/src/main/java/com/optimizely/optimizely_flutter_sdk/helper_classes/Constants.java

@@ -87,10 +87,12 @@ public static class DecisionListenerKeys {
     }
 
     public static class ActivateListenerKeys {
-        public static final String EXPERIMENT_KEY = "experimentKey";
+        public static final String ID = "id";
+        public static final String KEY = "key";
+        public static final String EXPERIMENT = "experiment";
         public static final String USER_ID = "userId";
         public static final String ATTRIBUTES = "attributes";
-        public static final String VARIATION_KEY = "variationKey";
+        public static final String VARIATION = "variation";
     }
 
     public static class TrackListenerKeys {