Skip to content

Commit f43ab84

Browse files
feat: some logging
1 parent 93ea2d5 commit f43ab84

File tree

1 file changed

+31
-20
lines changed

1 file changed

+31
-20
lines changed

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

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,11 @@ private void updateConfigVariables(@NonNull final CountlyConfig clyConfig) {
255255
}
256256

257257
private void updateListingFilters() {
258+
L.d("[ModuleConfiguration] updateListingFilters, current listing filters before updating: \n" +
259+
"Event Filter List: " + currentVEventFilterList.filterList + ", isWhitelist: " + currentVEventFilterList.isWhitelist + "\n" +
260+
"User Property Filter List: " + currentVUserPropertyFilterList.filterList + ", isWhitelist: " + currentVUserPropertyFilterList.isWhitelist + "\n" +
261+
"Segmentation Filter List: " + currentVSegmentationFilterList.filterList + ", isWhitelist: " + currentVSegmentationFilterList.isWhitelist + "\n" +
262+
"Event Segmentation Filter List: " + currentVEventSegmentationFilterList.filterList + ", isWhitelist: " + currentVEventSegmentationFilterList.isWhitelist);
258263
JSONArray eventBlacklistJSARR = latestRetrievedConfiguration.optJSONArray(keyREventBlacklist);
259264
JSONArray eventWhitelistJSARR = latestRetrievedConfiguration.optJSONArray(keyREventWhitelist);
260265
JSONArray userPropertyBlacklistJSARR = latestRetrievedConfiguration.optJSONArray(keyRUserPropertyBlacklist);
@@ -264,57 +269,63 @@ private void updateListingFilters() {
264269
JSONObject eventSegmentationBlacklistJSOBJ = latestRetrievedConfiguration.optJSONObject(keyREventSegmentationBlacklist);
265270
JSONObject eventSegmentationWhitelistJSOBJ = latestRetrievedConfiguration.optJSONObject(keyREventSegmentationWhitelist);
266271

267-
if (eventWhitelistJSARR != null) {
268-
extractFilterSetFromJSONArray(eventWhitelistJSARR, currentVEventFilterList.filterList);
269-
currentVEventFilterList.isWhitelist = true;
270-
} else if (eventBlacklistJSARR != null) {
272+
if (eventBlacklistJSARR != null) {
271273
extractFilterSetFromJSONArray(eventBlacklistJSARR, currentVEventFilterList.filterList);
272274
currentVEventFilterList.isWhitelist = false;
275+
} else if (eventWhitelistJSARR != null) {
276+
extractFilterSetFromJSONArray(eventWhitelistJSARR, currentVEventFilterList.filterList);
277+
currentVEventFilterList.isWhitelist = true;
273278
}
274279

275-
if (userPropertyWhitelistJSARR != null) {
276-
extractFilterSetFromJSONArray(userPropertyWhitelistJSARR, currentVUserPropertyFilterList.filterList);
277-
currentVUserPropertyFilterList.isWhitelist = true;
278-
} else if (userPropertyBlacklistJSARR != null) {
280+
if (userPropertyBlacklistJSARR != null) {
279281
extractFilterSetFromJSONArray(userPropertyBlacklistJSARR, currentVUserPropertyFilterList.filterList);
280282
currentVUserPropertyFilterList.isWhitelist = false;
283+
} else if (userPropertyWhitelistJSARR != null) {
284+
extractFilterSetFromJSONArray(userPropertyWhitelistJSARR, currentVUserPropertyFilterList.filterList);
285+
currentVUserPropertyFilterList.isWhitelist = true;
281286
}
282287

283-
if (segmentationWhitelistJSARR != null) {
284-
extractFilterSetFromJSONArray(segmentationWhitelistJSARR, currentVSegmentationFilterList.filterList);
285-
currentVSegmentationFilterList.isWhitelist = true;
286-
} else if (segmentationBlacklistJSARR != null) {
288+
if (segmentationBlacklistJSARR != null) {
287289
extractFilterSetFromJSONArray(segmentationBlacklistJSARR, currentVSegmentationFilterList.filterList);
288290
currentVSegmentationFilterList.isWhitelist = false;
291+
} else if (segmentationWhitelistJSARR != null) {
292+
extractFilterSetFromJSONArray(segmentationWhitelistJSARR, currentVSegmentationFilterList.filterList);
293+
currentVSegmentationFilterList.isWhitelist = true;
289294
}
290295

291-
if (eventSegmentationWhitelistJSOBJ != null) {
296+
if (eventSegmentationBlacklistJSOBJ != null) {
292297
currentVEventSegmentationFilterList.filterList.clear();
293-
currentVEventSegmentationFilterList.isWhitelist = true;
294-
Iterator<String> keys = eventSegmentationWhitelistJSOBJ.keys();
298+
currentVEventSegmentationFilterList.isWhitelist = false;
299+
Iterator<String> keys = eventSegmentationBlacklistJSOBJ.keys();
295300
while (keys.hasNext()) {
296301
String key = keys.next();
297-
JSONArray jsonArray = eventSegmentationWhitelistJSOBJ.optJSONArray(key);
302+
JSONArray jsonArray = eventSegmentationBlacklistJSOBJ.optJSONArray(key);
298303
if (jsonArray != null) {
299304
Set<String> filterSet = new HashSet<>();
300305
extractFilterSetFromJSONArray(jsonArray, filterSet);
301306
currentVEventSegmentationFilterList.filterList.put(key, filterSet);
302307
}
303308
}
304-
} else if (eventSegmentationBlacklistJSOBJ != null) {
309+
} else if (eventSegmentationWhitelistJSOBJ != null) {
305310
currentVEventSegmentationFilterList.filterList.clear();
306-
currentVEventSegmentationFilterList.isWhitelist = false;
307-
Iterator<String> keys = eventSegmentationBlacklistJSOBJ.keys();
311+
currentVEventSegmentationFilterList.isWhitelist = true;
312+
Iterator<String> keys = eventSegmentationWhitelistJSOBJ.keys();
308313
while (keys.hasNext()) {
309314
String key = keys.next();
310-
JSONArray jsonArray = eventSegmentationBlacklistJSOBJ.optJSONArray(key);
315+
JSONArray jsonArray = eventSegmentationWhitelistJSOBJ.optJSONArray(key);
311316
if (jsonArray != null) {
312317
Set<String> filterSet = new HashSet<>();
313318
extractFilterSetFromJSONArray(jsonArray, filterSet);
314319
currentVEventSegmentationFilterList.filterList.put(key, filterSet);
315320
}
316321
}
317322
}
323+
324+
L.d("[ModuleConfiguration] updateListingFilters, current listing filters after updating: \n" +
325+
"Event Filter List: " + currentVEventFilterList.filterList + ", isWhitelist: " + currentVEventFilterList.isWhitelist + "\n" +
326+
"User Property Filter List: " + currentVUserPropertyFilterList.filterList + ", isWhitelist: " + currentVUserPropertyFilterList.isWhitelist + "\n" +
327+
"Segmentation Filter List: " + currentVSegmentationFilterList.filterList + ", isWhitelist: " + currentVSegmentationFilterList.isWhitelist + "\n" +
328+
"Event Segmentation Filter List: " + currentVEventSegmentationFilterList.filterList + ", isWhitelist: " + currentVEventSegmentationFilterList.isWhitelist);
318329
}
319330

320331
private void extractFilterSetFromJSONArray(@Nullable JSONArray jsonArray, @NonNull Set<String> targetSet) {

0 commit comments

Comments
 (0)