Merge pull request #428 from Countly/fix_contetns

fix: support segmentation

Author: turtledreams

CHANGELOG.md

@@ -4,7 +4,7 @@
 * Mitigated an issue where visibility could have been wrongly assigned if a view was closed while going to background. (Experimental!)
 * Fixed a bug where passing the global content callback was not possible.
 * Mitigated an issue related to content actions navigation.
-
+* Mitigated an issue that parsing internal content event segmentation.
 ## 24.7.5
 * ! Minor breaking change ! All active views will now automatically stop when consent for "views" is revoked.
 

sdk/src/main/java/ly/count/android/sdk/TransparentActivity.java

@@ -287,15 +287,17 @@ private void eventAction(Map<String, Object> query) {
                     JSONObject eventJson = event.getJSONObject(i);
                     Log.v(Countly.TAG, "[TransparentActivity] eventAction, event JSON: [" + eventJson.toString() + "]");
 
-                    if (!eventJson.has("sg")) {
+                    Map<String, Object> segmentation = new ConcurrentHashMap<>();
+                    JSONObject sgJson = eventJson.optJSONObject("sg");
+                    JSONObject segmentationJson = eventJson.optJSONObject("segmentation");
+
+                    if (sgJson != null) {
+                        segmentationJson = sgJson;
+                    } else if (segmentationJson == null) {
                         Log.w(Countly.TAG, "[TransparentActivity] eventAction, event JSON is missing segmentation data event: [" + eventJson + "]");
                         continue;
                     }
 
-                    Map<String, Object> segmentation = new ConcurrentHashMap<>();
-                    JSONObject segmentationJson = eventJson.getJSONObject("sg");
-                    assert segmentationJson != null; // this is already checked above
-
                     for (int j = 0; j < segmentationJson.names().length(); j++) {
                         String key = segmentationJson.names().getString(j);
                         Object value = segmentationJson.get(key);