Skip to content

Commit d026992

Browse files
authored
Merge pull request #738 from Iterable/MOB-8445
MOB-8445
2 parents fa056fe + e37178a commit d026992

File tree

1 file changed

+26
-5
lines changed

1 file changed

+26
-5
lines changed

iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -870,11 +870,7 @@ public void inAppConsume(@NonNull String messageId) {
870870
*/
871871
public void inAppConsume(@NonNull String messageId, @Nullable IterableHelper.SuccessHandler successHandler, @Nullable IterableHelper.FailureHandler failureHandler) {
872872
IterableInAppMessage message = getInAppManager().getMessageById(messageId);
873-
if (message == null) {
874-
IterableLogger.e(TAG, "inAppConsume: message is null");
875-
if (failureHandler != null) {
876-
failureHandler.onFailure("inAppConsume: message is null", null);
877-
}
873+
if (checkIfMessageIsNull(message, failureHandler)) {
878874
return;
879875
}
880876
inAppConsume(message, null, null, successHandler, failureHandler);
@@ -894,6 +890,9 @@ public void inAppConsume(@NonNull IterableInAppMessage message, @Nullable Iterab
894890
if (!checkSDKInitialization()) {
895891
return;
896892
}
893+
if (checkIfMessageIsNull(message, null)) {
894+
return;
895+
}
897896
apiClient.inAppConsume(message, source, clickLocation, inboxSessionId, null, null);
898897
}
899898

@@ -912,9 +911,31 @@ public void inAppConsume(@NonNull IterableInAppMessage message, @Nullable Iterab
912911
if (!checkSDKInitialization()) {
913912
return;
914913
}
914+
if (checkIfMessageIsNull(message, failureHandler)) {
915+
return;
916+
}
915917
apiClient.inAppConsume(message, source, clickLocation, inboxSessionId, successHandler, failureHandler);
916918
}
917919

920+
/**
921+
* Handles the case when the provided message is null.
922+
* If the message is null and a failure handler is provided, it calls the onFailure method of the failure handler.
923+
*
924+
* @param message The in-app message to be checked.
925+
* @param failureHandler The failure handler to be called if the message is null.
926+
* @return True if the message is null, false otherwise.
927+
*/
928+
private boolean checkIfMessageIsNull(@Nullable IterableInAppMessage message, @Nullable IterableHelper.FailureHandler failureHandler) {
929+
if (message == null) {
930+
IterableLogger.e(TAG, "inAppConsume: message is null");
931+
if (failureHandler != null) {
932+
failureHandler.onFailure("inAppConsume: message is null", null);
933+
}
934+
return true;
935+
}
936+
return false;
937+
}
938+
918939
/**
919940
* Tracks a click on the uri if it is an iterable link.
920941
* @param uri the

0 commit comments

Comments
 (0)