Skip to content

Commit b99a1c6

Browse files
author
markvdouw
authored
fix: Kit integration forwarding unplanned/blocked events when fired early on app run (#394)
* Quick test for updateDataplan in onKitLoaded * Changes based on comments
1 parent d02b5b3 commit b99a1c6

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

android-core/src/main/java/com/mparticle/internal/KitFrameworkWrapper.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,13 @@ public void loadKitLibrary() {
7777
.onKitsLoaded(() -> {
7878
mKitManager = kitManager;
7979
setKitsLoaded(true);
80+
updateDataplan(mCoreCallbacks.getDataplanOptions());
8081
}
8182
);
8283
} else {
8384
mKitManager = kitManager;
85+
updateDataplan(mCoreCallbacks.getDataplanOptions());
8486
}
85-
updateDataplan(mCoreCallbacks.getDataplanOptions());
8687
} catch (Exception e) {
8788
Logger.debug("No Kit Framework detected.");
8889
setKitsLoaded(true);
@@ -128,7 +129,7 @@ void setKitsLoaded(boolean kitsLoaded) {
128129
disableQueuing();
129130
}
130131
List<KitsLoadedListener> kitsLoadedListenersCopy = new ArrayList<>(kitsLoadedListeners);
131-
for (KitsLoadedListener kitsLoadedListener: kitsLoadedListenersCopy) {
132+
for (KitsLoadedListener kitsLoadedListener : kitsLoadedListenersCopy) {
132133
if (kitsLoadedListener != null) {
133134
kitsLoadedListener.onKitsLoaded();
134135
}
@@ -198,7 +199,7 @@ void replayEvents() {
198199
break;
199200
case AttributeChange.INCREMENT_ATTRIBUTE:
200201
if (attributeChange.value instanceof String) {
201-
mKitManager.incrementUserAttribute(attributeChange.key, attributeChange.incrementedBy, (String)attributeChange.value, attributeChange.mpid);
202+
mKitManager.incrementUserAttribute(attributeChange.key, attributeChange.incrementedBy, (String) attributeChange.value, attributeChange.mpid);
202203
}
203204
break;
204205
case AttributeChange.TAG:

android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ public KitsLoadedCallback updateKits(final JSONArray kitConfigs) {
154154
runOnKitThread(() -> {
155155
kitConfigurations = parseKitConfigurations(kitConfigs);
156156
runOnMainThread(() -> {
157+
updateDataplan(mCoreCallbacks.getDataplanOptions());
157158
configureKits(kitConfigurations);
158159
callback.setKitsLoaded();
159160
});

0 commit comments

Comments
 (0)