From 91e22248f8273ee3e69273b93c4a608af1f5adb7 Mon Sep 17 00:00:00 2001 From: anush Date: Tue, 23 Apr 2024 15:07:16 +0530 Subject: [PATCH 1/2] task(SDK-3795) - Fixes NPE - Adds null check before string comparison --- .../java/com/clevertap/android/sdk/inapp/InAppController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java b/clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java index 2086632f0..e6cb58bff 100644 --- a/clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java +++ b/clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java @@ -706,7 +706,7 @@ private static void showInApp(Context context, final CTInAppNotification inAppNo return; } - boolean isHtmlType = inAppNotification.getType().equals(Constants.KEY_CUSTOM_HTML); + boolean isHtmlType = inAppNotification.getType() != null && inAppNotification.getType().equals(Constants.KEY_CUSTOM_HTML); if (isHtmlType && !NetworkManager.isNetworkOnline(context)) { Logger.d(config.getAccountId(), "Not showing HTML InApp due to no internet. An active internet connection is required to display the HTML InApp"); From cb4d98e4a1809ca171c0be70954e259b916f1536 Mon Sep 17 00:00:00 2001 From: anush Date: Tue, 30 Apr 2024 12:32:35 +0530 Subject: [PATCH 2/2] task(SDK-3795) - Resolves comments --- .../java/com/clevertap/android/sdk/inapp/InAppController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java b/clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java index e6cb58bff..07bea7adf 100644 --- a/clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java +++ b/clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java @@ -706,7 +706,8 @@ private static void showInApp(Context context, final CTInAppNotification inAppNo return; } - boolean isHtmlType = inAppNotification.getType() != null && inAppNotification.getType().equals(Constants.KEY_CUSTOM_HTML); + String inAppNotificationType = inAppNotification.getType(); + boolean isHtmlType = inAppNotificationType != null && inAppNotificationType.equals(Constants.KEY_CUSTOM_HTML); if (isHtmlType && !NetworkManager.isNetworkOnline(context)) { Logger.d(config.getAccountId(), "Not showing HTML InApp due to no internet. An active internet connection is required to display the HTML InApp");