Skip to content

Commit 560a8c5

Browse files
committed
refactor: update parameter types to nullable in RNIterableAPI for consistency
1 parent f9aa273 commit 560a8c5

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public void getUserId(Promise promise) {
172172
promise.resolve(RNIterableInternal.getUserId());
173173
}
174174

175-
public void trackEvent(String name, ReadableMap dataFields) {
175+
public void trackEvent(String name, @Nullable ReadableMap dataFields) {
176176
IterableLogger.v(TAG, "trackEvent");
177177
IterableApi.getInstance().track(name, optSerializedDataFields(dataFields));
178178
}
@@ -182,16 +182,16 @@ public void updateCart(ReadableArray items) {
182182
IterableApi.getInstance().updateCart(Serialization.commerceItemsFromReadableArray(items));
183183
}
184184

185-
public void trackPurchase(double total, ReadableArray items, ReadableMap dataFields) {
185+
public void trackPurchase(double total, ReadableArray items, @Nullable ReadableMap dataFields) {
186186
IterableLogger.v(TAG, "trackPurchase");
187187
IterableApi.getInstance().trackPurchase(total, Serialization.commerceItemsFromReadableArray(items), optSerializedDataFields(dataFields));
188188
}
189189

190190
public void trackPushOpenWithCampaignId(double campaignId, @Nullable Double templateId, String messageId, boolean appAlreadyRunning, @Nullable ReadableMap dataFields) {
191-
RNIterableInternal.trackPushOpenWithCampaignId((int) campaignId, templateId != null ? (int) templateId : null, messageId, optSerializedDataFields(dataFields));
191+
RNIterableInternal.trackPushOpenWithCampaignId((int) campaignId, templateId != null ? templateId.intValue() : null, messageId, optSerializedDataFields(dataFields));
192192
}
193193

194-
public void updateSubscriptions(ReadableArray emailListIds, ReadableArray unsubscribedChannelIds, ReadableArray unsubscribedMessageTypeIds, ReadableArray subscribedMessageTypeIds, double campaignId, double templateId) {
194+
public void updateSubscriptions(@Nullable ReadableArray emailListIds, @Nullable ReadableArray unsubscribedChannelIds, @Nullable ReadableArray unsubscribedMessageTypeIds, @Nullable ReadableArray subscribedMessageTypeIds, double campaignId, double templateId) {
195195
IterableLogger.v(TAG, "updateSubscriptions");
196196
Integer finalCampaignId = null, finalTemplateId = null;
197197
if (campaignId > 0) {
@@ -270,7 +270,7 @@ public void getAttributionInfo(Promise promise) {
270270
}
271271
}
272272

273-
public void setAttributionInfo(ReadableMap attributionInfoReadableMap) {
273+
public void setAttributionInfo(@Nullable ReadableMap attributionInfoReadableMap) {
274274
IterableLogger.printInfo();
275275
try {
276276
JSONObject attributionInfoJson = Serialization.convertMapToJson(attributionInfoReadableMap);
@@ -598,7 +598,7 @@ public void removeListeners(double count) {
598598
// Keep: Required for RN built in Event Emitter Calls.
599599
}
600600

601-
public void passAlongAuthToken(String authToken) {
601+
public void passAlongAuthToken(@Nullable String authToken) {
602602
passedAuthToken = authToken;
603603

604604
if (authHandlerCallbackLatch != null) {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void getUserId(Promise promise) {
7777
}
7878

7979
@Override
80-
public void trackEvent(String name, ReadableMap dataFields) {
80+
public void trackEvent(String name, @Nullable ReadableMap dataFields) {
8181
moduleImpl.trackEvent(name, dataFields);
8282
}
8383

@@ -87,7 +87,7 @@ public void updateCart(ReadableArray items) {
8787
}
8888

8989
@Override
90-
public void trackPurchase(double total, ReadableArray items, ReadableMap dataFields) {
90+
public void trackPurchase(double total, ReadableArray items, @Nullable ReadableMap dataFields) {
9191
moduleImpl.trackPurchase(total, items, dataFields);
9292
}
9393

@@ -97,7 +97,7 @@ public void trackPushOpenWithCampaignId(double campaignId, @Nullable Double temp
9797
}
9898

9999
@Override
100-
public void updateSubscriptions(ReadableArray emailListIds, ReadableArray unsubscribedChannelIds, ReadableArray unsubscribedMessageTypeIds, ReadableArray subscribedMessageTypeIds, double campaignId, double templateId) {
100+
public void updateSubscriptions(@Nullable ReadableArray emailListIds, @Nullable ReadableArray unsubscribedChannelIds, @Nullable ReadableArray unsubscribedMessageTypeIds, @Nullable ReadableArray subscribedMessageTypeIds, double campaignId, double templateId) {
101101
moduleImpl.updateSubscriptions(emailListIds, unsubscribedChannelIds, unsubscribedMessageTypeIds, subscribedMessageTypeIds, campaignId, templateId);
102102
}
103103

@@ -127,7 +127,7 @@ public void getAttributionInfo(Promise promise) {
127127
}
128128

129129
@Override
130-
public void setAttributionInfo(ReadableMap attributionInfoReadableMap) {
130+
public void setAttributionInfo(@Nullable ReadableMap attributionInfoReadableMap) {
131131
moduleImpl.setAttributionInfo(attributionInfoReadableMap);
132132
}
133133

@@ -219,7 +219,7 @@ public void removeListeners(double count) {
219219
moduleImpl.removeListeners(count);
220220
}
221221

222-
public void passAlongAuthToken(String authToken) {
222+
public void passAlongAuthToken(@Nullable String authToken) {
223223
moduleImpl.passAlongAuthToken(authToken);
224224
}
225225

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void getUserId(Promise promise) {
7777
}
7878

7979
@ReactMethod
80-
public void trackEvent(String name, ReadableMap dataFields) {
80+
public void trackEvent(String name, @Nullable ReadableMap dataFields) {
8181
moduleImpl.trackEvent(name, dataFields);
8282
}
8383

@@ -87,7 +87,7 @@ public void updateCart(ReadableArray items) {
8787
}
8888

8989
@ReactMethod
90-
public void trackPurchase(double total, ReadableArray items, ReadableMap dataFields) {
90+
public void trackPurchase(double total, ReadableArray items, @Nullable ReadableMap dataFields) {
9191
moduleImpl.trackPurchase(total, items, dataFields);
9292
}
9393

@@ -97,7 +97,7 @@ public void trackPushOpenWithCampaignId(double campaignId, @Nullable Double temp
9797
}
9898

9999
@ReactMethod
100-
public void updateSubscriptions(ReadableArray emailListIds, ReadableArray unsubscribedChannelIds, ReadableArray unsubscribedMessageTypeIds, ReadableArray subscribedMessageTypeIds, double campaignId, double templateId) {
100+
public void updateSubscriptions(@Nullable ReadableArray emailListIds, @Nullable ReadableArray unsubscribedChannelIds, @Nullable ReadableArray unsubscribedMessageTypeIds, @Nullable ReadableArray subscribedMessageTypeIds, double campaignId, double templateId) {
101101
moduleImpl.updateSubscriptions(emailListIds, unsubscribedChannelIds, unsubscribedMessageTypeIds, subscribedMessageTypeIds, campaignId, templateId);
102102
}
103103

@@ -127,7 +127,7 @@ public void getAttributionInfo(Promise promise) {
127127
}
128128

129129
@ReactMethod
130-
public void setAttributionInfo(ReadableMap attributionInfoReadableMap) {
130+
public void setAttributionInfo(@Nullable ReadableMap attributionInfoReadableMap) {
131131
moduleImpl.setAttributionInfo(attributionInfoReadableMap);
132132
}
133133

@@ -222,7 +222,7 @@ public void removeListeners(double count) {
222222
}
223223

224224
@ReactMethod
225-
public void passAlongAuthToken(String authToken) {
225+
public void passAlongAuthToken(@Nullable String authToken) {
226226
moduleImpl.passAlongAuthToken(authToken);
227227
}
228228

0 commit comments

Comments
 (0)