Skip to content

Commit 3ccee65

Browse files
committed
refactor inAppConsume
1 parent ad2aee2 commit 3ccee65

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

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

Lines changed: 18 additions & 7 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 (handleNullMessage(message, failureHandler)) {
878874
return;
879875
}
880876
inAppConsume(message, null, null, successHandler, failureHandler);
@@ -916,14 +912,29 @@ public void inAppConsume(@NonNull IterableInAppMessage message, @Nullable Iterab
916912
if (!checkSDKInitialization()) {
917913
return;
918914
}
915+
if (handleNullMessage(message, failureHandler)) {
916+
return;
917+
}
918+
apiClient.inAppConsume(message, source, clickLocation, inboxSessionId, successHandler, failureHandler);
919+
}
920+
921+
/**
922+
* Handles the case when the provided message is null.
923+
* If the message is null and a failure handler is provided, it calls the onFailure method of the failure handler.
924+
*
925+
* @param message The in-app message to be checked.
926+
* @param failureHandler The failure handler to be called if the message is null.
927+
* @return True if the message is null, false otherwise.
928+
*/
929+
private boolean handleNullMessage(@Nullable IterableInAppMessage message, @Nullable IterableHelper.FailureHandler failureHandler) {
919930
if (message == null) {
920931
IterableLogger.e(TAG, "inAppConsume: message is null");
921932
if (failureHandler != null) {
922933
failureHandler.onFailure("inAppConsume: message is null", null);
923934
}
924-
return;
935+
return true;
925936
}
926-
apiClient.inAppConsume(message, source, clickLocation, inboxSessionId, successHandler, failureHandler);
937+
return false;
927938
}
928939

929940
/**

0 commit comments

Comments
 (0)