Skip to content

Commit 42560f1

Browse files
author
markvdouw
authored
fix: Kit Initialization & De-Initialization. (#398)
Fix for Kit Initialization & De-Initializationg. Underlying issues is calling fetchConfig when no kit instance is assigned to KitFrameworkManager, therefore the because the instance is null, we cant pass the kits to to apiClient. Removing empty validation in ConfigManager since this is a valid case.
1 parent 49b9066 commit 42560f1

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -319,12 +319,10 @@ void saveConfigJson(JSONObject coreConfig, JSONArray kitConfig, String etag, Str
319319
.putString(Constants.PrefKeys.ETAG, etag)
320320
.putString(Constants.PrefKeys.IF_MODIFIED, lastModified)
321321
.apply();
322-
if (kitConfigString == null || (kitConfigString != null && !kitConfigString.isEmpty())) {
323-
getKitConfigPreferences()
324-
.edit()
325-
.putString(KIT_CONFIG_KEY, kitConfigString)
326-
.apply();
327-
}
322+
getKitConfigPreferences()
323+
.edit()
324+
.putString(KIT_CONFIG_KEY, kitConfigString)
325+
.apply();
328326
} else {
329327
Logger.debug("clearing current configurations");
330328
clearConfig();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public void loadKitLibrary() {
7070
KitManager kitManager = constructor.newInstance(mContext, mReportingManager, mCoreCallbacks, mOptions);
7171
JSONArray configuration = mCoreCallbacks.getLatestKitConfiguration();
7272
Logger.debug("Kit Framework loaded.");
73+
this.mKitManager = kitManager;
7374
if (!MPUtility.isEmpty(configuration)) {
7475
Logger.debug("Restoring previous Kit configuration.");
7576
kitManager
@@ -81,7 +82,6 @@ public void loadKitLibrary() {
8182
}
8283
);
8384
} else {
84-
mKitManager = kitManager;
8585
updateDataplan(mCoreCallbacks.getDataplanOptions());
8686
}
8787
} catch (Exception e) {

0 commit comments

Comments
 (0)