Merge pull request #695 from Iterable/new-arch/MOB-11957-ios-crashes-when-clicking-track-push-open-with-ca

[MOB-11957] ios-crashes-when-clicking-track-push-open-with-ca

Author: lposen

android/src/main/java/com/iterable/reactnative/RNIterableAPIModuleImpl.java

@@ -97,7 +97,7 @@ public void initializeWithApiKey(String apiKey, ReadableMap configReadableMap, S
         promise.resolve(true);
     }
 
-    public void initialize2WithApiKey(String apiKey, ReadableMap configReadableMap, String apiEndPointOverride, String version, Promise promise) {
+    public void initialize2WithApiKey(String apiKey, ReadableMap configReadableMap, String version, String apiEndPointOverride, Promise promise) {
         IterableLogger.d(TAG, "initialize2WithApiKey: " + apiKey);
         IterableConfig.Builder configBuilder = Serialization.getConfigFromReadableMap(configReadableMap);
 
@@ -167,7 +167,7 @@ public void getUserId(Promise promise) {
         promise.resolve(RNIterableInternal.getUserId());
     }
 
-    public void trackEvent(String name, ReadableMap dataFields) {
+    public void trackEvent(String name, @Nullable ReadableMap dataFields) {
         IterableLogger.v(TAG, "trackEvent");
         IterableApi.getInstance().track(name, optSerializedDataFields(dataFields));
     }
@@ -177,16 +177,16 @@ public void updateCart(ReadableArray items) {
         IterableApi.getInstance().updateCart(Serialization.commerceItemsFromReadableArray(items));
     }
 
-    public void trackPurchase(double total, ReadableArray items, ReadableMap dataFields) {
+    public void trackPurchase(double total, ReadableArray items, @Nullable ReadableMap dataFields) {
         IterableLogger.v(TAG, "trackPurchase");
         IterableApi.getInstance().trackPurchase(total, Serialization.commerceItemsFromReadableArray(items), optSerializedDataFields(dataFields));
     }
 
-    public void trackPushOpenWithCampaignId(double campaignId, Double templateId, String messageId, boolean appAlreadyRunning, ReadableMap dataFields) {
+    public void trackPushOpenWithCampaignId(double campaignId, @Nullable Double templateId, String messageId, boolean appAlreadyRunning, @Nullable ReadableMap dataFields) {
         RNIterableInternal.trackPushOpenWithCampaignId((int) campaignId, templateId != null ? templateId.intValue() : null, messageId, optSerializedDataFields(dataFields));
     }
 
-    public void updateSubscriptions(ReadableArray emailListIds, ReadableArray unsubscribedChannelIds, ReadableArray unsubscribedMessageTypeIds, ReadableArray subscribedMessageTypeIds, double campaignId, double templateId) {
+    public void updateSubscriptions(@Nullable ReadableArray emailListIds, @Nullable ReadableArray unsubscribedChannelIds, @Nullable ReadableArray unsubscribedMessageTypeIds, @Nullable ReadableArray subscribedMessageTypeIds, double campaignId, double templateId) {
         IterableLogger.v(TAG, "updateSubscriptions");
         Integer finalCampaignId = null, finalTemplateId = null;
         if (campaignId > 0) {
@@ -265,7 +265,7 @@ public void getAttributionInfo(Promise promise) {
         }
     }
 
-    public void setAttributionInfo(ReadableMap attributionInfoReadableMap) {
+    public void setAttributionInfo(@Nullable ReadableMap attributionInfoReadableMap) {
         IterableLogger.printInfo();
         try {
             JSONObject attributionInfoJson = Serialization.convertMapToJson(attributionInfoReadableMap);
@@ -593,7 +593,7 @@ public void removeListeners(double count) {
         // Keep: Required for RN built in Event Emitter Calls.
     }
 
-    public void passAlongAuthToken(String authToken) {
+    public void passAlongAuthToken(@Nullable String authToken) {
         passedAuthToken = authToken;
 
         if (authHandlerCallbackLatch != null) {

android/src/newarch/java/com/RNIterableAPIModule.java

@@ -32,8 +32,8 @@ public void initializeWithApiKey(String apiKey, ReadableMap configReadableMap, S
   }
 
   @Override
-  public void initialize2WithApiKey(String apiKey, ReadableMap configReadableMap, String apiEndPointOverride, String version, Promise promise) {
-    moduleImpl.initialize2WithApiKey(apiKey, configReadableMap, apiEndPointOverride, version, promise);
+  public void initialize2WithApiKey(String apiKey, ReadableMap configReadableMap, String version, String apiEndPointOverride, Promise promise) {
+    moduleImpl.initialize2WithApiKey(apiKey, configReadableMap, version, apiEndPointOverride, promise);
   }
 
   @Override
@@ -71,7 +71,7 @@ public void getUserId(Promise promise) {
   }
 
   @Override
-  public void trackEvent(String name, ReadableMap dataFields) {
+  public void trackEvent(String name, @Nullable ReadableMap dataFields) {
     moduleImpl.trackEvent(name, dataFields);
   }
 
@@ -81,17 +81,17 @@ public void updateCart(ReadableArray items) {
   }
 
   @Override
-  public void trackPurchase(double total, ReadableArray items, ReadableMap dataFields) {
+  public void trackPurchase(double total, ReadableArray items, @Nullable ReadableMap dataFields) {
     moduleImpl.trackPurchase(total, items, dataFields);
   }
 
   @Override
-  public void trackPushOpenWithCampaignId(double campaignId, Double templateId, String messageId, boolean appAlreadyRunning, ReadableMap dataFields) {
+  public void trackPushOpenWithCampaignId(double campaignId, @Nullable Double templateId, String messageId, boolean appAlreadyRunning, @Nullable ReadableMap dataFields) {
     moduleImpl.trackPushOpenWithCampaignId(campaignId, templateId, messageId, appAlreadyRunning, dataFields);
   }
 
   @Override
-  public void updateSubscriptions(ReadableArray emailListIds, ReadableArray unsubscribedChannelIds, ReadableArray unsubscribedMessageTypeIds, ReadableArray subscribedMessageTypeIds, double campaignId, double templateId) {
+  public void updateSubscriptions(@Nullable ReadableArray emailListIds, @Nullable ReadableArray unsubscribedChannelIds, @Nullable ReadableArray unsubscribedMessageTypeIds, @Nullable ReadableArray subscribedMessageTypeIds, double campaignId, double templateId) {
     moduleImpl.updateSubscriptions(emailListIds, unsubscribedChannelIds, unsubscribedMessageTypeIds, subscribedMessageTypeIds, campaignId, templateId);
   }
 
@@ -121,7 +121,7 @@ public void getAttributionInfo(Promise promise) {
   }
 
   @Override
-  public void setAttributionInfo(ReadableMap attributionInfoReadableMap) {
+  public void setAttributionInfo(@Nullable ReadableMap attributionInfoReadableMap) {
     moduleImpl.setAttributionInfo(attributionInfoReadableMap);
   }
 
@@ -185,7 +185,6 @@ public void setAutoDisplayPaused(final boolean paused) {
     moduleImpl.setAutoDisplayPaused(paused);
   }
 
-  @Override
   public void wakeApp() {
     moduleImpl.wakeApp();
   }
@@ -200,7 +199,6 @@ public void endSession() {
     moduleImpl.endSession();
   }
 
-  @Override
   public void updateVisibleRows(ReadableArray visibleRows) {
     moduleImpl.updateVisibleRows(visibleRows);
   }
@@ -215,8 +213,7 @@ public void removeListeners(double count) {
     moduleImpl.removeListeners(count);
   }
 
-  @Override
-  public void passAlongAuthToken(String authToken) {
+  public void passAlongAuthToken(@Nullable String authToken) {
     moduleImpl.passAlongAuthToken(authToken);
   }
 

android/src/oldarch/java/com/RNIterableAPIModule.java

@@ -34,8 +34,8 @@ public void initializeWithApiKey(String apiKey, ReadableMap configReadableMap, S
     }
 
     @ReactMethod
-    public void initialize2WithApiKey(String apiKey, ReadableMap configReadableMap, String apiEndPointOverride, String version, Promise promise) {
-      moduleImpl.initialize2WithApiKey(apiKey, configReadableMap, apiEndPointOverride, version, promise);
+    public void initialize2WithApiKey(String apiKey, ReadableMap configReadableMap, String version, String apiEndPointOverride, Promise promise) {
+      moduleImpl.initialize2WithApiKey(apiKey, configReadableMap, version, apiEndPointOverride, promise);
     }
 
     @ReactMethod
@@ -74,7 +74,7 @@ public void getUserId(Promise promise) {
     }
 
     @ReactMethod
-    public void trackEvent(String name, ReadableMap dataFields) {
+    public void trackEvent(String name, @Nullable ReadableMap dataFields) {
       moduleImpl.trackEvent(name, dataFields);
     }
 
@@ -84,17 +84,17 @@ public void updateCart(ReadableArray items) {
     }
 
     @ReactMethod
-    public void trackPurchase(double total, ReadableArray items, ReadableMap dataFields) {
+    public void trackPurchase(double total, ReadableArray items, @Nullable ReadableMap dataFields) {
       moduleImpl.trackPurchase(total, items, dataFields);
     }
 
     @ReactMethod
-    public void trackPushOpenWithCampaignId(double campaignId, Double templateId, String messageId, boolean appAlreadyRunning, ReadableMap dataFields) {
+    public void trackPushOpenWithCampaignId(double campaignId, @Nullable Double templateId, String messageId, boolean appAlreadyRunning, @Nullable ReadableMap dataFields) {
       moduleImpl.trackPushOpenWithCampaignId(campaignId, templateId, messageId, appAlreadyRunning, dataFields);
     }
 
     @ReactMethod
-    public void updateSubscriptions(ReadableArray emailListIds, ReadableArray unsubscribedChannelIds, ReadableArray unsubscribedMessageTypeIds, ReadableArray subscribedMessageTypeIds, double campaignId, double templateId) {
+    public void updateSubscriptions(@Nullable ReadableArray emailListIds, @Nullable ReadableArray unsubscribedChannelIds, @Nullable ReadableArray unsubscribedMessageTypeIds, @Nullable ReadableArray subscribedMessageTypeIds, double campaignId, double templateId) {
       moduleImpl.updateSubscriptions(emailListIds, unsubscribedChannelIds, unsubscribedMessageTypeIds, subscribedMessageTypeIds, campaignId, templateId);
     }
 
@@ -124,7 +124,7 @@ public void getAttributionInfo(Promise promise) {
     }
 
     @ReactMethod
-    public void setAttributionInfo(ReadableMap attributionInfoReadableMap) {
+    public void setAttributionInfo(@Nullable ReadableMap attributionInfoReadableMap) {
       moduleImpl.setAttributionInfo(attributionInfoReadableMap);
     }
 
@@ -219,7 +219,7 @@ public void removeListeners(double count) {
     }
 
     @ReactMethod
-    public void passAlongAuthToken(String authToken) {
+    public void passAlongAuthToken(@Nullable String authToken) {
       moduleImpl.passAlongAuthToken(authToken);
     }