Merge pull request #211 from sputh/fix/null-keys

Fix issue where AsyncStorage can't re-set unsentEventString nor unsen…

Author: sputh

CHANGELOG.md

@@ -1,3 +1,6 @@
+### 5.7.1 (December 2, 2019)
+* Fix issue where null unsentKey and unsentIdentifyKeys were causing log crashes
+
 ### 5.7.0 (November 22, 2019)
 * Namespace AsyncStorage with api key to prevent cross domain contamination
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "amplitude-js",
   "author": "Amplitude <support@amplitude.com>",
-  "version": "5.7.0",
+  "version": "5.7.1",
   "license": "MIT",
   "description": "Javascript library for Amplitude Analytics",
   "keywords": [

src/amplitude-client.js

@@ -238,19 +238,31 @@ AmplitudeClient.prototype._migrateUnsentEvents = function _migrateUnsentEvents(c
     if (this.options.saveEvents) {
       var unsentEventsString = values[0];
       var unsentIdentifyKey = values[1];
-      Promise.all([
-        AsyncStorage.setItem(this.options.unsentKey + this._storageSuffix, unsentEventsString),
-        AsyncStorage.setItem(this.options.unsentIdentifyKey + this._storageSuffix, unsentIdentifyKey),
-      ]).then(() => {
-        Promise.all([
-        AsyncStorage.removeItem(this.options.unsentKey),
-        AsyncStorage.removeItem(this.options.unsentIdentifyKey),
-        ]).then(cb);
-      }).catch((err) => {
-        this.options.onError(err);
-      });
+
+      var itemsToSet = [];
+      var itemsToRemove = [];
+
+      if (!!unsentEventsString) {
+        itemsToSet.push(AsyncStorage.setItem(this.options.unsentKey + this._storageSuffix, JSON.stringify(unsentEventsString)));
+        itemsToRemove.push(AsyncStorage.removeItem(this.options.unsentKey));
+      }
+
+      if (!!unsentIdentifyKey) {
+        itemsToSet.push(AsyncStorage.setItem(this.options.unsentIdentifyKey + this._storageSuffix, JSON.stringify(unsentIdentifyKey)));
+        itemsToRemove.push(AsyncStorage.removeItem(this.options.unsentIdentifyKey));
+      }
+
+      if (itemsToSet.length > 0) {
+        Promise.all(itemsToSet).then(() => {
+          Promise.all(itemsToRemove);
+        }).catch((err) => {
+          this.options.onError(err);
+        });
+      }
     }
-  }).catch((err) => {
+  })
+  .then(cb)
+  .catch((err) => {
     this.options.onError(err);
   });
 };