From 6ff855942d6fc60b0560cd46a1ad062d6ed74323 Mon Sep 17 00:00:00 2001
From: markvdouw <v-mvanderouw@mparticle.com>
Date: Thu, 22 Jun 2023 18:54:23 -0300
Subject: [PATCH 1/2] Quick test for updateDataplan in onKitLoaded

---
 .../java/com/mparticle/internal/KitFrameworkWrapper.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/android-core/src/main/java/com/mparticle/internal/KitFrameworkWrapper.java b/android-core/src/main/java/com/mparticle/internal/KitFrameworkWrapper.java
index 6261e9d86..77c7ac46e 100644
--- a/android-core/src/main/java/com/mparticle/internal/KitFrameworkWrapper.java
+++ b/android-core/src/main/java/com/mparticle/internal/KitFrameworkWrapper.java
@@ -77,12 +77,13 @@ public void loadKitLibrary() {
                             .onKitsLoaded(() -> {
                                         mKitManager = kitManager;
                                         setKitsLoaded(true);
+                                        updateDataplan(mCoreCallbacks.getDataplanOptions());
                                     }
                             );
                 } else {
                     mKitManager = kitManager;
+                    updateDataplan(mCoreCallbacks.getDataplanOptions());
                 }
-                updateDataplan(mCoreCallbacks.getDataplanOptions());
             } catch (Exception e) {
                 Logger.debug("No Kit Framework detected.");
                 setKitsLoaded(true);
@@ -128,7 +129,7 @@ void setKitsLoaded(boolean kitsLoaded) {
             disableQueuing();
         }
         List<KitsLoadedListener> kitsLoadedListenersCopy = new ArrayList<>(kitsLoadedListeners);
-        for (KitsLoadedListener kitsLoadedListener: kitsLoadedListenersCopy) {
+        for (KitsLoadedListener kitsLoadedListener : kitsLoadedListenersCopy) {
             if (kitsLoadedListener != null) {
                 kitsLoadedListener.onKitsLoaded();
             }
@@ -198,7 +199,7 @@ void replayEvents() {
                         break;
                     case AttributeChange.INCREMENT_ATTRIBUTE:
                         if (attributeChange.value instanceof String) {
-                            mKitManager.incrementUserAttribute(attributeChange.key, attributeChange.incrementedBy, (String)attributeChange.value, attributeChange.mpid);
+                            mKitManager.incrementUserAttribute(attributeChange.key, attributeChange.incrementedBy, (String) attributeChange.value, attributeChange.mpid);
                         }
                         break;
                     case AttributeChange.TAG:
@@ -630,7 +631,7 @@ public void onModifyCompleted(MParticleUser user, IdentityApiRequest request) {
             mKitManager.onModifyCompleted(user, request);
         }
     }
-    
+
     @Override
     public void onConsentStateUpdated(ConsentState oldState, ConsentState newState, long mpid) {
         if (mKitManager != null) {

From df4c8aa040144e247297a7fde6a9f2c2b3fd72cb Mon Sep 17 00:00:00 2001
From: markvdouw <v-mvanderouw@mparticle.com>
Date: Tue, 27 Jun 2023 20:40:28 -0300
Subject: [PATCH 2/2] Changes based on comments

---
 .../src/main/java/com/mparticle/kits/KitManagerImpl.java         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java b/android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java
index fa710cabe..b2a58337c 100644
--- a/android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java
+++ b/android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java
@@ -154,6 +154,7 @@ public KitsLoadedCallback updateKits(final JSONArray kitConfigs) {
         runOnKitThread(() -> {
                     kitConfigurations = parseKitConfigurations(kitConfigs);
                     runOnMainThread(() -> {
+                        updateDataplan(mCoreCallbacks.getDataplanOptions());
                         configureKits(kitConfigurations);
                         callback.setKitsLoaded();
                     });