author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
116,616 | 20.07.2022 14:14:24 | -19,080 | 39bd3dc6e8aa0ca8b6e74f43c6bb2234e4ff85a5 | fix(SDK-1772)-Fix added to handle web link from CTA in TemplateRenderer.kt | [
{
"change_type": "MODIFY",
"old_path": "clevertap-pushtemplates/src/main/java/com/clevertap/android/pushtemplates/TemplateRenderer.kt",
"new_path": "clevertap-pushtemplates/src/main/java/com/clevertap/android/pushtemplates/TemplateRenderer.kt",
"diff": "@@ -487,14 +487,18 @@ class TemplateRenderer : INotificationRenderer {\nConstants.KEY_CT_TYPE,\nCTNotificationIntentService.TYPE_BUTTON_CLICK\n)\n- if (!dl.isEmpty()) {\n+ if (dl.isNotEmpty()) {\nactionLaunchIntent.putExtra(\"dl\", dl)\n}\n} else {\n- actionLaunchIntent = if (!dl.isEmpty()) {\n- Intent(Intent.ACTION_VIEW, Uri.parse(dl))\n+ if (dl.isNotEmpty()) {\n+ actionLaunchIntent = Intent(Intent.ACTION_VIEW, Uri.parse(dl))\n+ Utils.setPackageNameFromResolveInfoList(\n+ context,\n+ actionLaunchIntent\n+ )\n} else {\n- context.packageManager\n+ actionLaunchIntent = context.packageManager\n.getLaunchIntentForPackage(context.packageName)\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(SDK-1772)-Fix added to handle web link from CTA in TemplateRenderer.kt |
116,616 | 20.07.2022 14:17:49 | -19,080 | 144510dbb5c4d9beab04f607abbe4211600e98cf | chore(SDK-1772)-Update version name, changelog for push-templates | [
{
"change_type": "MODIFY",
"old_path": "docs/CTPUSHTEMPLATES.md",
"new_path": "docs/CTPUSHTEMPLATES.md",
"diff": "@@ -20,7 +20,7 @@ CleverTap Push Templates SDK helps you engage with your users using fancy push n\n1. Add the dependencies to the `build.gradle`\n```groovy\n-implementation \"com.clevertap.android:push-templates:1.0.2\"\n+implementation \"com.clevertap.android:push-templates:1.0.3\"\nimplementation \"com.clevertap.android:clevertap-android-sdk:4.5.2\" // 4.4.0 and above\n```\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTPUSHTEMPLATESCHANGELOG.md",
"new_path": "docs/CTPUSHTEMPLATESCHANGELOG.md",
"diff": "## CleverTap Push Templates SDK CHANGE LOG\n+### Version 1.0.3 (July 21, 2022)\n+* Fixes a bug for notification CTA deeplink - On clicking notification CTA, deeplink launches third party app instead of X app even though X app is capable of handling deeplink. For example, if X app is capable of handling https://google.com(sample link) but deeplink launches browser instead of X app.\n+\n### Version 1.0.2 (April 26, 2022)\n* UI bug fixes for Push Notification metadata\n* Timer template fixes for `title`, `title_alt` along with `pt_big_img`, `pt_big_img_alt`\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/build.gradle",
"new_path": "sample/build.gradle",
"diff": "@@ -60,7 +60,7 @@ dependencies {\n//implementation 'com.clevertap.android:clevertap-xiaomi-sdk:1.4.0'\nimplementation project(':clevertap-hms')\nimplementation project(':clevertap-pushtemplates')\n-// implementation \"com.clevertap.android:push-templates:1.0.2\"\n+// implementation \"com.clevertap.android:push-templates:1.0.3\"\n// For Huawei Push use\n//implementation 'com.clevertap.android:clevertap-hms-sdk:1.3.0'\n//implementation 'com.huawei.hms:push:6.3.0.304'\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTPUSHTEMPLATESCHANGELOG.md",
"new_path": "templates/CTPUSHTEMPLATESCHANGELOG.md",
"diff": "## CleverTap Push Templates SDK CHANGE LOG\n+### Version 1.0.3 (July 21, 2022)\n+* Fixes a bug for notification CTA deeplink - On clicking notification CTA, deeplink launches third party app instead of X app even though X app is capable of handling deeplink. For example, if X app is capable of handling https://google.com(sample link) but deeplink launches browser instead of X app.\n+\n### Version 1.0.2 (April 26, 2022)\n* UI bug fixes for Push Notification metadata\n* Timer template fixes for `title`, `title_alt` along with `pt_big_img`, `pt_big_img_alt`\n"
},
{
"change_type": "MODIFY",
"old_path": "versions.properties",
"new_path": "versions.properties",
"diff": "@@ -324,7 +324,7 @@ version.com.clevertap.android..clevertap-android-sdk=4.5.2\nversion.com.clevertap.android..clevertap-geofence-sdk=1.1.0\nversion.com.clevertap.android..clevertap-hms-sdk=1.3.0\nversion.com.clevertap.android..clevertap-xiaomi-sdk=1.4.0\n-version.com.clevertap.android..push-templates=1.0.2\n+version.com.clevertap.android..push-templates=1.0.3\nversion.com.github.bumptech.glide..glide=4.12.0\n## # available=4.12.0\nversion.com.google.android.exoplayer..exoplayer=2.15.1\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(SDK-1772)-Update version name, changelog for push-templates |
116,616 | 22.07.2022 12:32:45 | -19,080 | 07d910bf9d38e303a93727c9dd73b09b0fa35dd4 | fix(SDK-1804)-Add fix to not dismiss notification when DOC is false for InputBox template in OS >= 12. | [
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/NotificationUtils.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/NotificationUtils.kt",
"diff": "@@ -4,17 +4,29 @@ import android.app.NotificationManager\nimport android.content.Context\nimport android.content.Intent\nimport android.util.Log\n+import com.clevertap.android.pushtemplates.PTConstants\nobject NotificationUtils {\n//Require to close notification on action button click\nfun dismissNotification(intent: Intent?, applicationContext: Context){\nintent?.extras?.apply {\n+ var autoCancel = true\n+ var notificationId = -1\n+\ngetString(\"actionId\")?.let {\nLog.d(\"ACTION_ID\", it)\n- val autoCancel = getBoolean(\"autoCancel\", true)\n- val notificationId = getInt(\"notificationId\", -1)\n- if (autoCancel && notificationId > -1) {\n+ autoCancel = getBoolean(\"autoCancel\", true)\n+ notificationId = getInt(\"notificationId\", -1)\n+ }\n+ /**\n+ * If using InputBox template, add ptDismissOnClick flag to not dismiss notification\n+ * if pt_dismiss_on_click is false in InputBox template payload. Alternatively if normal\n+ * notification is raised then we dismiss notification.\n+ */\n+ val ptDismissOnClick = intent.extras!!.getString(PTConstants.PT_DISMISS_ON_CLICK,\"\")\n+\n+ if (autoCancel && notificationId > -1 && ptDismissOnClick.isNullOrEmpty()) {\nval notifyMgr: NotificationManager =\napplicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager\nnotifyMgr.cancel(notificationId)\n@@ -22,4 +34,3 @@ object NotificationUtils {\n}\n}\n}\n\\ No newline at end of file\n-}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(SDK-1804)-Add fix to not dismiss notification when DOC is false for InputBox template in OS >= 12. |
116,616 | 22.07.2022 12:34:13 | -19,080 | 95c258ec644dd852f1ecbea0c481441698c897cb | fix(SDK-1804)-Add fix to not dismiss notification when DOC is false for InputBox template in OS less than 12. | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/CTNotificationIntentService.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/CTNotificationIntentService.java",
"diff": "@@ -109,7 +109,9 @@ public class CTNotificationIntentService extends IntentService {\nlaunchIntent.putExtras(extras);\nlaunchIntent.removeExtra(\"dl\");\n- if (autoCancel && notificationId > -1) {\n+ String ptDismissOnClick = extras.getString(\"pt_dismiss_on_click\",\"\");\n+\n+ if (autoCancel && notificationId > -1 && ptDismissOnClick.isEmpty()) {\nNotificationManager notificationManager =\n(NotificationManager) getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE);\nif (notificationManager != null) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(SDK-1804)-Add fix to not dismiss notification when DOC is false for InputBox template in OS less than 12. |
116,616 | 22.07.2022 17:04:43 | -19,080 | 10d5e95f093e2bc1abf24fa7e78eabf34a5c9da2 | fix(SDK-1808)-Fixes push impressions not raised issue for TimerTemplate | [
{
"change_type": "MODIFY",
"old_path": "clevertap-pushtemplates/src/main/java/com/clevertap/android/pushtemplates/TemplateRenderer.kt",
"new_path": "clevertap-pushtemplates/src/main/java/com/clevertap/android/pushtemplates/TemplateRenderer.kt",
"diff": "@@ -222,7 +222,6 @@ class TemplateRenderer : INotificationRenderer {\n@RequiresApi(Build.VERSION_CODES.M)\nprivate fun timerRunner(context: Context, extras: Bundle, notificationId: Int, delay: Int?) {\nval handler = Handler(Looper.getMainLooper())\n- extras.remove(\"wzrk_rnv\")\nif (delay != null) {\n@@ -234,6 +233,7 @@ class TemplateRenderer : INotificationRenderer {\n) {\nval applicationContext = context.applicationContext\nval basicTemplateBundle = extras.clone() as Bundle\n+ basicTemplateBundle.remove(\"wzrk_rnv\")\nbasicTemplateBundle.putString(Constants.WZRK_PUSH_ID, null) // skip dupe check\nbasicTemplateBundle.putString(PTConstants.PT_ID, \"pt_basic\") // set to basic\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(SDK-1808)-Fixes push impressions not raised issue for TimerTemplate |
116,616 | 22.07.2022 17:05:15 | -19,080 | ec59b7c9457ff93232b5d2fe42f543397964a514 | chore(SDK-1808)-Updates Changelog.md for pt release | [
{
"change_type": "MODIFY",
"old_path": "docs/CTPUSHTEMPLATESCHANGELOG.md",
"new_path": "docs/CTPUSHTEMPLATESCHANGELOG.md",
"diff": "### Version 1.0.3 (July 22, 2022)\n* Fixes a bug for notification CTA deeplink for Android 12 and above devices - On clicking notification CTA, deeplink launches third party app instead of X app even though X app is capable of handling deeplink. For example, if X app is capable of handling https://google.com(sample link) but deeplink launches browser instead of X app.\n+* Fixes push impression not raised bug for TimerTemplate\n### Version 1.0.2 (April 26, 2022)\n* UI bug fixes for Push Notification metadata\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTPUSHTEMPLATESCHANGELOG.md",
"new_path": "templates/CTPUSHTEMPLATESCHANGELOG.md",
"diff": "### Version 1.0.3 (July 22, 2022)\n* Fixes a bug for notification CTA deeplink for Android 12 and above devices - On clicking notification CTA, deeplink launches third party app instead of X app even though X app is capable of handling deeplink. For example, if X app is capable of handling https://google.com(sample link) but deeplink launches browser instead of X app.\n+* Fixes push impression not raised bug for TimerTemplate\n### Version 1.0.2 (April 26, 2022)\n* UI bug fixes for Push Notification metadata\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(SDK-1808)-Updates Changelog.md for pt release |
116,616 | 22.07.2022 17:26:26 | -19,080 | dad2c1c0ca9ce11e6fa18cbbe33b1651dbc94e89 | chore(SDK-1808)-Updates Changelog.md | [
{
"change_type": "MODIFY",
"old_path": "docs/CTPUSHTEMPLATESCHANGELOG.md",
"new_path": "docs/CTPUSHTEMPLATESCHANGELOG.md",
"diff": "### Version 1.0.3 (July 22, 2022)\n* Fixes a bug for notification CTA deeplink for Android 12 and above devices - On clicking notification CTA, deeplink launches third party app instead of X app even though X app is capable of handling deeplink. For example, if X app is capable of handling https://google.com(sample link) but deeplink launches browser instead of X app.\n-* Fixes push impression not raised bug for TimerTemplate\n+* Fixes push impression not raised bug for Timer template\n### Version 1.0.2 (April 26, 2022)\n* UI bug fixes for Push Notification metadata\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTPUSHTEMPLATESCHANGELOG.md",
"new_path": "templates/CTPUSHTEMPLATESCHANGELOG.md",
"diff": "### Version 1.0.3 (July 22, 2022)\n* Fixes a bug for notification CTA deeplink for Android 12 and above devices - On clicking notification CTA, deeplink launches third party app instead of X app even though X app is capable of handling deeplink. For example, if X app is capable of handling https://google.com(sample link) but deeplink launches browser instead of X app.\n-* Fixes push impression not raised bug for TimerTemplate\n+* Fixes push impression not raised bug for Timer template\n### Version 1.0.2 (April 26, 2022)\n* UI bug fixes for Push Notification metadata\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(SDK-1808)-Updates Changelog.md |
116,612 | 27.07.2022 10:18:53 | -19,080 | b852e88195a7c742c93ac680acd5c27d01bd768d | feat(SDK-1736): reduce c2dm priority and handle push synchronization | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -199,11 +199,25 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\npublic static void createNotification(final Context context, final Bundle extras, final int notificationId) {\nCleverTapAPI instance = fromBundle(context, extras);\nif (instance != null) {\n+\n+ CoreState coreState = instance.coreState;\n+ CleverTapInstanceConfig config = coreState.getConfig();\n+\ntry {\n- instance.coreState.getPushProviders().setPushNotificationRenderer(new CoreNotificationRenderer());\n- instance.coreState.getPushProviders()._createNotification(context, extras, notificationId);\n+ Task<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n+ task.execute(\"CleverTapAPI#createNotification\",\n+ new Callable<Void>() {\n+ @Override\n+ public Void call() {\n+ synchronized (coreState.getPushProviders().getPushRenderingLock()) {\n+ coreState.getPushProviders().setPushNotificationRenderer(new CoreNotificationRenderer());\n+ coreState.getPushProviders()._createNotification(context, extras, notificationId);\n+ }\n+ return null;\n+ }\n+ });\n} catch (Throwable t) {\n- // no-op\n+ config.getLogger().debug(config.getAccountId(), \"Failed to process createNotification()\", t);\n}\n}\n}\n@@ -2843,16 +2857,36 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n});\n}\n+ //TODO: start synchronizing entire flow from here\npublic void renderPushNotification(@NonNull INotificationRenderer iNotificationRenderer, Context context,\nBundle extras) {\n+\n+ CleverTapInstanceConfig config = coreState.getConfig();\n+\n+ try {\n+ Task<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n+ task.execute(\"CleverTapAPI#renderPushNotification\",\n+ new Callable<Void>() {\n+ @Override\n+ public Void call() {\n+ synchronized (coreState.getPushProviders().getPushRenderingLock()) {\ncoreState.getPushProviders().setPushNotificationRenderer(iNotificationRenderer);\nif (extras != null && extras.containsKey(Constants.PT_NOTIF_ID)) {\n- coreState.getPushProviders()._createNotification(context, extras, extras.getInt(Constants.PT_NOTIF_ID));\n+ coreState.getPushProviders()\n+ ._createNotification(context, extras, extras.getInt(Constants.PT_NOTIF_ID));\n} else {\ncoreState.getPushProviders()._createNotification(context, extras, Constants.EMPTY_NOTIFICATION_ID);\n}\n}\n+ return null;\n+ }\n+ });\n+ } catch (Throwable t) {\n+ config.getLogger().debug(config.getAccountId(), \"Failed to process renderPushNotification()\", t);\n+ }\n+\n+ }\n/**\n* Use this method if you want to run xiaomi sdk all devices, xiaomi only devices or turn off push on all devices.\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "@@ -652,49 +652,13 @@ public final class Utils {\nreturn parts[0] + \".\" + AUTH + \".\" + parts[1];\n}\n- public static boolean isGoodState(final Context context) {\n- /**\n- * Render data notification irrespective of screen lock. FCM sdk renders notif payload in state of\n- * locked screen and passes to onmessagereceive if unlocked screen\n- */\n- /*KeyguardManager keyguardManager =\n- (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);\n- if (keyguardManager.inKeyguardRestrictedInputMode()) {\n- return false; // Screen is off or lock screen is showing\n- }*/\n- // Screen is on and unlocked, now check if the process is in the foreground\n-\n- if (!PlatformVersion.isAtLeastLollipop()) {\n- // Before L the process has IMPORTANCE_FOREGROUND while it executes BroadcastReceivers.\n- // As soon as the service is started the BroadcastReceiver should stop.\n- // UNFORTUNATELY the system might not have had the time to downgrade the process\n- // (this is happening consistently in JellyBean).\n- // With SystemClock.sleep(10) we tell the system to give a little bit more of CPU\n- // to the main thread (this code is executing on a secondary thread) allowing the\n- // BroadcastReceiver to exit the onReceive() method and downgrade the process priority.\n- SystemClock.sleep(10);\n- }\n- int pid = Process.myPid();\n- ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);\n- List<RunningAppProcessInfo> appProcesses = am.getRunningAppProcesses();\n- if (appProcesses != null) {\n- for (RunningAppProcessInfo process : appProcesses) {\n- if (process.pid == pid) {\n- return process.importance == RunningAppProcessInfo.IMPORTANCE_FOREGROUND;\n- }\n- }\n- }\n- return false;\n- }\n-\npublic static boolean isRenderFallback(RemoteMessage remoteMessage, Context context) {\nboolean renderRateKillSwitch = Boolean\n.parseBoolean(remoteMessage.getData().get(Constants.WZRK_TSR_FB));//tsrfb\nboolean renderRateFallback = Boolean\n.parseBoolean(remoteMessage.getData().get(Constants.NOTIFICATION_RENDER_FALLBACK));\n- boolean isGoodState = Utils.isGoodState(context);\n- return !renderRateKillSwitch && !isGoodState && renderRateFallback;\n+ return !renderRateKillSwitch && renderRateFallback;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -90,6 +90,7 @@ public class PushProviders implements CTPushProviderListener {\nprivate final ValidationResultStack validationResultStack;\nprivate final Object tokenLock = new Object();\n+ private final Object pushRenderingLock = new Object();\nprivate DevicePushTokenRefreshListener tokenRefreshListener;\n@@ -142,36 +143,32 @@ public class PushProviders implements CTPushProviderListener {\npublic void _createNotification(final Context context, final Bundle extras, final int notificationId) {\nif (extras == null || extras.get(Constants.NOTIFICATION_TAG) == null) {\nreturn;\n- } // Common\n+ }\nif (config.isAnalyticsOnly()) {\nconfig.getLogger()\n- .debug(config.getAccountId(), \"Instance is set for Analytics only, cannot create notification\");\n+ .debug(config.getAccountId(),\n+ \"Instance is set for Analytics only, cannot create notification\");\nreturn;\n- }// Common\n+ }\n- try {\n- Task<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();// Common task\n- task.execute(\"CleverTapAPI#_createNotification\", new Callable<Void>() {\n- @Override\n- public Void call() {\ntry {\nString extrasFrom = extras.getString(Constants.EXTRAS_FROM);\nif (extrasFrom == null || !extrasFrom.equals(\"PTReceiver\")) {\nconfig.getLogger()\n- .debug(config.getAccountId(), \"Handling notification: \" + extras.toString());\n+ .debug(config.getAccountId(),\n+ \"Handling notification: \" + extras);\nif (extras.getString(Constants.WZRK_PUSH_ID) != null) {\nif (baseDatabaseManager.loadDBAdapter(context)\n- .doesPushNotificationIdExist(extras.getString(Constants.WZRK_PUSH_ID))) {\n+ .doesPushNotificationIdExist(\n+ extras.getString(Constants.WZRK_PUSH_ID))) {\nconfig.getLogger().debug(config.getAccountId(),\n\"Push Notification already rendered, not showing again\");\n- return null;\n+ return;\n+ }\n}\n- }// Common\n- String notifMessage = iNotificationRenderer\n- .getMessage(\n- extras);//extras.getString(Constants.NOTIF_MSG);// uncommon - getMessage()\n- notifMessage = (notifMessage != null) ? notifMessage : \"\";// common\n+ String notifMessage = iNotificationRenderer.getMessage(extras);\n+ notifMessage = (notifMessage != null) ? notifMessage : \"\";\nif (notifMessage.isEmpty()) {\n//silent notification\nconfig.getLogger()\n@@ -183,12 +180,8 @@ public class PushProviders implements CTPushProviderListener {\nif (!TextUtils.isEmpty(pingFreq)) {\nupdatePingFrequencyIfNeeded(context, Integer.parseInt(pingFreq));\n}\n- return null;\n- }// Common\n- String notifTitle = iNotificationRenderer.getTitle(extras,\n- context);//extras.getString(Constants.NOTIF_TITLE, \"\");// uncommon - getTitle()\n- notifTitle = notifTitle.isEmpty() ? context.getApplicationInfo().name\n- : notifTitle;//common\n+ return;\n+ }\n}\ntriggerNotification(context, extras, notificationId);\n} catch (Throwable t) {\n@@ -198,12 +191,6 @@ public class PushProviders implements CTPushProviderListener {\nconfig.getLogger()\n.debug(config.getAccountId(), \"Couldn't render notification: \", t);\n}\n- return null;\n- }\n- });\n- } catch (Throwable t) {\n- config.getLogger().debug(config.getAccountId(), \"Failed to process push notification\", t);\n- }\n}\n/**\n@@ -964,6 +951,12 @@ public class PushProviders implements CTPushProviderListener {\nreturn iNotificationRenderer;\n}\n+ @RestrictTo(Scope.LIBRARY)\n+ public @NonNull\n+ Object getPushRenderingLock() {\n+ return pushRenderingLock;\n+ }\n+\n@RequiresApi(api = VERSION_CODES.LOLLIPOP)\nprivate static JobInfo getJobInfo(int jobId, JobScheduler jobScheduler) {\nfor (JobInfo jobInfo : jobScheduler.getAllPendingJobs()) {\n@@ -1116,8 +1109,7 @@ public class PushProviders implements CTPushProviderListener {\n//remove sound for fallback notif\n- if (iNotificationRenderer instanceof AudibleNotification)\n- {\n+ if (iNotificationRenderer instanceof AudibleNotification) {\nnb = ((AudibleNotification) iNotificationRenderer).setSound(context, extras, nb, config);\n}\n@@ -1149,12 +1141,6 @@ public class PushProviders implements CTPushProviderListener {\nreturn;\n}\n- if (Utils.isGoodState(context)) {\n- extras.putString(Constants.NOTIFICATION_HEALTH, Constants.WZRK_HEALTH_STATE_GOOD);\n- } else {\n- extras.putString(Constants.NOTIFICATION_HEALTH, Constants.WZRK_HEALTH_STATE_BAD);\n- }\n-\nanalyticsManager.pushNotificationViewedEvent(extras);\nNotificationRenderedListener notificationRenderedListener = CleverTapAPI\n.getNotificationRenderedListener();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/CTFcmMessageHandler.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/CTFcmMessageHandler.java",
"diff": "@@ -7,6 +7,7 @@ import android.content.Context;\nimport android.os.Bundle;\nimport androidx.annotation.NonNull;\nimport com.clevertap.android.sdk.CleverTapAPI;\n+import com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.interfaces.INotificationParser;\nimport com.clevertap.android.sdk.interfaces.IPushAmpHandler;\n@@ -44,6 +45,7 @@ public class CTFcmMessageHandler implements IFcmMessageHandler, IPushAmpHandler<\nBundle messageBundle = mParser.toBundle(message);\nif (messageBundle != null) {\n+ messageBundle.putString(Constants.NOTIFICATION_HEALTH, Constants.WZRK_HEALTH_STATE_GOOD);\nisSuccess = PushNotificationHandler.getPushNotificationHandler()\n.onMessageReceived(context, messageBundle, PushType.FCM.toString());\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/libs/clevertap-push-sdk-0.0.1.aar",
"new_path": "sample/libs/clevertap-push-sdk-0.0.1.aar",
"diff": "Binary files a/sample/libs/clevertap-push-sdk-0.0.1.aar and b/sample/libs/clevertap-push-sdk-0.0.1.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/AndroidManifest.xml",
"new_path": "sample/src/main/AndroidManifest.xml",
"diff": "<!-- Add meta data for CleverTap Account Id and Account Token -->\n<meta-data\nandroid:name=\"CLEVERTAP_ACCOUNT_ID\"\n- android:value=\"YOUR ACCT ID\" />\n+ android:value=\"R7R-66K-K56Z\" />\n<meta-data\nandroid:name=\"CLEVERTAP_TOKEN\"\n- android:value=\"YOUR ACCT TOKEN\" />\n+ android:value=\"366-2a2\" />\n<meta-data\nandroid:name=\"CLEVERTAP_REGION\"\nandroid:value=\"eu1\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/res/values/strings.xml",
"new_path": "sample/src/main/res/values/strings.xml",
"diff": "<string name=\"inbox\">Inbox</string>\n<string name=\"webview\">WebView</string>\n- <string name=\"xiaomi_app_key\">Your Xiaomi App Key</string>\n- <string name=\"xiaomi_app_id\">Your Xiaomi App ID</string>\n+ <string name=\"xiaomi_app_key\">5321833060115</string>\n+ <string name=\"xiaomi_app_id\">2882303761518330115</string>\n<!-- Geofence -->\n<string name=\"ok\">OK</string>\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-1736): reduce c2dm priority and handle push synchronization |
116,612 | 29.07.2022 13:44:44 | -19,080 | 73b0f754c7071c1831b5787c6b8ba2eed78bd565 | feat(SDK-1736): add nh source to push services | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -158,6 +158,9 @@ public class PushProviders implements CTPushProviderListener {\nconfig.getLogger()\n.debug(config.getAccountId(),\n\"Handling notification: \" + extras);\n+ config.getLogger()\n+ .debug(config.getAccountId(),\n+ \"Handling notification::nh source = \" + extras.getString(\"nh source\"));\nif (extras.getString(Constants.WZRK_PUSH_ID) != null) {\nif (baseDatabaseManager.loadDBAdapter(context)\n.doesPushNotificationIdExist(\n@@ -1147,6 +1150,8 @@ public class PushProviders implements CTPushProviderListener {\nif (notificationRenderedListener != null) {\nnotificationRenderedListener.onNotificationRendered(true);\n}\n+ config.getLogger()\n+ .verbose(\"Rendered Push Notification... from nh source = \" + extras.getString(\"nh source\"));\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/CTFcmMessageHandler.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/CTFcmMessageHandler.java",
"diff": "@@ -46,6 +46,9 @@ public class CTFcmMessageHandler implements IFcmMessageHandler, IPushAmpHandler<\nBundle messageBundle = mParser.toBundle(message);\nif (messageBundle != null) {\nmessageBundle.putString(Constants.NOTIFICATION_HEALTH, Constants.WZRK_HEALTH_STATE_GOOD);\n+ if (!messageBundle.containsKey(\"nh source\")) {\n+ messageBundle.putString(\"nh source\", \"FcmMessageListenerService\");\n+ }\nisSuccess = PushNotificationHandler.getPushNotificationHandler()\n.onMessageReceived(context, messageBundle, PushType.FCM.toString());\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/CTHmsMessageHandler.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/CTHmsMessageHandler.java",
"diff": "@@ -43,6 +43,9 @@ public class CTHmsMessageHandler implements IHmsMessageHandler, IPushAmpHandler<\nBundle messageBundle = mParser.toBundle(remoteMessage);\nif (messageBundle != null) {\ntry {\n+ if (!messageBundle.containsKey(\"nh source\")) {\n+ messageBundle.putString(\"nh source\", \"HuaweiMessageListenerService\");\n+ }\nisSuccess = PushNotificationHandler\n.getPushNotificationHandler().onMessageReceived(context, messageBundle, HPS.toString());\n} catch (Throwable e) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/CTXiaomiMessageHandler.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/CTXiaomiMessageHandler.java",
"diff": "@@ -54,6 +54,9 @@ public class CTXiaomiMessageHandler implements IMiMessageHandler, IPushAmpHandle\nBundle messageBundle = mParser.toBundle(message);\nif (messageBundle != null) {\ntry {\n+ if (!messageBundle.containsKey(\"nh source\")) {\n+ messageBundle.putString(\"nh source\", \"XiaomiMessageReceiver\");\n+ }\nisSuccess = PushNotificationHandler\n.getPushNotificationHandler().onMessageReceived(context, messageBundle, XPS.toString());\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/libs/clevertap-push-sdk-0.0.1.aar",
"new_path": "sample/libs/clevertap-push-sdk-0.0.1.aar",
"diff": "Binary files a/sample/libs/clevertap-push-sdk-0.0.1.aar and b/sample/libs/clevertap-push-sdk-0.0.1.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/AndroidManifest.xml",
"new_path": "sample/src/main/AndroidManifest.xml",
"diff": "<action android:name=\"com.google.firebase.MESSAGING_EVENT\" />\n</intent-filter>\n</service>\n+ <!-- <service\n+ android:name=\"com.clevertap.demo.MyFcmMessageListenerService\"\n+ android:exported=\"true\">\n+ <intent-filter>\n+ <action android:name=\"com.google.firebase.MESSAGING_EVENT\" />\n+ </intent-filter>\n+ </service>-->\n<service\nandroid:name=\"com.clevertap.android.sdk.pushnotification.CTNotificationIntentService\"\nandroid:exported=\"false\">\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/MyFcmMessageListenerService.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/MyFcmMessageListenerService.kt",
"diff": "package com.clevertap.demo\n+import android.os.Looper\n+import com.clevertap.android.sdk.CleverTapAPI\nimport com.clevertap.android.sdk.pushnotification.fcm.CTFcmMessageHandler\nimport com.google.firebase.messaging.FirebaseMessagingService\nimport com.google.firebase.messaging.RemoteMessage\n@@ -8,10 +10,14 @@ class MyFcmMessageListenerService : FirebaseMessagingService() {\noverride fun onMessageReceived(message: RemoteMessage) {\nsuper.onMessageReceived(message)\n+ message.data[\"nh source\"] = \"MyFcmMessageListenerService\"\nvar pushType = \"fcm\"\nif (pushType.equals(\"fcm\")) {\n+ android.os.Handler(Looper.getMainLooper()).post {\n+ println(\"MyFcmMessageListenerService onMessageReceived createNotification on ${Thread.currentThread()}\")\nCTFcmMessageHandler()\n.createNotification(applicationContext, message)\n+ }\n//CTFcmMessageHandler().processPushAmp(applicationContext, message)\n} else if (pushType.equals(\"hps\")) {\n//CTHmsMessageHandler().createNotification(applicationContext,message)\n@@ -21,4 +27,11 @@ class MyFcmMessageListenerService : FirebaseMessagingService() {\n//CTXiaomiMessageHandler().processPushAmp(applicationContext,message)\n}\n}\n+\n+ override fun onNewToken(token: String) {\n+ super.onNewToken(token)\n+ CleverTapAPI.getDefaultInstance(this)?.apply {\n+ pushFcmRegistrationId(token, true)\n+ }\n+ }\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-1736): add nh source to push services |
116,612 | 01.08.2022 12:42:40 | -19,080 | b11a652f154791459de874ca1bc88bf9c423d2b3 | feat(SDK-1736): update comments | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -300,7 +300,7 @@ public interface Constants {\n// ==========Fallback keys=========\nString NOTIFICATION_HEALTH = \"wzrk_pn_h\";\n- String WZRK_TSR_FB = \"wzrk_tsr_fb\";\n+ String WZRK_TSR_FB = \"wzrk_tsr_fb\";// terminate and stay resident\nString NOTIFICATION_RENDER_FALLBACK = \"wzrk_fallback\";\n/**\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-1736): update comments |
116,612 | 02.08.2022 17:15:03 | -19,080 | add41715b44dce2d095470b27cf33732cfcb43fe | feat(SDK-1736): add notification rendered listener | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"diff": "@@ -3,6 +3,7 @@ package com.clevertap.android.sdk;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.interfaces.DCDomainCallback;\n+import com.clevertap.android.sdk.interfaces.NotificationRenderedListener;\nimport com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationListener;\n@@ -74,4 +75,8 @@ public abstract class BaseCallbackManager {\npublic abstract OnInitCleverTapIDListener getOnInitCleverTapIDListener();\npublic abstract void setOnInitCleverTapIDListener(OnInitCleverTapIDListener onInitCleverTapIDListener);\n+\n+ public abstract void setNotificationRenderedListener(NotificationRenderedListener notificationRenderedListener);\n+\n+ public abstract NotificationRenderedListener getNotificationRenderedListener();\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"diff": "@@ -7,6 +7,7 @@ import androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.interfaces.DCDomainCallback;\n+import com.clevertap.android.sdk.interfaces.NotificationRenderedListener;\nimport com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationListener;\n@@ -37,6 +38,8 @@ public class CallbackManager extends BaseCallbackManager {\nprivate WeakReference<CTFeatureFlagsListener> featureFlagListenerWeakReference;\n+ private NotificationRenderedListener notificationRenderedListener;\n+\nprivate OnInitCleverTapIDListener onInitCleverTapIDListener;\nprivate WeakReference<CTProductConfigListener> productConfigListener;\n@@ -199,6 +202,16 @@ public class CallbackManager extends BaseCallbackManager {\nthis.onInitCleverTapIDListener = onInitCleverTapIDListener;\n}\n+ @Override\n+ public void setNotificationRenderedListener(final NotificationRenderedListener notificationRenderedListener) {\n+ this.notificationRenderedListener = notificationRenderedListener;\n+ }\n+\n+ @Override\n+ public NotificationRenderedListener getNotificationRenderedListener() {\n+ return notificationRenderedListener;\n+ }\n+\n//Profile\n@Override\npublic void notifyUserProfileInitialized(String deviceID) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -131,8 +131,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nprivate static NotificationHandler sNotificationHandler;\n- private static NotificationRenderedListener sNotificationRenderedListener;\n-\nprivate static NotificationHandler sDirectCallNotificationHandler;\nprivate final Context context;\n@@ -2389,6 +2387,16 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nthis.inboxMessageButtonListener = new WeakReference<>(listener);\n}\n+ @RestrictTo(Scope.LIBRARY_GROUP)\n+ public void setNotificationRenderedListener(final NotificationRenderedListener notificationRenderedListener) {\n+ coreState.getCallbackManager().setNotificationRenderedListener(notificationRenderedListener);\n+ }\n+\n+ @RestrictTo(Scope.LIBRARY_GROUP)\n+ public NotificationRenderedListener getNotificationRenderedListener() {\n+ return coreState.getCallbackManager().getNotificationRenderedListener();\n+ }\n+\n/**\n* Not to be used by developers. This is used internally to help CleverTap know which library is wrapping the\n* native SDK\n@@ -2910,13 +2918,5 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\npublic static @XiaomiPush int getEnableXiaomiPushOn() {\nreturn PushType.XPS.getRunningDevices();\n}\n- public static void setNotificationRenderedListener(NotificationRenderedListener notificationRenderedListener)\n- {\n- sNotificationRenderedListener = notificationRenderedListener;\n- }\n-\n- public static NotificationRenderedListener getNotificationRenderedListener() {\n- return sNotificationRenderedListener;\n- }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"diff": "@@ -23,6 +23,7 @@ import com.clevertap.android.sdk.StorageHelper;\nimport com.clevertap.android.sdk.db.BaseDatabaseManager;\nimport com.clevertap.android.sdk.db.QueueCursor;\nimport com.clevertap.android.sdk.events.EventGroup;\n+import com.clevertap.android.sdk.interfaces.NotificationRenderedListener;\nimport com.clevertap.android.sdk.login.IdentityRepoFactory;\nimport com.clevertap.android.sdk.response.ARPResponse;\nimport com.clevertap.android.sdk.response.BaseResponse;\n@@ -674,6 +675,14 @@ public class NetworkManager extends BaseNetworkManager {\nsetLastRequestTimestamp(getCurrentRequestTimestamp());\nsetFirstRequestTimestampIfNeeded(getCurrentRequestTimestamp());\n+ if (eventGroup == EventGroup.PUSH_NOTIFICATION_VIEWED) {\n+ NotificationRenderedListener notificationRenderedListener\n+ = callbackManager.getNotificationRenderedListener();\n+ logger.verbose(config.getAccountId(), \"push notification viewed event sent successfully\");\n+ if (notificationRenderedListener != null) {\n+ notificationRenderedListener.onNotificationRendered(true);\n+ }\n+ }\nlogger.debug(config.getAccountId(), \"Queue sent successfully\");\nresponseFailureCount = 0;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -28,7 +28,6 @@ import androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport androidx.core.app.NotificationCompat;\nimport com.clevertap.android.sdk.AnalyticsManager;\n-import com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.CleverTapAPI.DevicePushTokenRefreshListener;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\n@@ -41,7 +40,6 @@ import com.clevertap.android.sdk.Utils;\nimport com.clevertap.android.sdk.db.BaseDatabaseManager;\nimport com.clevertap.android.sdk.db.DBAdapter;\nimport com.clevertap.android.sdk.interfaces.AudibleNotification;\n-import com.clevertap.android.sdk.interfaces.NotificationRenderedListener;\nimport com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\nimport com.clevertap.android.sdk.pushnotification.amp.CTBackgroundIntentService;\nimport com.clevertap.android.sdk.pushnotification.amp.CTBackgroundJobService;\n@@ -186,6 +184,10 @@ public class PushProviders implements CTPushProviderListener {\nreturn;\n}\n}\n+ String notifTitle = iNotificationRenderer.getTitle(extras,\n+ context);//extras.getString(Constants.NOTIF_TITLE, \"\");// uncommon - getTitle()\n+ notifTitle = notifTitle.isEmpty() ? context.getApplicationInfo().name\n+ : notifTitle;//common\ntriggerNotification(context, extras, notificationId);\n} catch (Throwable t) {\n// Occurs if the notification image was null\n@@ -1145,11 +1147,6 @@ public class PushProviders implements CTPushProviderListener {\n}\nanalyticsManager.pushNotificationViewedEvent(extras);\n- NotificationRenderedListener notificationRenderedListener = CleverTapAPI\n- .getNotificationRenderedListener();\n- if (notificationRenderedListener != null) {\n- notificationRenderedListener.onNotificationRendered(true);\n- }\nconfig.getLogger()\n.verbose(\"Rendered Push Notification... from nh source = \" + extras.getString(\"nh source\"));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/build.gradle",
"new_path": "sample/build.gradle",
"diff": "@@ -16,8 +16,8 @@ android {\napplicationId \"com.clevertap.demo\"\nminSdkVersion 21\ntargetSdkVersion 31\n- versionCode 10403\n- versionName \"1.4.3-push-plus\"\n+ versionCode 10406\n+ versionName \"1.4.6-push-plus\"\nmultiDexEnabled true\ntestInstrumentationRunner \"android.support.test.runner.AndroidJUnitRunner\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/libs/clevertap-push-sdk-0.0.1.aar",
"new_path": "sample/libs/clevertap-push-sdk-0.0.1.aar",
"diff": "Binary files a/sample/libs/clevertap-push-sdk-0.0.1.aar and b/sample/libs/clevertap-push-sdk-0.0.1.aar differ\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-1736): add notification rendered listener |
116,612 | 03.08.2022 16:55:48 | -19,080 | 09f274aeede73df45af605daf6b07bc13887a823 | feat(SDK-1736): update credentials | [
{
"change_type": "MODIFY",
"old_path": "sample/src/main/AndroidManifest.xml",
"new_path": "sample/src/main/AndroidManifest.xml",
"diff": "<!-- Add meta data for CleverTap Account Id and Account Token -->\n<meta-data\nandroid:name=\"CLEVERTAP_ACCOUNT_ID\"\n- android:value=\"R7R-66K-K56Z\" />\n+ android:value=\"YOUR ACCT ID\" />\n<meta-data\nandroid:name=\"CLEVERTAP_TOKEN\"\n- android:value=\"366-2a2\" />\n+ android:value=\"YOUR ACCT TOKEN\" />\n<meta-data\nandroid:name=\"CLEVERTAP_REGION\"\nandroid:value=\"eu1\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/res/values/strings.xml",
"new_path": "sample/src/main/res/values/strings.xml",
"diff": "<string name=\"inbox\">Inbox</string>\n<string name=\"webview\">WebView</string>\n- <string name=\"xiaomi_app_key\">5321833060115</string>\n- <string name=\"xiaomi_app_id\">2882303761518330115</string>\n+ <string name=\"xiaomi_app_key\">Your Xiaomi App Key</string>\n+ <string name=\"xiaomi_app_id\">Your Xiaomi App ID</string>\n<!-- Geofence -->\n<string name=\"ok\">OK</string>\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-1736): update credentials |
116,612 | 03.08.2022 19:30:31 | -19,080 | 876bf20fc787489380723f18f2615da6016c5ba0 | feat(SDK-1736): update nh source key and push template version | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -158,7 +158,8 @@ public class PushProviders implements CTPushProviderListener {\n\"Handling notification: \" + extras);\nconfig.getLogger()\n.debug(config.getAccountId(),\n- \"Handling notification::nh source = \" + extras.getString(\"nh source\"));\n+ \"Handling notification::nh_source = \" + extras.getString(\"nh_source\",\n+ \"source not available\"));\nif (extras.getString(Constants.WZRK_PUSH_ID) != null) {\nif (baseDatabaseManager.loadDBAdapter(context)\n.doesPushNotificationIdExist(\n@@ -1148,7 +1149,8 @@ public class PushProviders implements CTPushProviderListener {\nanalyticsManager.pushNotificationViewedEvent(extras);\nconfig.getLogger()\n- .verbose(\"Rendered Push Notification... from nh source = \" + extras.getString(\"nh source\"));\n+ .verbose(\"Rendered Push Notification... from nh_source = \" + extras.getString(\"nh_source\",\n+ \"source not available\"));\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/CTFcmMessageHandler.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/CTFcmMessageHandler.java",
"diff": "@@ -46,8 +46,8 @@ public class CTFcmMessageHandler implements IFcmMessageHandler, IPushAmpHandler<\nBundle messageBundle = mParser.toBundle(message);\nif (messageBundle != null) {\nmessageBundle.putString(Constants.NOTIFICATION_HEALTH, Constants.WZRK_HEALTH_STATE_GOOD);\n- if (!messageBundle.containsKey(\"nh source\")) {\n- messageBundle.putString(\"nh source\", \"FcmMessageListenerService\");\n+ if (!messageBundle.containsKey(\"nh_source\")) {\n+ messageBundle.putString(\"nh_source\", \"FcmMessageListenerService\");\n}\nisSuccess = PushNotificationHandler.getPushNotificationHandler()\n.onMessageReceived(context, messageBundle, PushType.FCM.toString());\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/CTHmsMessageHandler.java",
"new_path": "clevertap-hms/src/main/java/com/clevertap/android/hms/CTHmsMessageHandler.java",
"diff": "@@ -43,9 +43,6 @@ public class CTHmsMessageHandler implements IHmsMessageHandler, IPushAmpHandler<\nBundle messageBundle = mParser.toBundle(remoteMessage);\nif (messageBundle != null) {\ntry {\n- if (!messageBundle.containsKey(\"nh source\")) {\n- messageBundle.putString(\"nh source\", \"HuaweiMessageListenerService\");\n- }\nisSuccess = PushNotificationHandler\n.getPushNotificationHandler().onMessageReceived(context, messageBundle, HPS.toString());\n} catch (Throwable e) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/CTXiaomiMessageHandler.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/CTXiaomiMessageHandler.java",
"diff": "@@ -54,9 +54,6 @@ public class CTXiaomiMessageHandler implements IMiMessageHandler, IPushAmpHandle\nBundle messageBundle = mParser.toBundle(message);\nif (messageBundle != null) {\ntry {\n- if (!messageBundle.containsKey(\"nh source\")) {\n- messageBundle.putString(\"nh source\", \"XiaomiMessageReceiver\");\n- }\nisSuccess = PushNotificationHandler\n.getPushNotificationHandler().onMessageReceived(context, messageBundle, XPS.toString());\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/MyFcmMessageListenerService.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/MyFcmMessageListenerService.kt",
"diff": "@@ -10,7 +10,7 @@ class MyFcmMessageListenerService : FirebaseMessagingService() {\noverride fun onMessageReceived(message: RemoteMessage) {\nsuper.onMessageReceived(message)\n- message.data[\"nh source\"] = \"MyFcmMessageListenerService\"\n+ message.data[\"nh_source\"] = \"MyFcmMessageListenerService\"\nvar pushType = \"fcm\"\nif (pushType.equals(\"fcm\")) {\nandroid.os.Handler(Looper.getMainLooper()).post {\n"
},
{
"change_type": "MODIFY",
"old_path": "versions.properties",
"new_path": "versions.properties",
"diff": "@@ -324,7 +324,7 @@ version.com.clevertap.android..clevertap-android-sdk=4.6.0\nversion.com.clevertap.android..clevertap-geofence-sdk=1.1.0\nversion.com.clevertap.android..clevertap-hms-sdk=1.3.0\nversion.com.clevertap.android..clevertap-xiaomi-sdk=1.4.0\n-version.com.clevertap.android..push-templates=1.0.3\n+version.com.clevertap.android..push-templates=1.0.4\nversion.com.github.bumptech.glide..glide=4.12.0\n## # available=4.12.0\nversion.com.google.android.exoplayer..exoplayer=2.15.1\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-1736): update nh source key and push template version |
116,612 | 03.08.2022 19:43:35 | -19,080 | 55f87619a0496708c6b155a2febf15f6102705ad | feat(SDK-1736): update changelogs and readme | [
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG.\n+### August 4, 2022\n+\n+* [CleverTap Android SDK v4.6.0](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n+* [CleverTap Push Templates SDK v1.0.4](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTPUSHTEMPLATESCHANGELOG.md)\n+\n### June 3, 2022\n* [CleverTap Android SDK v4.5.0](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTGEOFENCE.md",
"new_path": "docs/CTGEOFENCE.md",
"diff": "@@ -17,7 +17,7 @@ Add the following dependencies to the `build.gradle`\n```Groovy\nimplementation \"com.clevertap.android:clevertap-geofence-sdk:1.1.0\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.5.0\" // 3.9.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.6.0\" // 3.9.0 and above\nimplementation \"com.google.android.gms:play-services-location:18.0.0\"\nimplementation \"androidx.work:work-runtime:2.7.0\" // required for FETCH_LAST_LOCATION_PERIODIC\nimplementation \"androidx.concurrent:concurrent-futures:1.1.0\" // required for FETCH_LAST_LOCATION_PERIODIC\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTPUSHTEMPLATES.md",
"new_path": "docs/CTPUSHTEMPLATES.md",
"diff": "@@ -20,8 +20,8 @@ CleverTap Push Templates SDK helps you engage with your users using fancy push n\n1. Add the dependencies to the `build.gradle`\n```groovy\n-implementation \"com.clevertap.android:push-templates:1.0.2\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.5.0\" // 4.4.0 and above\n+implementation \"com.clevertap.android:push-templates:1.0.4\"\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.6.0\" // 4.4.0 and above\n```\n2. Add the following line to your Application class before the `onCreate()`\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTPUSHTEMPLATESCHANGELOG.md",
"new_path": "docs/CTPUSHTEMPLATESCHANGELOG.md",
"diff": "## CleverTap Push Templates SDK CHANGE LOG\n+### Version 1.0.4 (August 4, 2022)\n+* Supports CleverTap Android SDK v4.6.0\n+\n### Version 1.0.2 (April 26, 2022)\n* UI bug fixes for Push Notification metadata\n* Timer template fixes for `title`, `title_alt` along with `pt_big_img`, `pt_big_img_alt`\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTPUSHTEMPLATESCHANGELOG.md",
"new_path": "templates/CTPUSHTEMPLATESCHANGELOG.md",
"diff": "## CleverTap Push Templates SDK CHANGE LOG\n+### Version 1.0.4 (August 4, 2022)\n+* Supports CleverTap Android SDK v4.6.0\n+\n### Version 1.0.2 (April 26, 2022)\n* UI bug fixes for Push Notification metadata\n* Timer template fixes for `title`, `title_alt` along with `pt_big_img`, `pt_big_img_alt`\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-1736): update changelogs and readme |
116,616 | 04.08.2022 01:30:36 | -19,080 | 3b30f3f2a38ce3e14bc0a959bfc1ff8915a6cd3b | feat(SDK-1736): Add missing `pt_big_img` key for rating template in docs & template | [
{
"change_type": "MODIFY",
"old_path": "docs/CTPUSHTEMPLATES.md",
"new_path": "docs/CTPUSHTEMPLATES.md",
"diff": "@@ -341,6 +341,7 @@ Rating Template Keys | Required | Description\npt_id | Required | Value - `pt_rating`\npt_title | Required | Title\npt_msg | Required | Message\n+pt_big_img | Optional | Image\npt_msg_summary | Optional | Message line when Notification is expanded\npt_subtitle | Optional | Subtitle\npt_default_dl | Required | Default Deep Link for Push Notification\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTPUSHTEMPLATES.md",
"new_path": "templates/CTPUSHTEMPLATES.md",
"diff": "@@ -341,6 +341,7 @@ Rating Template Keys | Required | Description\npt_id | Required | Value - `pt_rating`\npt_title | Required | Title\npt_msg | Required | Message\n+pt_big_img | Optional | Image\npt_msg_summary | Optional | Message line when Notification is expanded\npt_subtitle | Optional | Subtitle\npt_default_dl | Required | Default Deep Link for Push Notification\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-1736): Add missing `pt_big_img` key for rating template in docs & template |
116,612 | 04.08.2022 14:13:50 | -19,080 | 4a838682eabe104d2170ec7932e3649b233b6439 | feat(SDK-1736): fix unit tests for createNotification() | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CleverTapAPITest.kt",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk\nimport android.location.Location\nimport android.os.Bundle\n+import com.clevertap.android.sdk.pushnotification.CoreNotificationRenderer\nimport com.clevertap.android.sdk.task.CTExecutorFactory\nimport com.clevertap.android.sdk.task.MockCTExecutors\nimport com.clevertap.android.shared.test.BaseTestCase\n@@ -369,9 +370,12 @@ class CleverTapAPITest : BaseTestCase() {\n)\n.thenReturn(corestate)\nval bundle = Bundle()\n+ val lock = Object()\n//CleverTapAPI.getDefaultInstance(application)\n//CleverTapAPI.setInstances(null)\n+ `when`(corestate.pushProviders.pushRenderingLock).thenReturn(lock)\nCleverTapAPI.createNotification(application, bundle)\n+ verify(corestate.pushProviders).pushNotificationRenderer = any(CoreNotificationRenderer::class.java)\nverify(corestate.pushProviders)._createNotification(\napplication,\nbundle,\n@@ -399,9 +403,13 @@ class CleverTapAPITest : BaseTestCase() {\n)\n.thenReturn(corestate)\nval bundle = Bundle()\n+ val lock = Object()\nbundle.putString(Constants.WZRK_ACCT_ID_KEY, Constant.ACC_ID)\nCleverTapAPI.instanceWithConfig(application, cleverTapInstanceConfig)\n+\n+ `when`(corestate.pushProviders.pushRenderingLock).thenReturn(lock)\nCleverTapAPI.createNotification(application, bundle)\n+ verify(corestate.pushProviders).pushNotificationRenderer = any(CoreNotificationRenderer::class.java)\nverify(corestate.pushProviders)._createNotification(\napplication,\nbundle,\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-geofence/build.gradle",
"new_path": "clevertap-geofence/build.gradle",
"diff": "@@ -31,6 +31,7 @@ dependencies {\ntestImplementation Libs.androidx_test_core\ntestImplementation Libs.androidx_test_ext_junit\ntestImplementation Libs.appcompat\n+ testImplementation Libs.firebase_messaging\n// AndroidJUnitRunner and JUnit Rules\nandroidTestImplementation Libs.androidx_test_runner\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-1736): fix unit tests for createNotification() |
116,612 | 04.08.2022 14:15:15 | -19,080 | 01d0bf0933095a35d44dbb9b7f1b693959f6f3d2 | feat(SDK-1736): add tests for isRenderFallback and getNotificationBitmapWithSizeConstraints | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/UtilsTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/UtilsTest.kt",
"diff": "@@ -16,21 +16,49 @@ import android.graphics.drawable.Drawable\nimport android.net.ConnectivityManager\nimport android.net.NetworkInfo\nimport android.os.Build\n-import android.os.Build.VERSION_CODES.*\n+import android.os.Build.VERSION_CODES.KITKAT\n+import android.os.Build.VERSION_CODES.LOLLIPOP\n+import android.os.Build.VERSION_CODES.M\n+import android.os.Build.VERSION_CODES.N\n+import android.os.Build.VERSION_CODES.O\n+import android.os.Build.VERSION_CODES.P\n+import android.os.Build.VERSION_CODES.Q\n+import android.os.Build.VERSION_CODES.R\n+import android.os.Build.VERSION_CODES.S\nimport android.os.Bundle\nimport android.telephony.TelephonyManager\n-import android.telephony.TelephonyManager.*\n+import android.telephony.TelephonyManager.NETWORK_TYPE_1xRTT\n+import android.telephony.TelephonyManager.NETWORK_TYPE_CDMA\n+import android.telephony.TelephonyManager.NETWORK_TYPE_EDGE\n+import android.telephony.TelephonyManager.NETWORK_TYPE_EHRPD\n+import android.telephony.TelephonyManager.NETWORK_TYPE_EVDO_0\n+import android.telephony.TelephonyManager.NETWORK_TYPE_EVDO_A\n+import android.telephony.TelephonyManager.NETWORK_TYPE_EVDO_B\n+import android.telephony.TelephonyManager.NETWORK_TYPE_GPRS\n+import android.telephony.TelephonyManager.NETWORK_TYPE_HSDPA\n+import android.telephony.TelephonyManager.NETWORK_TYPE_HSPA\n+import android.telephony.TelephonyManager.NETWORK_TYPE_HSPAP\n+import android.telephony.TelephonyManager.NETWORK_TYPE_HSUPA\n+import android.telephony.TelephonyManager.NETWORK_TYPE_IDEN\n+import android.telephony.TelephonyManager.NETWORK_TYPE_LTE\n+import android.telephony.TelephonyManager.NETWORK_TYPE_NR\n+import android.telephony.TelephonyManager.NETWORK_TYPE_UMTS\nimport com.clevertap.android.shared.test.BaseTestCase\n+import com.google.firebase.messaging.RemoteMessage\nimport org.json.JSONArray\nimport org.json.JSONObject\n-import org.junit.Test\n-import org.junit.runner.RunWith\n+import org.junit.*\n+import org.junit.runner.*\nimport org.robolectric.RobolectricTestRunner\nimport org.robolectric.Shadows\nimport org.robolectric.shadows.ShadowNetworkInfo\nimport org.robolectric.shadows.ShadowPackageManager\nimport org.robolectric.util.ReflectionHelpers\n-import kotlin.test.*\n+import kotlin.test.assertEquals\n+import kotlin.test.assertFalse\n+import kotlin.test.assertNotNull\n+import kotlin.test.assertNull\n+import kotlin.test.assertTrue\nimport com.clevertap.android.sdk.R as R1\n@RunWith(RobolectricTestRunner::class)\n@@ -380,14 +408,47 @@ class UtilsTest : BaseTestCase() {\nassertNotNull(bitmap62)\n// if path is not Null/empty, the icon will be available irrespective to the fallbackToAppIcon switch\n- val bitmap41 = Utils.getNotificationBitmap(\"https://www.pod.cz/ico/favicon.ico\", false, application.applicationContext)\n- val bitmap42 = Utils.getNotificationBitmap(\"https://www.pod.cz/ico/favicon.ico\", true, application.applicationContext)\n+ val bitmap41 =\n+ Utils.getNotificationBitmap(\"https://www.pod.cz/ico/favicon.ico\", false, application.applicationContext)\n+ val bitmap42 =\n+ Utils.getNotificationBitmap(\"https://www.pod.cz/ico/favicon.ico\", true, application.applicationContext)\nprintBitmapInfo(bitmap41, \"bitmap41\")\nprintBitmapInfo(bitmap42, \"bitmap42\")\nassertNotNull(bitmap41)\nassertNotNull(bitmap42)\n+ }\n+\n+ @Test\n+ fun test_getNotificationBitmapWithSizeConstraints_when_BitmapSizeIsLargerThanGivenSize_should_ReturnNull() {\n+ val context = application.applicationContext\n+\n+ // if path is not Null/empty, the icon will be available irrespective to the fallbackToAppIcon switch\n+ val bitmap41 = Utils.getNotificationBitmapWithSizeConstraints(\n+ \"https://www.pod.cz/ico/favicon.ico\",\n+ false,\n+ application.applicationContext,\n+ 10\n+ )\n+ printBitmapInfo(bitmap41, \"bitmap41\")\n+\n+ assertNull(bitmap41)\n+ }\n+\n+ @Test\n+ fun test_getNotificationBitmapWithSizeConstraints_when_BitmapSizeIsSamllerThanGivenSize_should_ReturnBitmap() {\n+ val context = application.applicationContext\n+\n+ // if path is not Null/empty, the icon will be available irrespective to the fallbackToAppIcon switch\n+ val bitmap41 = Utils.getNotificationBitmapWithSizeConstraints(\n+ \"https://www.pod.cz/ico/favicon.ico\",\n+ false,\n+ application.applicationContext,\n+ 10 * 1024 * 1024\n+ )\n+ printBitmapInfo(bitmap41, \"bitmap41\")\n+ assertNotNull(bitmap41)\n}\n//------------------------------------------------------------------------------------\n@@ -630,12 +691,83 @@ class UtilsTest : BaseTestCase() {\nval id5 = \"abcd_1234_!!_::_$\" + \"@@_---\"\nassertTrue { Utils.validateCTID(id5) }\n+ }\n+\n+ @Test\n+ fun test_isRenderFallback_when_wzrk_tsr_fbIsAbsent_and_wzrk_fallbackIsTrue_should_ReturnTrue() {\n+ assertTrue {\n+ Utils.isRenderFallback(RemoteMessage(Bundle().let {\n+ it.putString(Constants.NOTIFICATION_RENDER_FALLBACK, \"true\")\n+ it\n+ }), application)\n+ }\n+ }\n+\n+ @Test\n+ fun test_isRenderFallback_when_wzrk_fallbackIsAbsent_and_wzrk_tsr_fbIsFalse_should_ReturnFalse() {\n+ assertFalse {\n+ Utils.isRenderFallback(RemoteMessage(Bundle().let {\n+ it.putString(Constants.WZRK_TSR_FB, \"false\")\n+ it\n+ }), application)\n+ }\n+ }\n+\n+ @Test\n+ fun test_isRenderFallback_when_wzrk_fallbackIsAbsent_and_wzrk_tsr_fbIsAbsent_should_ReturnFalse() {\n+ assertFalse { Utils.isRenderFallback(RemoteMessage(Bundle()), application) }\n+ }\n+\n+ @Test\n+ fun test_isRenderFallback_when_wzrk_fallbackIsTrue_and_wzrk_tsr_fbIsFalse_should_ReturnTrue() {\n+ assertTrue {\n+ Utils.isRenderFallback(RemoteMessage(Bundle().let {\n+ it.putString(Constants.WZRK_TSR_FB, \"false\")\n+ it.putString(Constants.NOTIFICATION_RENDER_FALLBACK, \"TRUE\")\n+ it\n+ }), application)\n+ }\n+ }\n+\n+ @Test\n+ fun test_isRenderFallback_when_wzrk_fallbackIsFalse_and_wzrk_tsr_fbIsTrue_should_ReturnFalse() {\n+ assertFalse {\n+ Utils.isRenderFallback(RemoteMessage(Bundle().let {\n+ it.putString(Constants.WZRK_TSR_FB, \"true\")\n+ it.putString(Constants.NOTIFICATION_RENDER_FALLBACK, \"FaLsE\")\n+ it\n+ }), application)\n+ }\n+ }\n+ @Test\n+ fun test_isRenderFallback_when_wzrk_fallbackIsTrue_and_wzrk_tsr_fbIsTrue_should_ReturnFalse() {\n+ assertFalse {\n+ Utils.isRenderFallback(RemoteMessage(Bundle().let {\n+ it.putString(Constants.WZRK_TSR_FB, \"true\")\n+ it.putString(Constants.NOTIFICATION_RENDER_FALLBACK, \"TrUE\")\n+ it\n+ }), application)\n+ }\n+ }\n+\n+ @Test\n+ fun test_isRenderFallback_when_wzrk_fallbackIsFalse_and_wzrk_tsr_fbIsFalse_should_ReturnFalse() {\n+ assertFalse {\n+ Utils.isRenderFallback(RemoteMessage(Bundle().let {\n+ it.putString(Constants.WZRK_TSR_FB, \"false\")\n+ it.putString(Constants.NOTIFICATION_RENDER_FALLBACK, \"FALSE\")\n+ it\n+ }), application)\n+ }\n}\n//------------------------------------------------------------------------------------\n- private fun prepareForWifiConnectivityTest(isConnected: Boolean, networkType: Int = ConnectivityManager.TYPE_WIFI) {\n+ private fun prepareForWifiConnectivityTest(\n+ isConnected: Boolean,\n+ networkType: Int = ConnectivityManager.TYPE_WIFI\n+ ) {\nval connectivityManager = application.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager\nval shadowConnectivityManager = Shadows.shadowOf(connectivityManager)\nshadowConnectivityManager.also {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-1736): add tests for isRenderFallback and getNotificationBitmapWithSizeConstraints |
116,612 | 04.08.2022 16:25:27 | -19,080 | cd35f30df4ea0efd32f15d944002506ccea06883 | feat(SDK-1736): remove redundant log | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageListenerService.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/fcm/FcmMessageListenerService.java",
"diff": "package com.clevertap.android.sdk.pushnotification.fcm;\n-import android.util.Log;\nimport androidx.annotation.NonNull;\nimport com.google.firebase.messaging.FirebaseMessagingService;\nimport com.google.firebase.messaging.RemoteMessage;\n@@ -14,7 +13,6 @@ public class FcmMessageListenerService extends FirebaseMessagingService {\n@Override\npublic void onMessageReceived(@NonNull RemoteMessage message) {\n- Log.i(\"FcmMessageListenerServ\", \"onMessageReceived called\");\nmHandler.createNotification(getApplicationContext(), message);\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-1736): remove redundant log |
116,612 | 04.08.2022 16:38:41 | -19,080 | 43dd77702a662359c01c0f59dd680f31d18b13ff | feat(SDK-1736): update gitignore and sample build.gradle | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -11,3 +11,4 @@ build/\nsample/google-services.json\nct_signing_key.gpg\n/sample/release/sample-release.aab\n+/sample/libs/\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/build.gradle",
"new_path": "sample/build.gradle",
"diff": "@@ -72,7 +72,7 @@ dependencies {\nimplementation project(':clevertap-core')\nimplementation fileTree(include: ['*.aar'], dir: 'libs')\n- //implementation \"com.clevertap.android:clevertap-android-sdk:4.5.0\"\n+ //implementation \"com.clevertap.android:clevertap-android-sdk:4.6.0\"\nimplementation project(':clevertap-geofence')\n//implementation \"com.clevertap.android:clevertap-geofence-sdk:1.1.0\"\n@@ -81,7 +81,7 @@ dependencies {\n//implementation 'com.clevertap.android:clevertap-xiaomi-sdk:1.4.0'\nimplementation project(':clevertap-hms')\nimplementation project(':clevertap-pushtemplates')\n-// implementation \"com.clevertap.android:push-templates:1.0.3\"\n+// implementation \"com.clevertap.android:push-templates:1.0.4\"\n// For Huawei Push use\n//implementation 'com.clevertap.android:clevertap-hms-sdk:1.3.0'\nimplementation 'com.huawei.hms:push:6.3.0.304'\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | feat(SDK-1736): update gitignore and sample build.gradle |
116,620 | 08.08.2022 17:07:06 | -19,080 | 5a88f4e866018d10278e1311369b49047bf99fe8 | app inbox blue dot fix part 1/n | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -20,6 +20,8 @@ import android.net.Uri;\nimport android.os.Build;\nimport android.os.Bundle;\nimport android.text.TextUtils;\n+import android.util.Log;\n+\nimport androidx.annotation.NonNull;\nimport androidx.annotation.Nullable;\nimport androidx.annotation.RequiresApi;\n@@ -1145,6 +1147,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\n@SuppressWarnings(\"unused\")\npublic void deleteInboxMessage(String messageId) {\n+ Log.e(\"CleverTapTest\", \"CleverTapAPI:deleteInboxMessage() called with: messageId = [\" + messageId + \"]\");\nCTInboxMessage message = getInboxMessageForId(messageId);\ndeleteInboxMessage(message);\n}\n@@ -1273,6 +1276,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\npublic ArrayList<CTInboxMessage> getAllInboxMessages() {\n+ Log.e(\"CleverTapTest\", \"CleverTapAPI:getAllInboxMessages: called\" );\nArrayList<CTInboxMessage> inboxMessageArrayList = new ArrayList<>();\nsynchronized (coreState.getCTLockManager().getInboxControllerLock()) {\nif (coreState.getControllerManager().getCTInboxController() != null) {\n@@ -1626,6 +1630,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\npublic CTInboxMessage getInboxMessageForId(String messageId) {\n+ Log.e(\"CleverTapTest\", \"CleverTapAPI:getInboxMessageForId() called with: messageId = [\" + messageId + \"]\");\nsynchronized (coreState.getCTLockManager().getInboxControllerLock()) {\nif (coreState.getControllerManager().getCTInboxController() != null) {\nCTMessageDAO message = coreState.getControllerManager().getCTInboxController()\n@@ -1873,12 +1878,13 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n//Session\n@Override\n- public void messageDidShow(CTInboxActivity ctInboxActivity, final CTInboxMessage inboxMessage,\n- final Bundle data) {\n+ public void messageDidShow(CTInboxActivity ctInboxActivity, final CTInboxMessage inboxMessage, final Bundle data) {\nTask<Void> task = CTExecutorFactory.executors(coreState.getConfig()).postAsyncSafelyTask();\ntask.execute(\"handleMessageDidShow\", new Callable<Void>() {\n@Override\npublic Void call() {\n+ Log.e(\"CleverTapTest\", \"CleverTapAPI:messageDidShow() called in async with: messageId = [\" + inboxMessage.getMessageId() + \"]\");\n+\nCTInboxMessage message = getInboxMessageForId(inboxMessage.getMessageId());\nif (!message.isRead()) {\nmarkReadInboxMessage(inboxMessage);\n@@ -2152,6 +2158,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\n@SuppressWarnings(\"unused\")\npublic void pushInboxNotificationClickedEvent(String messageId) {\n+ Log.e(\"CleverTapTest\", \"CleverTapAPI:pushInboxNotificationClickedEvent() called with: messageId = [\" +messageId + \"]\");\n+\nCTInboxMessage message = getInboxMessageForId(messageId);\ncoreState.getAnalyticsManager().pushInboxMessageStateEvent(true, message, null);\n}\n@@ -2163,6 +2171,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\n@SuppressWarnings(\"unused\")\npublic void pushInboxNotificationViewedEvent(String messageId) {\n+ Log.e(\"CleverTapTest\", \"CleverTapAPI:pushInboxNotificationViewedEvent() called with: messageId = [\" +messageId + \"]\");\nCTInboxMessage message = getInboxMessageForId(messageId);\ncoreState.getAnalyticsManager().pushInboxMessageStateEvent(false, message, null);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTCarouselImageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTCarouselImageViewHolder.java",
"diff": "@@ -136,7 +136,7 @@ class CTCarouselImageViewHolder extends CTInboxBaseMessageViewHolder {\nparentWeak.didShow(null, position);\n}\n}\n- carouselReadDot.setVisibility(View.GONE);\n+ //carouselReadDot.setVisibility(View.GONE);\n}\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTCarouselMessageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTCarouselMessageViewHolder.java",
"diff": "@@ -74,7 +74,7 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nprivate final ImageView readDot;\n- private ImageView carouselReadDot;\n+ private ImageView carouselReadDot;//todo WARNING : isn't this undefined?\nprivate final LinearLayout sliderDots;\n@@ -160,14 +160,14 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nparentWeak.didShow(null, position);\n}\n}\n- carouselReadDot.setVisibility(View.GONE);\n+ //carouselReadDot.setVisibility(View.GONE);\n} else {\nif (readDot.getVisibility() == View.VISIBLE) {\nif (parentWeak != null) {\nparentWeak.didShow(null, position);\n}\n}\n- readDot.setVisibility(View.GONE);\n+ //readDot.setVisibility(View.GONE);\n}\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTIconMessageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTIconMessageViewHolder.java",
"diff": "@@ -387,7 +387,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nif (readDot.getVisibility() == View.VISIBLE) {\nparent.didShow(null, position);\n}\n- readDot.setVisibility(View.GONE);\n+ //readDot.setVisibility(View.GONE);\n}\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxActivity.java",
"diff": "@@ -5,6 +5,7 @@ import android.graphics.Color;\nimport android.graphics.PorterDuff;\nimport android.graphics.drawable.Drawable;\nimport android.os.Bundle;\n+import android.util.Log;\nimport android.view.View;\nimport android.widget.FrameLayout;\nimport android.widget.LinearLayout;\n@@ -214,6 +215,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n@Override\npublic void messageDidShow(Context baseContext, CTInboxMessage inboxMessage, Bundle data) {\n+ Log.e(\"CleverTapTest\", \"CTInboxActivity:messageDidShow() called with: data = [\" + data + \"], inboxMessage = [\" + inboxMessage .getMessageId()+ \"]\");\ndidShow(data, inboxMessage);\n}\n@@ -225,6 +227,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n}\nvoid didShow(Bundle data, CTInboxMessage inboxMessage) {\n+ Log.e(\"CleverTapTest\", \"CTInboxActivity:didShow() called with: data = [\" + data + \"], inboxMessage = [\" + inboxMessage.getMessageId() + \"]\");\nInboxActivityListener listener = getListener();\nif (listener != null) {\nlistener.messageDidShow(this, inboxMessage, data);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxController.java",
"diff": "package com.clevertap.android.sdk.inbox;\n+import android.util.Log;\n+\nimport androidx.annotation.AnyThread;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\n@@ -126,6 +128,8 @@ public class CTInboxController {\n// always call async\n@WorkerThread\npublic boolean updateMessages(final JSONArray inboxMessages) {\n+ Log.e(\"CleverTapTest\", \"CTInboxController:updateMessages() called\");\n+\nboolean haveUpdates = false;\nArrayList<CTMessageDAO> newMessages = new ArrayList<>();\n@@ -222,6 +226,7 @@ public class CTInboxController {\n@AnyThread\nprivate void trimMessages() {\n+ Log.e(\"CleverTapTest\", \"CTInboxController:trimMessages() called\");\nArrayList<CTMessageDAO> toDelete = new ArrayList<>();\nsynchronized (messagesLock) {\nfor (CTMessageDAO message : this.messages) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxListViewFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxListViewFragment.java",
"diff": "@@ -8,6 +8,7 @@ import android.os.Bundle;\nimport android.os.Handler;\nimport android.os.Looper;\nimport android.os.Parcelable;\n+import android.util.Log;\nimport android.view.LayoutInflater;\nimport android.view.View;\nimport android.view.ViewGroup;\n@@ -58,6 +59,8 @@ public class CTInboxListViewFragment extends Fragment {\nMediaPlayerRecyclerView mediaRecyclerView;\nRecyclerView recyclerView;\n+ private CTInboxMessageAdapter inboxMessageAdapter;\n+\nCTInboxStyleConfig styleConfig;\n@@ -75,17 +78,23 @@ public class CTInboxListViewFragment extends Fragment {\nconfig = bundle.getParcelable(\"config\");\nstyleConfig = bundle.getParcelable(\"styleConfig\");\ntabPosition = bundle.getInt(\"position\", -1);\n- final String filter = bundle.getString(\"filter\", null);\n+ updateInboxMessages();\nif (context instanceof CTInboxActivity) {\nsetListener((CTInboxListViewFragment.InboxListener) getActivity());\n}\n+ }\n+ }\n+ private void updateInboxMessages(){\n+ Bundle bundle = getArguments();\n+ if(bundle==null) return;\n+ final String filter = bundle.getString(\"filter\", null);\nCleverTapAPI cleverTapAPI = CleverTapAPI.instanceWithConfig(getActivity(), config);\nif (cleverTapAPI != null) {\n+ Log.e(\"CleverTapTest\", \"CTInboxListViewFragment:onAttach() called with: tabPosition = [\" + tabPosition + \"], filter = [\" + filter + \"]\");\nArrayList<CTInboxMessage> allMessages = cleverTapAPI.getAllInboxMessages();\ninboxMessages = filter != null ? filterMessages(allMessages, filter) : allMessages;\n}\n}\n- }\n@Nullable\n@Override\n@@ -106,7 +115,7 @@ public class CTInboxListViewFragment extends Fragment {\nnoMessageView.setVisibility(View.GONE);\nfinal LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());\n- final CTInboxMessageAdapter inboxMessageAdapter = new CTInboxMessageAdapter(inboxMessages, this);\n+ inboxMessageAdapter= new CTInboxMessageAdapter(inboxMessages, this);\nif (haveVideoPlayerSupport) {\nmediaRecyclerView = new MediaPlayerRecyclerView(getActivity());\n@@ -215,8 +224,11 @@ public class CTInboxListViewFragment extends Fragment {\nvoid didShow(Bundle data, int position) {\nCTInboxListViewFragment.InboxListener listener = getListener();\nif (listener != null) {\n+ Log.d(\"CleverTapTest\", \"CTInboxListViewFragment:didShow() called with: data = [\" + data + \"], position = [\" + position + \"]\");\n//noinspection ConstantConditions\nlistener.messageDidShow(getActivity().getBaseContext(), inboxMessages.get(position), data);\n+ updateInboxMessages();\n+ inboxMessageAdapter.updateInboxMessages(inboxMessages);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessage.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessage.java",
"diff": "@@ -2,9 +2,12 @@ package com.clevertap.android.sdk.inbox;\nimport android.os.Parcel;\nimport android.os.Parcelable;\n+import android.util.Log;\n+\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.Logger;\nimport java.util.ArrayList;\n+import java.util.Date;\nimport java.util.List;\nimport org.json.JSONArray;\nimport org.json.JSONException;\n@@ -79,6 +82,7 @@ public class CTInboxMessage implements Parcelable {\nthis.expires = jsonObject.has(Constants.KEY_WZRK_TTL) ? jsonObject.getLong(Constants.KEY_WZRK_TTL)\n: System.currentTimeMillis() + 1000 * 60 * 60 * 24;\nthis.isRead = jsonObject.has(Constants.KEY_IS_READ) && jsonObject.getBoolean(Constants.KEY_IS_READ);\n+ Log.e(\"CleverTapTest\", \"CTInboxMessage:\"+\"constructor called at \"+new Date()+\" | setting inbox isread= \"+isRead() +\" for id:\"+messageId );\nJSONArray tagsArray = jsonObject.has(Constants.KEY_TAGS) ? jsonObject.getJSONArray(Constants.KEY_TAGS)\n: null;\nif (tagsArray != null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessageAdapter.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessageAdapter.java",
"diff": "package com.clevertap.android.sdk.inbox;\n+import android.util.Log;\nimport android.view.LayoutInflater;\nimport android.view.View;\nimport android.view.ViewGroup;\n@@ -7,6 +8,7 @@ import androidx.annotation.NonNull;\nimport androidx.recyclerview.widget.RecyclerView;\nimport com.clevertap.android.sdk.R;\nimport java.util.ArrayList;\n+import java.util.Date;\n@SuppressWarnings(\"rawtypes\")\n@@ -25,10 +27,18 @@ class CTInboxMessageAdapter extends RecyclerView.Adapter {\nprivate ArrayList<CTInboxMessage> inboxMessages;\nCTInboxMessageAdapter(ArrayList<CTInboxMessage> inboxMessages, CTInboxListViewFragment fragment) {\n+ Log.e(\"CleverTapTest\", \"CTInboxMessageAdapter: called at \"+new Date());\n+ Log.e(\"CleverTapTest\", \"CTInboxMessageAdapter: messages=\"+inboxMessages);\nthis.inboxMessages = inboxMessages;\nthis.fragment = fragment;\n}\n+ protected synchronized void updateInboxMessages(ArrayList<CTInboxMessage> newList) {\n+ this.inboxMessages.clear();\n+ this.inboxMessages.addAll(newList);\n+ this.notifyDataSetChanged();\n+ }\n+\n@Override\npublic int getItemCount() {\nreturn inboxMessages.size();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTMessageDAO.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTMessageDAO.java",
"diff": "package com.clevertap.android.sdk.inbox;\nimport android.text.TextUtils;\n+import android.util.Log;\n+\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.Constants;\n@@ -54,6 +56,7 @@ public class CTMessageDAO {\n}\nboolean containsVideoOrAudio() {\n+ Log.e(\"CleverTapTest\", \"CTMessageDAO:containsVideoOrAudio() called\");\nCTInboxMessageContent content = new CTInboxMessage(this.toJSON()).getInboxMessageContents().get(0);\nreturn (content.mediaIsVideo() || content.mediaIsAudio());\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTSimpleMessageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTSimpleMessageViewHolder.java",
"diff": "@@ -378,7 +378,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nif (readDot.getVisibility() == View.VISIBLE) {\nparent.didShow(null, position);\n}\n- readDot.setVisibility(View.GONE);\n+ //readDot.setVisibility(View.GONE);\n}\n});\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1767] app inbox blue dot fix part 1/n |
116,620 | 10.08.2022 15:36:47 | -19,080 | c509db1c2d44e79760f136af79f532fb644ca38d | app inbox blue dot fix part 2/n | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -20,6 +20,8 @@ import android.net.Uri;\nimport android.os.Build;\nimport android.os.Bundle;\nimport android.text.TextUtils;\n+import android.util.Log;\n+\nimport androidx.annotation.NonNull;\nimport androidx.annotation.Nullable;\nimport androidx.annotation.RequiresApi;\n@@ -1273,6 +1275,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\npublic ArrayList<CTInboxMessage> getAllInboxMessages() {\n+ Logger.d(\"CleverTapAPI:getAllInboxMessages: called\" );\nArrayList<CTInboxMessage> inboxMessageArrayList = new ArrayList<>();\nsynchronized (coreState.getCTLockManager().getInboxControllerLock()) {\nif (coreState.getControllerManager().getCTInboxController() != null) {\n@@ -1626,6 +1629,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\npublic CTInboxMessage getInboxMessageForId(String messageId) {\n+ Logger.d(\"CleverTapAPI:getInboxMessageForId() called with: messageId = [\" + messageId + \"]\");\nsynchronized (coreState.getCTLockManager().getInboxControllerLock()) {\nif (coreState.getControllerManager().getCTInboxController() != null) {\nCTMessageDAO message = coreState.getControllerManager().getCTInboxController()\n@@ -1873,12 +1877,13 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n//Session\n@Override\n- public void messageDidShow(CTInboxActivity ctInboxActivity, final CTInboxMessage inboxMessage,\n- final Bundle data) {\n+ public void messageDidShow(CTInboxActivity ctInboxActivity, final CTInboxMessage inboxMessage, final Bundle data) {\nTask<Void> task = CTExecutorFactory.executors(coreState.getConfig()).postAsyncSafelyTask();\ntask.execute(\"handleMessageDidShow\", new Callable<Void>() {\n@Override\npublic Void call() {\n+ Logger.d(\"CleverTapAPI:messageDidShow() called in async with: messageId = [\" + inboxMessage.getMessageId() + \"]\");\n+\nCTInboxMessage message = getInboxMessageForId(inboxMessage.getMessageId());\nif (!message.isRead()) {\nmarkReadInboxMessage(inboxMessage);\n@@ -2152,6 +2157,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\n@SuppressWarnings(\"unused\")\npublic void pushInboxNotificationClickedEvent(String messageId) {\n+ Logger.d(\"CleverTapTest\", \"CleverTapAPI:pushInboxNotificationClickedEvent() called with: messageId = [\" +messageId + \"]\");\n+\nCTInboxMessage message = getInboxMessageForId(messageId);\ncoreState.getAnalyticsManager().pushInboxMessageStateEvent(true, message, null);\n}\n@@ -2163,6 +2170,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\n@SuppressWarnings(\"unused\")\npublic void pushInboxNotificationViewedEvent(String messageId) {\n+ Log.e(\"CleverTapTest\", \"CleverTapAPI:pushInboxNotificationViewedEvent() called with: messageId = [\" +messageId + \"]\");\nCTInboxMessage message = getInboxMessageForId(messageId);\ncoreState.getAnalyticsManager().pushInboxMessageStateEvent(false, message, null);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTCarouselImageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTCarouselImageViewHolder.java",
"diff": "@@ -136,7 +136,7 @@ class CTCarouselImageViewHolder extends CTInboxBaseMessageViewHolder {\nparentWeak.didShow(null, position);\n}\n}\n- carouselReadDot.setVisibility(View.GONE);\n+ //carouselReadDot.setVisibility(View.GONE);\n}\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTCarouselMessageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTCarouselMessageViewHolder.java",
"diff": "@@ -74,7 +74,7 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nprivate final ImageView readDot;\n- private ImageView carouselReadDot;\n+ private ImageView carouselReadDot;//todo WARNING : isn't this undefined?\nprivate final LinearLayout sliderDots;\n@@ -160,14 +160,14 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nparentWeak.didShow(null, position);\n}\n}\n- carouselReadDot.setVisibility(View.GONE);\n+ //carouselReadDot.setVisibility(View.GONE);\n} else {\nif (readDot.getVisibility() == View.VISIBLE) {\nif (parentWeak != null) {\nparentWeak.didShow(null, position);\n}\n}\n- readDot.setVisibility(View.GONE);\n+ //readDot.setVisibility(View.GONE);\n}\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTIconMessageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTIconMessageViewHolder.java",
"diff": "@@ -387,7 +387,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nif (readDot.getVisibility() == View.VISIBLE) {\nparent.didShow(null, position);\n}\n- readDot.setVisibility(View.GONE);\n+ //readDot.setVisibility(View.GONE);\n}\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxActivity.java",
"diff": "@@ -5,6 +5,7 @@ import android.graphics.Color;\nimport android.graphics.PorterDuff;\nimport android.graphics.drawable.Drawable;\nimport android.os.Bundle;\n+import android.util.Log;\nimport android.view.View;\nimport android.widget.FrameLayout;\nimport android.widget.LinearLayout;\n@@ -16,6 +17,8 @@ import androidx.core.content.res.ResourcesCompat;\nimport androidx.fragment.app.Fragment;\nimport androidx.fragment.app.FragmentActivity;\nimport androidx.viewpager.widget.ViewPager;\n+\n+import com.clevertap.android.sdk.CTInboxListener;\nimport com.clevertap.android.sdk.CTInboxStyleConfig;\nimport com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n@@ -31,7 +34,7 @@ import java.util.List;\n* This activity shows the {@link CTInboxMessage} objects as per {@link CTInboxStyleConfig} style parameters\n*/\n@RestrictTo(Scope.LIBRARY)\n-public class CTInboxActivity extends FragmentActivity implements CTInboxListViewFragment.InboxListener {\n+public class CTInboxActivity extends FragmentActivity implements CTInboxListViewFragment.InboxListener, CTInboxListener {\npublic interface InboxActivityListener {\n@@ -54,10 +57,11 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nprivate CleverTapInstanceConfig config;\nprivate WeakReference<InboxActivityListener> listenerWeakReference;\n+ private CleverTapAPI cleverTapAPI;\n+ private CTInboxListener inboxContentUpdatedListener = null;\npublic void onCreate(Bundle savedInstanceState) {\nsuper.onCreate(savedInstanceState);\n- CleverTapAPI cleverTapAPI;\ntry {\nBundle extras = getIntent().getExtras();\nif (extras == null) {\n@@ -71,6 +75,8 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\ncleverTapAPI = CleverTapAPI.instanceWithConfig(getApplicationContext(), config);\nif (cleverTapAPI != null) {\nsetListener(cleverTapAPI);\n+ inboxContentUpdatedListener = cleverTapAPI.getCTNotificationInboxListener();\n+ cleverTapAPI.setCTNotificationInboxListener(this);\n}\norientation = getResources().getConfiguration().orientation;\n} catch (Throwable t) {\n@@ -206,6 +212,31 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nsuper.onDestroy();\n}\n+\n+ @Override\n+ public void inboxDidInitialize() {\n+\n+ Logger.d(\"CTInboxActivity: called inboxDidInitialize\");\n+ if(inboxContentUpdatedListener !=null) {\n+ inboxContentUpdatedListener.inboxDidInitialize();\n+ }\n+\n+\n+ }\n+\n+ @Override\n+ public void inboxMessagesDidUpdate() {\n+ Logger.d(\"CTInboxActivity: called inboxMessagesDidUpdate\");\n+ if (inboxContentUpdatedListener != null) {\n+ inboxContentUpdatedListener.inboxMessagesDidUpdate();\n+ }\n+\n+ int position = viewPager.getCurrentItem();\n+ CTInboxListViewFragment fragment = (CTInboxListViewFragment) inboxTabAdapter.getItem(position);\n+ fragment.updateAdapterContent();\n+\n+ }\n+\n@Override\npublic void messageDidClick(Context baseContext, CTInboxMessage inboxMessage, Bundle data,\nHashMap<String, String> keyValue) {\n@@ -214,6 +245,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n@Override\npublic void messageDidShow(Context baseContext, CTInboxMessage inboxMessage, Bundle data) {\n+ Log.e(\"CleverTapTest\", \"CTInboxActivity:messageDidShow() called with: data = [\" + data + \"], inboxMessage = [\" + inboxMessage .getMessageId()+ \"]\");\ndidShow(data, inboxMessage);\n}\n@@ -225,6 +257,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n}\nvoid didShow(Bundle data, CTInboxMessage inboxMessage) {\n+ Log.e(\"CleverTapTest\", \"CTInboxActivity:didShow() called with: data = [\" + data + \"], inboxMessage = [\" + inboxMessage.getMessageId() + \"]\");\nInboxActivityListener listener = getListener();\nif (listener != null) {\nlistener.messageDidShow(this, inboxMessage, data);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxController.java",
"diff": "package com.clevertap.android.sdk.inbox;\n+import android.util.Log;\n+\nimport androidx.annotation.AnyThread;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\n@@ -10,6 +12,8 @@ import com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.db.DBAdapter;\nimport com.clevertap.android.sdk.task.CTExecutorFactory;\n+import com.clevertap.android.sdk.task.OnFailureListener;\n+import com.clevertap.android.sdk.task.OnSuccessListener;\nimport com.clevertap.android.sdk.task.Task;\nimport java.util.ArrayList;\nimport java.util.concurrent.Callable;\n@@ -126,6 +130,8 @@ public class CTInboxController {\n// always call async\n@WorkerThread\npublic boolean updateMessages(final JSONArray inboxMessages) {\n+ Log.e(\"CleverTapTest\", \"CTInboxController:updateMessages() called\");\n+\nboolean haveUpdates = false;\nArrayList<CTMessageDAO> newMessages = new ArrayList<>();\n@@ -196,6 +202,9 @@ public class CTInboxController {\nmessageDAO.setRead(1);\n}\nTask<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n+ task.addOnSuccessListener(unused -> callbackManager._notifyInboxMessagesDidUpdate() );// //OR callbackManager.getInboxListener().inboxMessagesDidUpdate();//todo\n+ task.addOnFailureListener(e -> Logger.d(\"Failed to update message read state for id:\"+messageId,e));\n+\ntask.execute(\"RunMarkMessageRead\", new Callable<Void>() {\n@Override\n@WorkerThread\n@@ -222,6 +231,7 @@ public class CTInboxController {\n@AnyThread\nprivate void trimMessages() {\n+ Log.e(\"CleverTapTest\", \"CTInboxController:trimMessages() called\");\nArrayList<CTMessageDAO> toDelete = new ArrayList<>();\nsynchronized (messagesLock) {\nfor (CTMessageDAO message : this.messages) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxListViewFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxListViewFragment.java",
"diff": "@@ -8,6 +8,7 @@ import android.os.Bundle;\nimport android.os.Handler;\nimport android.os.Looper;\nimport android.os.Parcelable;\n+import android.util.Log;\nimport android.view.LayoutInflater;\nimport android.view.View;\nimport android.view.ViewGroup;\n@@ -58,6 +59,8 @@ public class CTInboxListViewFragment extends Fragment {\nMediaPlayerRecyclerView mediaRecyclerView;\nRecyclerView recyclerView;\n+ private CTInboxMessageAdapter inboxMessageAdapter;\n+\nCTInboxStyleConfig styleConfig;\n@@ -75,16 +78,28 @@ public class CTInboxListViewFragment extends Fragment {\nconfig = bundle.getParcelable(\"config\");\nstyleConfig = bundle.getParcelable(\"styleConfig\");\ntabPosition = bundle.getInt(\"position\", -1);\n- final String filter = bundle.getString(\"filter\", null);\n+ updateInboxMessages();\nif (context instanceof CTInboxActivity) {\nsetListener((CTInboxListViewFragment.InboxListener) getActivity());\n}\n+ }\n+ }\n+ private void updateInboxMessages(){\n+ Bundle bundle = getArguments();\n+ if(bundle==null) return;\n+ final String filter = bundle.getString(\"filter\", null);\nCleverTapAPI cleverTapAPI = CleverTapAPI.instanceWithConfig(getActivity(), config);\nif (cleverTapAPI != null) {\n+ Log.e(\"CleverTapTest\", \"CTInboxListViewFragment:onAttach() called with: tabPosition = [\" + tabPosition + \"], filter = [\" + filter + \"]\");\nArrayList<CTInboxMessage> allMessages = cleverTapAPI.getAllInboxMessages();\ninboxMessages = filter != null ? filterMessages(allMessages, filter) : allMessages;\n}\n}\n+\n+ void updateAdapterContent(){\n+ updateInboxMessages();\n+ if(inboxMessageAdapter==null || inboxMessages==null || config ==null ) return;\n+ inboxMessageAdapter.updateInboxMessages(inboxMessages);\n}\n@Nullable\n@@ -106,7 +121,7 @@ public class CTInboxListViewFragment extends Fragment {\nnoMessageView.setVisibility(View.GONE);\nfinal LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());\n- final CTInboxMessageAdapter inboxMessageAdapter = new CTInboxMessageAdapter(inboxMessages, this);\n+ inboxMessageAdapter= new CTInboxMessageAdapter(inboxMessages, this);\nif (haveVideoPlayerSupport) {\nmediaRecyclerView = new MediaPlayerRecyclerView(getActivity());\n@@ -215,6 +230,7 @@ public class CTInboxListViewFragment extends Fragment {\nvoid didShow(Bundle data, int position) {\nCTInboxListViewFragment.InboxListener listener = getListener();\nif (listener != null) {\n+ Log.d(\"CleverTapTest\", \"CTInboxListViewFragment:didShow() called with: data = [\" + data + \"], position = [\" + position + \"]\");\n//noinspection ConstantConditions\nlistener.messageDidShow(getActivity().getBaseContext(), inboxMessages.get(position), data);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessage.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessage.java",
"diff": "@@ -5,6 +5,7 @@ import android.os.Parcelable;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.Logger;\nimport java.util.ArrayList;\n+import java.util.Date;\nimport java.util.List;\nimport org.json.JSONArray;\nimport org.json.JSONException;\n@@ -79,6 +80,7 @@ public class CTInboxMessage implements Parcelable {\nthis.expires = jsonObject.has(Constants.KEY_WZRK_TTL) ? jsonObject.getLong(Constants.KEY_WZRK_TTL)\n: System.currentTimeMillis() + 1000 * 60 * 60 * 24;\nthis.isRead = jsonObject.has(Constants.KEY_IS_READ) && jsonObject.getBoolean(Constants.KEY_IS_READ);\n+ Logger.d(\"CTInboxMessage:\"+\"constructor called at \"+new Date()+\" | setting inbox isread= \"+isRead() +\" for id:\"+messageId );\nJSONArray tagsArray = jsonObject.has(Constants.KEY_TAGS) ? jsonObject.getJSONArray(Constants.KEY_TAGS)\n: null;\nif (tagsArray != null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessageAdapter.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessageAdapter.java",
"diff": "package com.clevertap.android.sdk.inbox;\n+import android.util.Log;\nimport android.view.LayoutInflater;\nimport android.view.View;\nimport android.view.ViewGroup;\nimport androidx.annotation.NonNull;\nimport androidx.recyclerview.widget.RecyclerView;\n+\n+import com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.R;\nimport java.util.ArrayList;\n+import java.util.Date;\n@SuppressWarnings(\"rawtypes\")\n@@ -25,10 +29,18 @@ class CTInboxMessageAdapter extends RecyclerView.Adapter {\nprivate ArrayList<CTInboxMessage> inboxMessages;\nCTInboxMessageAdapter(ArrayList<CTInboxMessage> inboxMessages, CTInboxListViewFragment fragment) {\n+ Logger.d( \"CTInboxMessageAdapter: called at \"+new Date());\n+ Logger.d(\"CTInboxMessageAdapter: messages=\"+inboxMessages);\nthis.inboxMessages = inboxMessages;\nthis.fragment = fragment;\n}\n+ protected synchronized void updateInboxMessages(ArrayList<CTInboxMessage> newList) {\n+ this.inboxMessages.clear();\n+ this.inboxMessages.addAll(newList);\n+ this.notifyDataSetChanged();\n+ }\n+\n@Override\npublic int getItemCount() {\nreturn inboxMessages.size();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTMessageDAO.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTMessageDAO.java",
"diff": "package com.clevertap.android.sdk.inbox;\nimport android.text.TextUtils;\n+import android.util.Log;\n+\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.Constants;\n@@ -54,6 +56,7 @@ public class CTMessageDAO {\n}\nboolean containsVideoOrAudio() {\n+ Logger.d(\"CTMessageDAO:containsVideoOrAudio() called\");\nCTInboxMessageContent content = new CTInboxMessage(this.toJSON()).getInboxMessageContents().get(0);\nreturn (content.mediaIsVideo() || content.mediaIsAudio());\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTSimpleMessageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTSimpleMessageViewHolder.java",
"diff": "@@ -378,7 +378,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nif (readDot.getVisibility() == View.VISIBLE) {\nparent.didShow(null, position);\n}\n- readDot.setVisibility(View.GONE);\n+ //readDot.setVisibility(View.GONE);\n}\n});\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1767] app inbox blue dot fix part 2/n |
116,620 | 17.08.2022 12:17:38 | -19,080 | feea4e23c75618120056b36d68ea512e2534c0bc | new onclick listener for inbox items part 1 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -20,6 +20,8 @@ import android.net.Uri;\nimport android.os.Build;\nimport android.os.Bundle;\nimport android.text.TextUtils;\n+import android.util.Log;\n+\nimport androidx.annotation.NonNull;\nimport androidx.annotation.Nullable;\nimport androidx.annotation.RequiresApi;\n@@ -139,6 +141,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nprivate WeakReference<InboxMessageButtonListener> inboxMessageButtonListener;\n+ private WeakReference<InboxMessageListener> inboxMessageListener;\n+\n/**\n* This method is used to change the credentials of CleverTap account Id and token programmatically\n*\n@@ -1860,21 +1864,29 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n@Override\n- public void messageDidClick(CTInboxActivity ctInboxActivity, CTInboxMessage inboxMessage, Bundle data,\n- HashMap<String, String> keyValue) {\n+ public void messageDidClick(CTInboxActivity ctInboxActivity, CTInboxMessage inboxMessage, Bundle data, HashMap<String, String> keyValue) {\n+ Log.d(\"CleverTap\", \"CleverTapApi.java|messageDidClick() called with: ctInboxActivity = [\" + ctInboxActivity + \"], inboxMessage = [\" + inboxMessage + \"], data = [\" + data + \"], keyValue = [\" + keyValue + \"]\");\n+\ncoreState.getAnalyticsManager().pushInboxMessageStateEvent(true, inboxMessage, data);\n+\nif (keyValue != null && !keyValue.isEmpty()) {\n+ Log.e(\"CleverTap\", \"CleverTapApi.java|messageDidClick: keyvalue is not null, therefore this function is called via button click. calling inboxMessageButtonListener if not empty\" );\nif (inboxMessageButtonListener != null && inboxMessageButtonListener.get() != null) {\ninboxMessageButtonListener.get().onInboxButtonClick(keyValue);\n}\n}\n+ else{\n+ Log.e(\"CleverTap\", \"CleverTapApi.java|messageDidClick: keyvalue is null, therefore this function is called via view click. calling inboxMessageListener if not empty\" );\n+ if (inboxMessageListener != null && inboxMessageListener.get() != null) {\n+ inboxMessageListener.get().onInboxItemClicked(inboxMessage);\n+ }\n+ }\n}\n//Session\n@Override\n- public void messageDidShow(CTInboxActivity ctInboxActivity, final CTInboxMessage inboxMessage,\n- final Bundle data) {\n+ public void messageDidShow(CTInboxActivity ctInboxActivity, final CTInboxMessage inboxMessage, final Bundle data) {\nTask<Void> task = CTExecutorFactory.executors(coreState.getConfig()).postAsyncSafelyTask();\ntask.execute(\"handleMessageDidShow\", new Callable<Void>() {\n@Override\n@@ -2387,6 +2399,11 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nthis.inboxMessageButtonListener = new WeakReference<>(listener);\n}\n+ @SuppressWarnings(\"unused\")\n+ public void setInboxMessageListener(InboxMessageListener listener){\n+ this.inboxMessageListener = new WeakReference<>(listener);\n+ }\n+\n@RestrictTo(Scope.LIBRARY_GROUP)\npublic void setNotificationRenderedListener(final NotificationRenderedListener notificationRenderedListener) {\ncoreState.getCallbackManager().setNotificationRenderedListener(notificationRenderedListener);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InboxMessageListener.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import com.clevertap.android.sdk.inbox.CTInboxMessage;\n+\n+public interface InboxMessageListener {\n+ /**\n+ * callback to transfer payload when inbox button is clicked\n+ */\n+ void onInboxItemClicked(CTInboxMessage message);\n+}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1910] new onclick listener for inbox items part 1 |
116,620 | 17.08.2022 13:32:55 | -19,080 | 9cd95e164b7110b1bb9df780a010904ef8ec1ef2 | new onclick listener for inbox items part 2 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1864,8 +1864,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n@Override\n- public void messageDidClick(CTInboxActivity ctInboxActivity, CTInboxMessage inboxMessage, Bundle data, HashMap<String, String> keyValue) {\n- Log.d(\"CleverTap\", \"CleverTapApi.java|messageDidClick() called with: ctInboxActivity = [\" + ctInboxActivity + \"], inboxMessage = [\" + inboxMessage + \"], data = [\" + data + \"], keyValue = [\" + keyValue + \"]\");\n+ public void messageDidClick(CTInboxActivity ctInboxActivity, CTInboxMessage inboxMessage, Bundle data, HashMap<String, String> keyValue, boolean isBodyClick) {\n+ Log.e(\"CleverTap\", \"CleverTapApi.java|messageDidClick() called with: ctInboxActivity = [\" + ctInboxActivity + \"], inboxMessage = [\" + inboxMessage + \"], data = [\" + data + \"], keyValue = [\" + keyValue + \"], isBodyClick = [\" + isBodyClick + \"]\");\ncoreState.getAnalyticsManager().pushInboxMessageStateEvent(true, inboxMessage, data);\n@@ -1877,7 +1877,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\nelse{\nLog.e(\"CleverTap\", \"CleverTapApi.java|messageDidClick: keyvalue is null, therefore this function is called via view click. calling inboxMessageListener if not empty\" );\n- if (inboxMessageListener != null && inboxMessageListener.get() != null) {\n+ if (isBodyClick && inboxMessageListener != null && inboxMessageListener.get() != null) {\ninboxMessageListener.get().onInboxItemClicked(inboxMessage);\n}\n}\n@@ -2937,3 +2937,56 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n+/* full message click\n+\n+inboxMessage = {CTInboxMessage@43330}\n+ actionUrl = null\n+ bgColor = \"#ffffff\"\n+ body = null\n+ campaignId = \"1660721033_20220817\"\n+ customData = null\n+ data = {JSONObject@43340} \"{\"id\":\"1660721033_1660721899\",\"msg\":{\"type\":\"simple\",\"bg\":\"#ffffff\",\"orientation\":\"p\",\"content\":[{\"key\":3688751294,\"message\":{\"text\":\"message message message\",\"color\":\"#434761\",\"replacements\":\"message message message\",\"og\":\"\"},\"title\":{\"text\":\"title title title\",\"color\":\"#434761\",\"replacements\":\"title title title\",\"og\":\"\"},\"action\":{\"hasUrl\":true,\"hasLinks\":true,\"url\":{\"android\":{\"text\":\"https:\\/\\/www.google.com\\/search?q=you+clicked+onMessage+androidUrl\",\"replacements\":\"https:\\/\\/www.google.com\\/search?q=you+clicked+onMessage+androidUrl\",\"og\":\"\"},\"ios\":{\"text\":\"https:\\/\\/www.google.com\\/search?q=you+clicked+onMessage+iosUrl\",\"replacements\":\"https:\\/\\/www.google.com\\/search?q=you+clicked+onMessage+iosUrl\",\"og\":\"\"}},\"links\":[{\"type\":\"url\",\"text\":\"url button\",\"color\":\"#007bff\",\"bg\":\"#ffffff\",\"copyText\":{\"text\":\"\",\"replacements\":\"\",\"og\":\"\"},\"url\":{\"android\":{\"text\":\"https:\\/\\/www.google.com\\/search?q=you+clicked+onLink+androidUrl\",\"replacements\":\"https:\\/\\/www.google.com\\/search?q=you+cli\"\n+ date = 1660721899\n+ expires = 0\n+ imageUrl = null\n+ inboxMessageContents = {ArrayList@43341} size = 1\n+ isRead = false\n+ messageId = \"1660721033_1660721899\"\n+ orientation = \"p\"\n+ tags = {ArrayList@43344} size = 1\n+ title = null\n+ type = {CTInboxMessageType@43345} \"simple\"\n+ wzrkParams = {JSONObject@43346} \"{\"wzrk_ttl\":\"0\",\"wzrk_id\":\"1660721033_20220817\",\"wzrk_pivot\":\"wzrk_default\",\"wzrk_c2a\":\"url button\"}\"\n+ shadow$_klass_ = {Class@42885} \"class com.clevertap.android.sdk.inbox.CTInboxMessage\"\n+ shadow$_monitor_ = 0\n+\n+* */\n+\n+\n+\n+/* btn click\n+\n+inboxMessage = {CTInboxMessage@43330}\n+ actionUrl = null\n+ bgColor = \"#ffffff\"\n+ body = null\n+ campaignId = \"1660721033_20220817\"\n+ customData = null\n+ data = {JSONObject@43340} \"{\"id\":\"1660721033_1660721899\",\"msg\":{\"type\":\"simple\",\"bg\":\"#ffffff\",\"orientation\":\"p\",\"content\":[{\"key\":3688751294,\"message\":{\"text\":\"message message message\",\"color\":\"#434761\",\"replacements\":\"message message message\",\"og\":\"\"},\"title\":{\"text\":\"title title title\",\"color\":\"#434761\",\"replacements\":\"title title title\",\"og\":\"\"},\"action\":{\"hasUrl\":true,\"hasLinks\":true,\"url\":{\"android\":{\"text\":\"https:\\/\\/www.google.com\\/search?q=you+clicked+onMessage+androidUrl\",\"replacements\":\"https:\\/\\/www.google.com\\/search?q=you+clicked+onMessage+androidUrl\",\"og\":\"\"},\"ios\":{\"text\":\"https:\\/\\/www.google.com\\/search?q=you+clicked+onMessage+iosUrl\",\"replacements\":\"https:\\/\\/www.google.com\\/search?q=you+clicked+onMessage+iosUrl\",\"og\":\"\"}},\"links\":[{\"type\":\"url\",\"text\":\"url button\",\"color\":\"#007bff\",\"bg\":\"#ffffff\",\"copyText\":{\"text\":\"\",\"replacements\":\"\",\"og\":\"\"},\"url\":{\"android\":{\"text\":\"https:\\/\\/www.google.com\\/search?q=you+clicked+onLink+androidUrl\",\"replacements\":\"https:\\/\\/www.google.com\\/search?q=you+cli\"\n+ date = 1660721899\n+ expires = 0\n+ imageUrl = null\n+ inboxMessageContents = {ArrayList@43341} size = 1\n+ isRead = false\n+ messageId = \"1660721033_1660721899\"\n+ orientation = \"p\"\n+ tags = {ArrayList@43344} size = 1\n+ title = null\n+ type = {CTInboxMessageType@43345} \"simple\"\n+ wzrkParams = {JSONObject@43346} \"{\"wzrk_ttl\":\"0\",\"wzrk_id\":\"1660721033_20220817\",\"wzrk_pivot\":\"wzrk_default\",\"wzrk_c2a\":\"url button\"}\"\n+ shadow$_klass_ = {Class@42885} \"class com.clevertap.android.sdk.inbox.CTInboxMessage\"\n+ shadow$_monitor_ = 0\n+data = {Bundle@43509} \"Bundle[{wzrk_pivot=wzrk_default, wzrk_c2a=url button, wzrk_ttl=0, wzrk_id=1660721033_20220817}]\"\n+keyValue = null\n+\n+* */\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTCarouselImageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTCarouselImageViewHolder.java",
"diff": "@@ -119,7 +119,7 @@ class CTCarouselImageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.imageViewPager.addOnPageChangeListener(carouselPageChangeListener);\nthis.clickLayout.setOnClickListener(\n- new CTInboxButtonClickListener(position, inboxMessage, null, parentWeak, this.imageViewPager));\n+ new CTInboxButtonClickListener(position, inboxMessage, null, parentWeak, this.imageViewPager,true));\nRunnable carouselRunnable = new Runnable() {\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTCarouselMessageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTCarouselMessageViewHolder.java",
"diff": "@@ -142,7 +142,7 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.imageViewPager.addOnPageChangeListener(carouselPageChangeListener);\nthis.clickLayout.setOnClickListener(\n- new CTInboxButtonClickListener(position, inboxMessage, null, parentWeak, this.imageViewPager));\n+ new CTInboxButtonClickListener(position, inboxMessage, null, parentWeak, this.imageViewPager,true));\nRunnable carouselRunnable = new Runnable() {\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTCarouselViewPagerAdapter.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTCarouselViewPagerAdapter.java",
"diff": "@@ -111,7 +111,7 @@ public class CTCarouselViewPagerAdapter extends PagerAdapter {\npublic void onClick(View v) {\nCTInboxListViewFragment parent = getParent();\nif (parent != null) {\n- parent.handleViewPagerClick(row, position);\n+ parent.handleViewPagerClick(row, position,true);\n}\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTIconMessageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTIconMessageViewHolder.java",
"diff": "@@ -105,7 +105,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nhideTwoButtons(this.cta1, this.cta2, this.cta3);\nif (parentWeak != null) {\nthis.cta1.setOnClickListener(new CTInboxButtonClickListener(position, inboxMessage,\n- this.cta1.getText().toString(), cta1Object, parentWeak));\n+ this.cta1.getText().toString(), cta1Object, parentWeak,false));\n}\nbreak;\ncase 2:\n@@ -122,9 +122,9 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nhideOneButton(this.cta1, this.cta2, this.cta3);\nif (parentWeak != null) {\nthis.cta1.setOnClickListener(new CTInboxButtonClickListener(position, inboxMessage,\n- this.cta1.getText().toString(), cta1Object, parentWeak));\n+ this.cta1.getText().toString(), cta1Object, parentWeak,false));\nthis.cta2.setOnClickListener(new CTInboxButtonClickListener(position, inboxMessage,\n- this.cta2.getText().toString(), cta2Object, parentWeak));\n+ this.cta2.getText().toString(), cta2Object, parentWeak,false));\n}\nbreak;\ncase 3:\n@@ -145,11 +145,11 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.cta3.setBackgroundColor(Color.parseColor(content.getLinkBGColor(cta3Object)));\nif (parentWeak != null) {\nthis.cta1.setOnClickListener(new CTInboxButtonClickListener(position, inboxMessage,\n- this.cta1.getText().toString(), cta1Object, parentWeak));\n+ this.cta1.getText().toString(), cta1Object, parentWeak,false));\nthis.cta2.setOnClickListener(new CTInboxButtonClickListener(position, inboxMessage,\n- this.cta2.getText().toString(), cta2Object, parentWeak));\n+ this.cta2.getText().toString(), cta2Object, parentWeak,false));\nthis.cta3.setOnClickListener(new CTInboxButtonClickListener(position, inboxMessage,\n- this.cta3.getText().toString(), cta3Object, parentWeak));\n+ this.cta3.getText().toString(), cta3Object, parentWeak,false));\n}\nbreak;\n}\n@@ -422,7 +422,7 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nif (parentWeak != null) {\nclickLayout.setOnClickListener(\n- new CTInboxButtonClickListener(position, inboxMessage, null, null, parentWeak));\n+ new CTInboxButtonClickListener(position, inboxMessage, null, null, parentWeak,true));\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxActivity.java",
"diff": "@@ -36,7 +36,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\npublic interface InboxActivityListener {\nvoid messageDidClick(CTInboxActivity ctInboxActivity, CTInboxMessage inboxMessage, Bundle data,\n- HashMap<String, String> keyValue);\n+ HashMap<String, String> keyValue,boolean isBodyClick);\nvoid messageDidShow(CTInboxActivity ctInboxActivity, CTInboxMessage inboxMessage, Bundle data);\n}\n@@ -208,8 +208,8 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n@Override\npublic void messageDidClick(Context baseContext, CTInboxMessage inboxMessage, Bundle data,\n- HashMap<String, String> keyValue) {\n- didClick(data, inboxMessage, keyValue);\n+ HashMap<String, String> keyValue, boolean isBodyClick) {\n+ didClick(data, inboxMessage, keyValue,isBodyClick);\n}\n@Override\n@@ -217,10 +217,10 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\ndidShow(data, inboxMessage);\n}\n- void didClick(Bundle data, CTInboxMessage inboxMessage, HashMap<String, String> keyValue) {\n+ void didClick(Bundle data, CTInboxMessage inboxMessage, HashMap<String, String> keyValue, boolean isBodyClick) {\nInboxActivityListener listener = getListener();\nif (listener != null) {\n- listener.messageDidClick(this, inboxMessage, data, keyValue);\n+ listener.messageDidClick(this, inboxMessage, data, keyValue,isBodyClick);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxButtonClickListener.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxButtonClickListener.java",
"diff": "@@ -26,23 +26,27 @@ class CTInboxButtonClickListener implements View.OnClickListener {\nprivate final int position;\nprivate ViewPager viewPager;\n+ private boolean isBodyClick;\nCTInboxButtonClickListener(int position, CTInboxMessage inboxMessage, String buttonText, JSONObject jsonObject,\n- CTInboxListViewFragment fragment) {\n+ CTInboxListViewFragment fragment, boolean isInboxMessageBodyClick) {\nthis.position = position;\nthis.inboxMessage = inboxMessage;\nthis.buttonText = buttonText;\nthis.fragment = fragment; // be sure to pass this as a Weak Ref\nthis.buttonObject = jsonObject;\n+ this.isBodyClick = isInboxMessageBodyClick;\n}\nCTInboxButtonClickListener(int position, CTInboxMessage inboxMessage, String buttonText,\n- CTInboxListViewFragment fragment, ViewPager viewPager) {\n+ CTInboxListViewFragment fragment, ViewPager viewPager, boolean isInboxMessageBodyClick) {\nthis.position = position;\nthis.inboxMessage = inboxMessage;\nthis.buttonText = buttonText;\nthis.fragment = fragment; // be sure to pass this as a Weak Ref\nthis.viewPager = viewPager;\n+ this.isBodyClick = isInboxMessageBodyClick;\n+\n}\n@@ -50,7 +54,7 @@ class CTInboxButtonClickListener implements View.OnClickListener {\npublic void onClick(View v) {\nif (viewPager != null) {//Handles viewpager clicks\nif (fragment != null) {\n- fragment.handleViewPagerClick(position, viewPager.getCurrentItem());\n+ fragment.handleViewPagerClick(position, viewPager.getCurrentItem(),isBodyClick);\n}\n} else {//Handles button clicks\nif (buttonText != null && buttonObject != null) {\n@@ -62,11 +66,11 @@ class CTInboxButtonClickListener implements View.OnClickListener {\n}\n}\n- fragment.handleClick(this.position, buttonText, buttonObject, getKeyValues(inboxMessage));\n+ fragment.handleClick(this.position, buttonText, buttonObject, getKeyValues(inboxMessage),isBodyClick);\n}\n} else {\nif (fragment != null) {\n- fragment.handleClick(this.position, null, null, null);\n+ fragment.handleClick(this.position, null, null, null,isBodyClick);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxListViewFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxListViewFragment.java",
"diff": "@@ -42,7 +42,7 @@ public class CTInboxListViewFragment extends Fragment {\ninterface InboxListener {\nvoid messageDidClick(Context baseContext, CTInboxMessage inboxMessage, Bundle data,\n- HashMap<String, String> keyValue);\n+ HashMap<String, String> keyValue,boolean isBodyClick);\nvoid messageDidShow(Context baseContext, CTInboxMessage inboxMessage, Bundle data);\n}\n@@ -202,12 +202,11 @@ public class CTInboxListViewFragment extends Fragment {\n}\n}\n- void didClick(Bundle data, int position, HashMap<String, String> keyValuePayload) {\n+ void didClick(Bundle data, int position, HashMap<String, String> keyValuePayload, boolean isInboxMessageBodyClick) {\nCTInboxListViewFragment.InboxListener listener = getListener();\nif (listener != null) {\n//noinspection ConstantConditions\n- listener.messageDidClick(getActivity().getBaseContext(), inboxMessages.get(position), data,\n- keyValuePayload);\n+ listener.messageDidClick(getActivity().getBaseContext(), inboxMessages.get(position), data, keyValuePayload, isInboxMessageBodyClick);\n}\n}\n@@ -257,8 +256,7 @@ public class CTInboxListViewFragment extends Fragment {\nthis.mediaRecyclerView = mediaRecyclerView;\n}\n- void handleClick(int position, String buttonText, JSONObject jsonObject,\n- HashMap<String, String> keyValuePayload) {\n+ void handleClick(int position, String buttonText, JSONObject jsonObject, HashMap<String, String> keyValuePayload, boolean isInboxMessageBodyClick) {\ntry {\nBundle data = new Bundle();\nJSONObject wzrkParams = inboxMessages.get(position).getWzrkParams();\n@@ -273,7 +271,7 @@ public class CTInboxListViewFragment extends Fragment {\nif (buttonText != null && !buttonText.isEmpty()) {\ndata.putString(\"wzrk_c2a\", buttonText);\n}\n- didClick(data, position, keyValuePayload);\n+ didClick(data, position, keyValuePayload,isInboxMessageBodyClick);\nboolean isKVButton = keyValuePayload != null && !keyValuePayload.isEmpty();\nif (jsonObject != null) {\nif (isKVButton || inboxMessages.get(position).getInboxMessageContents().get(0).getLinktype(jsonObject)\n@@ -298,7 +296,7 @@ public class CTInboxListViewFragment extends Fragment {\n}\n}\n- void handleViewPagerClick(int position, int viewPagerPosition) {\n+ void handleViewPagerClick(int position, int viewPagerPosition,boolean isInboxMessageBodyClick) {\ntry {\nBundle data = new Bundle();\nJSONObject wzrkParams = inboxMessages.get(position).getWzrkParams();\n@@ -309,7 +307,7 @@ public class CTInboxListViewFragment extends Fragment {\ndata.putString(keyName, wzrkParams.getString(keyName));\n}\n}\n- didClick(data, position, null);\n+ didClick(data, position, null,isInboxMessageBodyClick);\nString actionUrl = inboxMessages.get(position).getInboxMessageContents().get(viewPagerPosition)\n.getActionUrl();\nfireUrlThroughIntent(actionUrl);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTSimpleMessageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTSimpleMessageViewHolder.java",
"diff": "@@ -101,7 +101,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nhideTwoButtons(this.cta1, this.cta2, this.cta3);\nif (parentWeak != null) {\nthis.cta1.setOnClickListener(new CTInboxButtonClickListener(position, inboxMessage,\n- this.cta1.getText().toString(), cta1Object, parentWeak));\n+ this.cta1.getText().toString(), cta1Object, parentWeak,false));\n}\nbreak;\ncase 2:\n@@ -118,9 +118,9 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nhideOneButton(this.cta1, this.cta2, this.cta3);\nif (parentWeak != null) {\nthis.cta1.setOnClickListener(new CTInboxButtonClickListener(position, inboxMessage,\n- this.cta1.getText().toString(), cta1Object, parentWeak));\n+ this.cta1.getText().toString(), cta1Object, parentWeak,false));\nthis.cta2.setOnClickListener(new CTInboxButtonClickListener(position, inboxMessage,\n- this.cta2.getText().toString(), cta2Object, parentWeak));\n+ this.cta2.getText().toString(), cta2Object, parentWeak,false));\n}\nbreak;\ncase 3:\n@@ -141,11 +141,11 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.cta3.setBackgroundColor(Color.parseColor(content.getLinkBGColor(cta3Object)));\nif (parentWeak != null) {\nthis.cta1.setOnClickListener(new CTInboxButtonClickListener(position, inboxMessage,\n- this.cta1.getText().toString(), cta1Object, parentWeak));\n+ this.cta1.getText().toString(), cta1Object, parentWeak,false));\nthis.cta2.setOnClickListener(new CTInboxButtonClickListener(position, inboxMessage,\n- this.cta2.getText().toString(), cta2Object, parentWeak));\n+ this.cta2.getText().toString(), cta2Object, parentWeak,false));\nthis.cta3.setOnClickListener(new CTInboxButtonClickListener(position, inboxMessage,\n- this.cta3.getText().toString(), cta3Object, parentWeak));\n+ this.cta3.getText().toString(), cta3Object, parentWeak,false));\n}\nbreak;\n}\n@@ -389,7 +389,7 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nsimpleHandler.postDelayed(simpleRunnable, 2000);\nif (parentWeak != null) {\nthis.clickLayout.setOnClickListener(\n- new CTInboxButtonClickListener(position, inboxMessage, null, null, parentWeak));\n+ new CTInboxButtonClickListener(position, inboxMessage, null, null, parentWeak,true));\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1910] new onclick listener for inbox items part 2 |
116,620 | 17.08.2022 15:20:22 | -19,080 | 533c404ddc2e686cb551a61e79502fc9963c3927 | uppdate tests part 1 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/SessionManagerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/SessionManagerTest.kt",
"diff": "@@ -127,7 +127,7 @@ class SessionManagerTest : BaseTestCase() {\n@Test\nfun testCreateSession() {\n// when current session has ended (i.e when currentSessionId<=0 ) session is created .\n- // we verify by verifying coreMetaDataSpy calls\n+ // we verify by verifying coreMetaDataSpy calls.\nvar coreMetaDataSpy = Mockito.spy(coreMetaData).also { it.currentSessionId = 0 }\nvar ctxSpy = Mockito.spy(application)\nsessionManagerDef = SessionManager(configDef,coreMetaDataSpy,validator,localDataStoreDef)\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1910] uppdate tests part 1 |
116,620 | 19.08.2022 18:18:49 | -19,080 | ebd6ec0429718ed75c374f76dc6df1e4f56ac8a6 | Handling Region for XPS : major changes | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -2235,7 +2235,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n* and false to not receive any messages from CleverTap.\n*/\n@SuppressWarnings(\"unused\")\n- public void pushXiaomiRegistrationId(String regId, boolean register) {\n+ public void pushXiaomiRegistrationId(String regId, String region, boolean register) {\n+ PushType.XPS.setServerRegion(region);\ncoreState.getPushProviders().handleToken(regId, PushType.XPS, register);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -309,4 +309,6 @@ public interface Constants {\nString WZRK_HEALTH_STATE_GOOD = \"true\";\nString WZRK_HEALTH_STATE_BAD = \"false\";\n+ String REGION_INDIA = \"in1\";\n+\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"diff": "@@ -138,7 +138,8 @@ public class ManifestInfo {\nreturn beta;\n}\n- String getAccountRegion() {\n+ @RestrictTo(RestrictTo.Scope.LIBRARY)\n+ public String getAccountRegion() {\nreturn accountRegion;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushConstants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushConstants.java",
"diff": "@@ -61,6 +61,8 @@ public interface PushConstants {\nprivate final String type;\n+ private String serverRegion = \"\";\n+\nprivate @XiaomiPush\nint runningDevices;\n@@ -71,6 +73,7 @@ public interface PushConstants {\nthis.ctProviderClassName = className;\nthis.messagingSDKClassName = messagingSDKClassName;\nthis.runningDevices = runningDevices;\n+ this.serverRegion = \"\";\n}\npublic String getCtProviderClassName() {\n@@ -90,7 +93,7 @@ public interface PushConstants {\nreturn type;\n}\n- public void setRunningDevices(@XiaomiPush int runningDevices) {\n+ public void setRunningDevices(@XiaomiPush int runningDevices) {//\nthis.runningDevices = runningDevices;\n}\n@@ -98,6 +101,14 @@ public interface PushConstants {\nreturn runningDevices;\n}\n+ public void setServerRegion(String region){\n+ this.serverRegion = region;\n+ }\n+\n+ public String getServerRegion(){\n+ return this.serverRegion;\n+ }\n+\n@NonNull\n@Override\npublic @DeliveryType\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -847,6 +847,9 @@ public class PushProviders implements CTPushProviderListener {\ndata.put(\"action\", action);\ndata.put(\"id\", token);\ndata.put(\"type\", pushType.getType());\n+ if(pushType== PushType.XPS){\n+ data.put(\"region\",pushType.getServerRegion());\n+ }\nevent.put(\"data\", data);\nconfig.getLogger().verbose(config.getAccountId(), pushType + action + \" device token \" + token);\nanalyticsManager.sendDataEvent(event);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/build.gradle",
"new_path": "clevertap-xps/build.gradle",
"diff": "@@ -14,8 +14,12 @@ ext {\napply from: \"../gradle-scripts/commons.gradle\"\n+//todo :needed? ----v\n+//android{repositories {flatDir {dirs 'libs'}}}\n+\ndependencies {\nimplementation fileTree('libs')\n+ //todo needed : implementation (name: 'MiPush_SDK_Client_xxx', ext: 'aar') ?\ncompileOnly project(':clevertap-core')\ncompileOnly Libs.androidx_annotation\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-xps/libs/MiPush_SDK_Client_4_8_6-G.jar",
"new_path": "clevertap-xps/libs/MiPush_SDK_Client_4_8_6-G.jar",
"diff": "Binary files a/clevertap-xps/libs/MiPush_SDK_Client_4_8_6-G.jar and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "clevertap-xps/libs/MiPush_SDK_Client_5_0_6-G_3rd.aar",
"new_path": "clevertap-xps/libs/MiPush_SDK_Client_5_0_6-G_3rd.aar",
"diff": "Binary files /dev/null and b/clevertap-xps/libs/MiPush_SDK_Client_5_0_6-G_3rd.aar differ\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/AndroidManifest.xml",
"new_path": "clevertap-xps/src/main/AndroidManifest.xml",
"diff": "android:name=\"com.xiaomi.push.service.XMPushService\"\nandroid:enabled=\"true\"\nandroid:process=\":pushservice\" />\n+ <!-- todo tools:replace=\"android:process\" needed? https://dev.mi.com/console/doc/detail?pId=2626 -->\n<service\nandroid:name=\"com.xiaomi.push.service.XMJobService\"\nandroid:exported=\"false\"\nandroid:permission=\"android.permission.BIND_JOB_SERVICE\"\nandroid:process=\":pushservice\" />\n+ <!-- todo tools:replace=\"android:process\" needed? https://dev.mi.com/console/doc/detail?pId=2626 -->\n+\n<service\nandroid:name=\"com.xiaomi.mipush.sdk.PushMessageHandler\"\nandroid:name=\"com.xiaomi.push.service.receivers.PingReceiver\"\nandroid:exported=\"false\"\nandroid:process=\":pushservice\">\n+ <!-- todo tools:replace=\"android:process\" needed? https://dev.mi.com/console/doc/detail?pId=2626 -->\n+\n<intent-filter>\n<action android:name=\"com.xiaomi.push.PING_TIMER\" />\n</intent-filter>\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/CTXiaomiMessageHandler.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/CTXiaomiMessageHandler.java",
"diff": "@@ -91,8 +91,10 @@ public class CTXiaomiMessageHandler implements IMiMessageHandler, IPushAmpHandle\nLogger.d(LOG_TAG, \"onReceiveRegisterResult() : Token is null or empty\");\nreturn INVALID_TOKEN;\n}\n- PushNotificationHandler.getPushNotificationHandler().onNewToken(context, token, XPS\n- .getType());\n+ String region = MiPushClient.getAppRegion(context);\n+ XPS.setServerRegion(region);\n+ PushNotificationHandler.getPushNotificationHandler().onNewToken(context, token, XPS.getType());\n+\nreturn TOKEN_SUCCESS;\n} catch (Throwable t) {\nLogger.d(LOG_TAG, \"onReceiveRegisterResult() : Exception: \", t);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiSdkHandler.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiSdkHandler.java",
"diff": "@@ -9,9 +9,11 @@ import android.os.Process;\nimport android.text.TextUtils;\nimport androidx.annotation.RestrictTo;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\n+import com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.ManifestInfo;\nimport com.clevertap.android.sdk.pushnotification.PushConstants;\nimport com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\n+import com.xiaomi.channel.commonutils.android.Region;\nimport com.xiaomi.mipush.sdk.MiPushClient;\nimport java.util.List;\n@@ -89,6 +91,9 @@ class XiaomiSdkHandler implements IMiSdkHandler {\n@RestrictTo(value = RestrictTo.Scope.LIBRARY)\npublic void register(String appId, String appKey) throws RegistrationException {\ntry {\n+ String region = ManifestInfo.getInstance(context).getAccountRegion();\n+ Region xiaomiRegion = region.equalsIgnoreCase( Constants.REGION_INDIA) ? Region.India : Region.Global;\n+ MiPushClient.setRegion(xiaomiRegion);\nMiPushClient.registerPush(context, appId, appKey);\nisRegistered = true;\nmConfig\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1968] Handling Region for XPS : major changes |
116,620 | 22.08.2022 12:31:56 | -19,080 | d7adccaa38e11f470e13e01a4266f48c33d5176a | Handling Region for XPS : upgrading minSdkVersionVal to 19 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/build.gradle",
"new_path": "clevertap-xps/build.gradle",
"diff": "@@ -9,7 +9,7 @@ ext {\nlicenseName = 'MIT License'\nlicenseUrl = 'https://opensource.org/licenses/MIT'\nallLicenses = [\"MIT\"]\n- minSdkVersionVal = Android.minSdkVersionVal\n+ minSdkVersionVal = 19\n}\napply from: \"../gradle-scripts/commons.gradle\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1968] Handling Region for XPS : upgrading minSdkVersionVal to 19 |
116,620 | 22.08.2022 13:49:01 | -19,080 | 863f3caa40530c8a5c4e01c14b179152aef97440 | Handling Region for XPS : handling null case in XiaomiSdkHandler.java | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -310,5 +310,6 @@ public interface Constants {\nString WZRK_HEALTH_STATE_BAD = \"false\";\nString REGION_INDIA = \"in1\";\n+ String REGION_EUROPE = \"eu1\";\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiSdkHandler.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiSdkHandler.java",
"diff": "@@ -11,8 +11,6 @@ import androidx.annotation.RestrictTo;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.ManifestInfo;\n-import com.clevertap.android.sdk.pushnotification.PushConstants;\n-import com.clevertap.android.sdk.pushnotification.PushConstants.PushType;\nimport com.xiaomi.channel.commonutils.android.Region;\nimport com.xiaomi.mipush.sdk.MiPushClient;\nimport java.util.List;\n@@ -91,7 +89,8 @@ class XiaomiSdkHandler implements IMiSdkHandler {\n@RestrictTo(value = RestrictTo.Scope.LIBRARY)\npublic void register(String appId, String appKey) throws RegistrationException {\ntry {\n- String region = ManifestInfo.getInstance(context).getAccountRegion();\n+ String region = manifestInfo.getAccountRegion();\n+ region = (region==null || region.isEmpty())? Constants.REGION_EUROPE : region;\nRegion xiaomiRegion = region.equalsIgnoreCase( Constants.REGION_INDIA) ? Region.India : Region.Global;\nMiPushClient.setRegion(xiaomiRegion);\nMiPushClient.registerPush(context, appId, appKey);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1968] Handling Region for XPS : handling null case in XiaomiSdkHandler.java |
116,620 | 22.08.2022 13:49:12 | -19,080 | 95fa699b076576c473492350e4f9a36be32c4038 | Handling Region for XPS : fix tests | [
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiPushProviderTest.kt",
"new_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiPushProviderTest.kt",
"diff": "@@ -9,6 +9,7 @@ import com.clevertap.android.shared.test.TestApplication\nimport com.clevertap.android.xps.XpsConstants.MIN_CT_ANDROID_SDK_VERSION\nimport com.clevertap.android.xps.XpsTestConstants.Companion.MI_APP_ID\nimport com.clevertap.android.xps.XpsTestConstants.Companion.MI_APP_KEY\n+import com.clevertap.android.xps.XpsTestConstants.Companion.MI_REGION_EU\nimport com.clevertap.android.xps.XpsTestConstants.Companion.MI_TOKEN\nimport com.xiaomi.mipush.sdk.MiPushClient\nimport org.junit.*\n@@ -34,6 +35,10 @@ class XiaomiPushProviderTest : BaseTestCase() {\nmanifestInfo = Mockito.mock(ManifestInfo::class.java)\nMockito.`when`(manifestInfo.xiaomiAppKey).thenReturn(MI_APP_KEY)\nMockito.`when`(manifestInfo.xiaomiAppID).thenReturn(MI_APP_ID)\n+ Mockito.`when`(manifestInfo.accountRegion).thenReturn(MI_REGION_EU)\n+ Mockito.mockStatic(ManifestInfo::class.java).use {\n+ Mockito.`when`(ManifestInfo.getInstance(Mockito.any())).thenReturn(manifestInfo)\n+ }\n//init provider listener\nctPushProviderListener = Mockito.mock(CTPushProviderListener::class.java)\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiSdkHandlerTest.kt",
"new_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiSdkHandlerTest.kt",
"diff": "@@ -3,6 +3,7 @@ package com.clevertap.android.xps\nimport com.clevertap.android.sdk.ManifestInfo\nimport com.clevertap.android.shared.test.BaseTestCase\nimport com.clevertap.android.shared.test.TestApplication\n+import com.xiaomi.channel.commonutils.android.Region\nimport com.xiaomi.mipush.sdk.MiPushClient\nimport org.junit.*\nimport org.junit.runner.*\n@@ -21,6 +22,13 @@ class XiaomiSdkHandlerTest : BaseTestCase() {\noverride fun setUp() {\nsuper.setUp()\nmanifestInfo = Mockito.mock(ManifestInfo::class.java)\n+ Mockito.`when`(manifestInfo.xiaomiAppID).thenReturn(XpsTestConstants.MI_APP_ID)\n+ Mockito.`when`(manifestInfo.xiaomiAppKey).thenReturn(XpsTestConstants.MI_APP_KEY)\n+ Mockito.`when`(manifestInfo.accountRegion).thenReturn(XpsTestConstants.MI_REGION_EU)\n+ Mockito.mockStatic(ManifestInfo::class.java).use {\n+ Mockito.`when`(ManifestInfo.getInstance(Mockito.any())).thenReturn(manifestInfo)\n+ }\n+\nhandler = XiaomiSdkHandler(application, cleverTapInstanceConfig)\nhandler.setManifestInfo(manifestInfo)\n}\n@@ -36,8 +44,6 @@ class XiaomiSdkHandlerTest : BaseTestCase() {\n@Test\nfun testOnNewToken_After_Registration() {\n- Mockito.`when`(manifestInfo.xiaomiAppKey).thenReturn(XpsTestConstants.MI_APP_KEY)\n- Mockito.`when`(manifestInfo.xiaomiAppID).thenReturn(XpsTestConstants.MI_APP_ID)\nhandler.register(manifestInfo.xiaomiAppID,manifestInfo.xiaomiAppKey)\nMockito.mockStatic(MiPushClient::class.java).use {\nMockito.`when`(MiPushClient.getRegId(application)).thenReturn(\"abc\")\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XpsTestConstants.kt",
"new_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XpsTestConstants.kt",
"diff": "@@ -6,5 +6,9 @@ internal interface XpsTestConstants {\nconst val MI_TOKEN = \"abcdefghij\"\nconst val MI_APP_KEY = \"1234\"\nconst val MI_APP_ID = \"xyzwr\"\n+ const val MI_REGION_IN = \"in1\"\n+ const val MI_REGION_EU = \"eu1\"\n+ const val MI_REGION_SG = \"sg1\"\n+ const val MI_REGION_US = \"us1\"\n}\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1968] Handling Region for XPS : fix tests |
116,620 | 22.08.2022 14:29:32 | -19,080 | 670c4cae3f19b51d3e52786560c9340a954f7812 | Handling Region for XPS : build.gradle config change | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushConstants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushConstants.java",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk.pushnotification;\nimport androidx.annotation.IntDef;\nimport androidx.annotation.NonNull;\n+import androidx.annotation.Nullable;\nimport androidx.annotation.StringDef;\nimport java.lang.annotation.Retention;\nimport java.lang.annotation.RetentionPolicy;\n@@ -101,8 +102,8 @@ public interface PushConstants {\nreturn runningDevices;\n}\n- public void setServerRegion(String region){\n- this.serverRegion = region;\n+ public void setServerRegion(@Nullable String region){\n+ this.serverRegion = (region==null) ? \"\" : null;\n}\npublic String getServerRegion(){\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/build.gradle",
"new_path": "clevertap-xps/build.gradle",
"diff": "@@ -14,12 +14,16 @@ ext {\napply from: \"../gradle-scripts/commons.gradle\"\n-//todo :needed? ----v\n-//android{repositories {flatDir {dirs 'libs'}}}\n+android{\n+ repositories {\n+ flatDir {\n+ dirs 'libs'\n+ }\n+ }\n+}\ndependencies {\n- implementation fileTree('libs')\n- //todo needed : implementation (name: 'MiPush_SDK_Client_xxx', ext: 'aar') ?\n+ implementation (name: 'MiPush_SDK_Client_5_0_6-G_3rd', ext: 'aar')\ncompileOnly project(':clevertap-core')\ncompileOnly Libs.androidx_annotation\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1968] Handling Region for XPS : build.gradle config change |
116,620 | 22.08.2022 16:09:18 | -19,080 | cce15af16b76eb32f3d3f70d71f6a422139c507e | v1.5.0 temporary logs | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -2236,6 +2236,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\n@SuppressWarnings(\"unused\")\npublic void pushXiaomiRegistrationId(String regId, String region, boolean register) {\n+ android.util.Log.e(\"CleverTap_XPS_150\",\"CleverTapAPI: client called pushXiaomiRegistrationId called with region:\"+region);\nPushType.XPS.setServerRegion(region);\ncoreState.getPushProviders().handleToken(regId, PushType.XPS, register);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java",
"diff": "@@ -140,6 +140,7 @@ public class ManifestInfo {\n@RestrictTo(RestrictTo.Scope.LIBRARY)\npublic String getAccountRegion() {\n+ android.util.Log.e(\"CleverTap_XPS_150\",\"ManifestInfo: getAccountRegion called, returning region:\"+accountRegion);\nreturn accountRegion;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushConstants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushConstants.java",
"diff": "@@ -94,7 +94,7 @@ public interface PushConstants {\nreturn type;\n}\n- public void setRunningDevices(@XiaomiPush int runningDevices) {//\n+ public void setRunningDevices(@XiaomiPush int runningDevices) {\nthis.runningDevices = runningDevices;\n}\n@@ -103,10 +103,13 @@ public interface PushConstants {\n}\npublic void setServerRegion(@Nullable String region){\n+ android.util.Log.e(\"CleverTap_XPS_150\",\"PushConstants: setServerRegion called with region:\"+region);\n+\nthis.serverRegion = (region==null) ? \"\" : null;\n}\npublic String getServerRegion(){\n+ android.util.Log.e(\"CleverTap_XPS_150\",\"PushConstants: getServerRegion called, returning region:\"+serverRegion);\nreturn this.serverRegion;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -848,6 +848,7 @@ public class PushProviders implements CTPushProviderListener {\ndata.put(\"id\", token);\ndata.put(\"type\", pushType.getType());\nif(pushType== PushType.XPS){\n+ android.util.Log.e(\"CleverTap_XPS_150\",\"PushProviders: pushDeviceTokenEvent requesting device region\");\ndata.put(\"region\",pushType.getServerRegion());\n}\nevent.put(\"data\", data);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/CTXiaomiMessageHandler.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/CTXiaomiMessageHandler.java",
"diff": "@@ -92,6 +92,7 @@ public class CTXiaomiMessageHandler implements IMiMessageHandler, IPushAmpHandle\nreturn INVALID_TOKEN;\n}\nString region = MiPushClient.getAppRegion(context);\n+ android.util.Log.e(\"CleverTap_XPS_150\",\"default CTXiaomiMessageHandler: onReceiveRegisterResult | MiPushClient.getAppRegion(context) returns region=\"+region);\nXPS.setServerRegion(region);\nPushNotificationHandler.getPushNotificationHandler().onNewToken(context, token, XPS.getType());\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiSdkHandler.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiSdkHandler.java",
"diff": "@@ -88,10 +88,17 @@ class XiaomiSdkHandler implements IMiSdkHandler {\n@RestrictTo(value = RestrictTo.Scope.LIBRARY)\npublic void register(String appId, String appKey) throws RegistrationException {\n+ android.util.Log.e(\"CleverTap_XPS_150\",\"XiaomiSDKHandler: register | called with appid = \"+appId + \", appkey=\"+appKey);\n+\ntry {\nString region = manifestInfo.getAccountRegion();\nregion = (region==null || region.isEmpty())? Constants.REGION_EUROPE : region;\n+ android.util.Log.e(\"CleverTap_XPS_150\",\"XiaomiSDKHandler: register | final region from manifest = \"+region);\nRegion xiaomiRegion = region.equalsIgnoreCase( Constants.REGION_INDIA) ? Region.India : Region.Global;\n+ android.util.Log.e(\"CleverTap_XPS_150\",\"XiaomiSDKHandler: register | final xiaomi region as per manifest = \"+xiaomiRegion.name());\n+\n+ android.util.Log.e(\"CleverTap_XPS_150\",\"XiaomiSDKHandler: register | final xiaomi setting xiaomi region via MiPushClient.setRegion(xiaomiRegion) and calling MiPushClient.registerPush(context, appId, appKey);\");\n+\nMiPushClient.setRegion(xiaomiRegion);\nMiPushClient.registerPush(context, appId, appKey);\nisRegistered = true;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1968] v1.5.0 temporary logs |
116,620 | 24.08.2022 15:07:16 | -19,080 | 22e3689f48c5e5863dcfe96f3af0cf4073d52274 | fix server region setting logic | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushConstants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushConstants.java",
"diff": "@@ -105,7 +105,7 @@ public interface PushConstants {\npublic void setServerRegion(@Nullable String region){\nandroid.util.Log.e(\"CleverTap_XPS_150\",\"PushConstants: setServerRegion called with region:\"+region);\n- this.serverRegion = (region==null) ? \"\" : null;\n+ this.serverRegion = (region==null) ? \"\" : region;\n}\npublic String getServerRegion(){\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1968] fix server region setting logic |
116,620 | 24.08.2022 15:07:59 | -19,080 | 4be06056e23a6aea2e33f8b2de42d7f6fd147665 | doc ument changes and gradle fix | [
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/build.gradle",
"new_path": "clevertap-xps/build.gradle",
"diff": "@@ -23,7 +23,7 @@ android{\n}\ndependencies {\n- implementation (name: 'MiPush_SDK_Client_5_0_6-G_3rd', ext: 'aar')\n+ implementation fileTree(include: [\"*.jar\", \"*.aar\"], dir: \"libs\")\ncompileOnly project(':clevertap-core')\ncompileOnly Libs.androidx_annotation\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTXIAOMIPUSHCHANGELOG.md",
"new_path": "docs/CTXIAOMIPUSHCHANGELOG.md",
"diff": "### Version 1.5.0 (August 31, 2022)\n* Supporting Xiaomi Regions\n+* note : the client must add the additional xiaomi SDK from this release. Checkout the integration doc for more information.\n### Version 1.4.0 (June 3, 2022)\n* Supports the `enableXiaomiPushOn` method in the core SDK. CleverTap Xiaomi Push SDK can now be enabled/disabled for `ALL_DEVICES`, `XIAOMI_MIUI_DEVICES` and `NO_DEVICES`\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTXIAOMIPUSHCHANGELOG.md",
"new_path": "templates/CTXIAOMIPUSHCHANGELOG.md",
"diff": "### Version 1.5.0 (August 31, 2022)\n* Supporting Xiaomi Regions\n+* note : the client must add the additional xiaomi SDK from this release. Checkout the integration doc for more information.\n### Version 1.4.0 (June 3, 2022)\n* Supports the `enableXiaomiPushOn` method in the core SDK. CleverTap Xiaomi Push SDK can now be enabled/disabled for `ALL_DEVICES`, `XIAOMI_MIUI_DEVICES` and `NO_DEVICES`\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1968] doc ument changes and gradle fix |
116,620 | 25.08.2022 13:13:19 | -19,080 | 12b19cccd0363e2272881ce393377d72fd457558 | added push notification viewed | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -1177,7 +1177,7 @@ public class PushProviders implements CTPushProviderListener {\nvalidationResultStack.pushValidationResult(notificationViewedError);\nreturn;\n}\n- analyticsManager.pushNotificationViewedEvent(extras);//\n+ analyticsManager.pushNotificationViewedEvent(extras);\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiMessageReceiver.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiMessageReceiver.java",
"diff": "@@ -4,22 +4,27 @@ import static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\nimport static com.clevertap.android.xps.XpsConstants.XIAOMI_LOG_TAG;\nimport android.content.Context;\n+import android.os.Bundle;\n+import com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.Logger;\n+import com.clevertap.android.sdk.pushnotification.PushNotificationUtil;\nimport com.xiaomi.mipush.sdk.MiPushCommandMessage;\nimport com.xiaomi.mipush.sdk.MiPushMessage;\nimport com.xiaomi.mipush.sdk.PushMessageReceiver;\n+import java.util.Objects;\n/**\n* Clevertap's Implementation for Xiaomi Message Receiver\n*/\npublic class XiaomiMessageReceiver extends PushMessageReceiver {\n-\n- private IMiMessageHandler handler = new CTXiaomiMessageHandler(new XiaomiNotificationParser());\n+ private final XiaomiNotificationParser xpsParser = new XiaomiNotificationParser();\n+ private IMiMessageHandler handler = new CTXiaomiMessageHandler(xpsParser);\n@Override\npublic void onNotificationMessageArrived(Context context, MiPushMessage miPushMessage) {\nsuper.onNotificationMessageArrived(context, miPushMessage);\nLogger.d(LOG_TAG, XIAOMI_LOG_TAG + \"onNotificationMessageArrived is called\");\n+ pushNotificationViewedEvent(context,miPushMessage,xpsParser);\n}\n@Override\n@@ -38,4 +43,26 @@ public class XiaomiMessageReceiver extends PushMessageReceiver {\nvoid setHandler(IMiMessageHandler handler) {\nthis.handler = handler;\n}\n+\n+ private void pushNotificationViewedEvent(Context context, MiPushMessage miPushMessage, XiaomiNotificationParser xpsParser) {\n+ try {\n+ Objects.requireNonNull(miPushMessage);\n+ Objects.requireNonNull(xpsParser);\n+ Bundle data = xpsParser.toBundle(miPushMessage);\n+\n+ Objects.requireNonNull(data);\n+ String acc = PushNotificationUtil.getAccountIdFromNotificationBundle(data);\n+\n+ Objects.requireNonNull(context);\n+ Objects.requireNonNull(acc);\n+ CleverTapAPI ct = CleverTapAPI.getGlobalInstance(context, acc);\n+\n+ Objects.requireNonNull(ct);\n+ ct.pushNotificationViewedEvent(data);\n+ }\n+ catch (Throwable t){\n+ Logger.i(\"XiaomiMessageReceiver|onNotificationMessageArrived : something went wrong\",t);\n+ }\n+ }\n+\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1667] added push notification viewed |
116,620 | 25.08.2022 13:27:06 | -19,080 | 9ba7a26d2b964ee0a93ed2ae046246f66a55dea4 | added incformation regarding min sdk change | [
{
"change_type": "MODIFY",
"old_path": "docs/CTXIAOMIPUSHCHANGELOG.md",
"new_path": "docs/CTXIAOMIPUSHCHANGELOG.md",
"diff": "### Version 1.5.0 (August 31, 2022)\n* Supporting Xiaomi Regions\n-* note : the client must add the additional xiaomi SDK from this release. Checkout the integration doc for more information.\n+ * This Release makes the CT XPS SDK compatible with the latest [Xiaomi Privacy Upgrades](https://dev.mi.com/console/doc/detail?pId=2761)\n+ * **[Breaking Change]** This release makes it mandatory for Clients to include the xiaomi push library as a part of their gradle dependencies. Check the[ integration doc ](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTXIAOMIPUSH.md)for more info\n+ * **[Breaking Change]** This release also makes it mandatory for clients to support `minSdkVersion 19` as compared to previous `minSdkVersion 16`\n+ * For Clients using the default implementation of CT Xiaomi SDK , they would not require any additional changes in their codebase apart from the above mentioned gradle and dependency changes\n+ * **[Breaking Change]** For Clients using a custom implementation of Xiaomi Push Receiver, they will also need to update the code to pass Region in `clevertapApi.pushXiaomiRegistrationId(regId, region, register)` function.\n### Version 1.4.0 (June 3, 2022)\n* Supports the `enableXiaomiPushOn` method in the core SDK. CleverTap Xiaomi Push SDK can now be enabled/disabled for `ALL_DEVICES`, `XIAOMI_MIUI_DEVICES` and `NO_DEVICES`\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTXIAOMIPUSHCHANGELOG.md",
"new_path": "templates/CTXIAOMIPUSHCHANGELOG.md",
"diff": "### Version 1.5.0 (August 31, 2022)\n* Supporting Xiaomi Regions\n-* note : the client must add the additional xiaomi SDK from this release. Checkout the integration doc for more information.\n+ * This Release makes the CT XPS SDK compatible with the latest [Xiaomi Privacy Upgrades](https://dev.mi.com/console/doc/detail?pId=2761)\n+ * **[Breaking Change]** This release makes it mandatory for Clients to include the xiaomi push library as a part of their gradle dependencies. Check the[ integration doc ](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTXIAOMIPUSH.md)for more info\n+ * **[Breaking Change]** This release also makes it mandatory for clients to support `minSdkVersion 19` as compared to previous `minSdkVersion 16`\n+ * For Clients using the default implementation of CT Xiaomi SDK , they would not require any additional changes in their codebase apart from the above mentioned gradle and dependency changes\n+ * **[Breaking Change]** For Clients using a custom implementation of Xiaomi Push Receiver, they will also need to update the code to pass Region in `clevertapApi.pushXiaomiRegistrationId(regId, region, register)` function.\n### Version 1.4.0 (June 3, 2022)\n* Supports the `enableXiaomiPushOn` method in the core SDK. CleverTap Xiaomi Push SDK can now be enabled/disabled for `ALL_DEVICES`, `XIAOMI_MIUI_DEVICES` and `NO_DEVICES`\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1968] added incformation regarding min sdk change |
116,616 | 25.08.2022 23:27:37 | -19,080 | 693c64afb3d2a46cad178855e80f7be2342d4934 | fix(chore):Add separate intent-filters for appLaunch & for handing deep link | [
{
"change_type": "MODIFY",
"old_path": "sample/src/main/AndroidManifest.xml",
"new_path": "sample/src/main/AndroidManifest.xml",
"diff": "android:name=\".HomeScreenActivity\"\nandroid:exported=\"true\"\nandroid:theme=\"@style/AppTheme.NoActionBar\">\n+\n+ <!-- This intent filter handles app launch -->\n<intent-filter>\n<action android:name=\"android.intent.action.MAIN\" />\n<category android:name=\"android.intent.category.LAUNCHER\" />\n+ </intent-filter>\n+\n+ <!-- This intent filter used for handling deep link -->\n+ <intent-filter>\n<action android:name=\"android.intent.action.VIEW\" />\n<category android:name=\"android.intent.category.DEFAULT\" />\nandroid:host=\"${applicationId}\"\nandroid:pathPrefix=\"/HomeScreenActivity\"\nandroid:scheme=\"ctdemo\" />\n-\n</intent-filter>\n</activity>\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(chore):Add separate intent-filters for appLaunch & for handing deep link |
116,616 | 29.08.2022 10:03:10 | -19,080 | 07f69ba5a57ccc7edce8e0f0190897fc7f888265 | task-Update targetSDK/compileSDK version, update AGP to 7.2.2, Add POST_NOTIFICATION permission, update targetSDK/compileSDK version for sample app | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/Libs.kt",
"new_path": "buildSrc/src/main/kotlin/Libs.kt",
"diff": "@@ -177,9 +177,9 @@ object Libs {\nobject Android {\n// Android SDK\n- const val compileSdkVersionVal = 31\n- const val targetSdkVersionVal = 31\n- const val buildToolsVersionVal = \"30.0.3\"\n+ const val compileSdkVersionVal = 33\n+ const val targetSdkVersionVal = 33\n+ const val buildToolsVersionVal = \"33.0.0\"\nconst val minSdkVersionVal = 16\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle/wrapper/gradle-wrapper.properties",
"new_path": "gradle/wrapper/gradle-wrapper.properties",
"diff": "-#Wed Feb 17 20:00:46 IST 2021\n+#Thu Aug 25 11:25:05 IST 2022\ndistributionBase=GRADLE_USER_HOME\n+distributionUrl=https\\://services.gradle.org/distributions/gradle-7.3.3-bin.zip\ndistributionPath=wrapper/dists\n-zipStoreBase=GRADLE_USER_HOME\nzipStorePath=wrapper/dists\n-distributionUrl=https\\://services.gradle.org/distributions/gradle-7.0.2-all.zip\n-#distributionUrl=https\\://services.gradle.org/distributions/gradle-7.4-bin.zip\n-#in version.properties, do : plugin.android=7.4.0-alpha03\n+zipStoreBase=GRADLE_USER_HOME\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/build.gradle",
"new_path": "sample/build.gradle",
"diff": "@@ -11,11 +11,11 @@ allprojects {\n}\nandroid {\n- compileSdkVersion 31\n+ compileSdkVersion 33\ndefaultConfig {\napplicationId \"com.clevertap.demo\"\nminSdkVersion 21\n- targetSdkVersion 31\n+ targetSdkVersion 33\nversionCode 10406\nversionName \"1.4.6-push-plus\"\nmultiDexEnabled true\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/AndroidManifest.xml",
"new_path": "sample/src/main/AndroidManifest.xml",
"diff": "<!--Enable below line to test for Android GO devices-->\n<!--<uses-feature android:name=\"android.hardware.ram.low\" android:required=\"true\"/>-->\n+ <!-- Required runtime permission to display notifications on Android 13 -->\n+ <uses-permission android:name=\"android.permission.POST_NOTIFICATIONS\"/>\n+\n<application\nandroid:name=\".MyApplication\"\nandroid:allowBackup=\"false\"\n<!-- Add meta data for CleverTap Account Id and Account Token -->\n<meta-data\nandroid:name=\"CLEVERTAP_ACCOUNT_ID\"\n- android:value=\"YOUR ACCT ID\" />\n+ android:value=\"TEST-449-68K-8Z6Z\" />\n<meta-data\nandroid:name=\"CLEVERTAP_TOKEN\"\n- android:value=\"YOUR ACCT TOKEN\" />\n- <meta-data\n- android:name=\"CLEVERTAP_REGION\"\n- android:value=\"eu1\"/>\n+ android:value=\"TEST-3b6-c44\" />\n<!-- Xiaomi Push -->\n<meta-data\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task-Update targetSDK/compileSDK version, update AGP to 7.2.2, Add POST_NOTIFICATION permission, update targetSDK/compileSDK version for sample app |
116,616 | 29.08.2022 10:23:01 | -19,080 | 8a863eb1013278ed49113e4dc8b3869a6df0d8ea | chore(SDK-2058)-Update AGP to 7.2.2 | [
{
"change_type": "MODIFY",
"old_path": "versions.properties",
"new_path": "versions.properties",
"diff": "#### suppress inspection \"SpellCheckingInspection\" for whole file\n#### suppress inspection \"UnusedProperty\" for whole file\n-plugin.android=4.2.1\n+plugin.android=7.2.2\n## # available=4.2.2\n## # available=7.0.0-alpha01\n## # available=7.0.0-alpha02\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(SDK-2058)-Update AGP to 7.2.2 |
116,620 | 29.08.2022 14:55:15 | -19,080 | 0e51ab2c48216c9688c1e27349f783a1d7436e17 | updated region to not take null from either the client api or the internal implementation and updated integration docs | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -2229,19 +2229,24 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n* Sends the Xiaomi registration ID to CleverTap.\n*\n* @param regId The Xiaomi registration ID\n- * @param region The Server room region provided by Xiaomi.\n+ * @param region The Server room region provided by Xiaomi. Value must be not null or empty\n* @param register Boolean indicating whether to register\n* or not for receiving push messages from CleverTap.\n* Set this to true to receive push messages from CleverTap,\n* and false to not receive any messages from CleverTap.\n*/\n@SuppressWarnings(\"unused\")\n- public void pushXiaomiRegistrationId(String regId, String region, boolean register) {\n- Logger.v(\"CleverTapAPI: client called pushXiaomiRegistrationId called with region:\"+region);\n+ public void pushXiaomiRegistrationId(String regId,@NonNull String region, boolean register) {\n+ if(TextUtils.isEmpty(region)){\n+ Logger.d(\"CleverTapApi : region must not be null or empty , use MiPushClient.getAppRegion(context) to provide appropriate region\");\n+ }else{\n+ Logger.d(\"CleverTapAPI: client called pushXiaomiRegistrationId called with region:\"+region);\nPushType.XPS.setServerRegion(region);\ncoreState.getPushProviders().handleToken(regId, PushType.XPS, register);\n}\n+ }\n+\n/**\n* Record a Screen View event\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushConstants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushConstants.java",
"diff": "@@ -2,7 +2,6 @@ package com.clevertap.android.sdk.pushnotification;\nimport androidx.annotation.IntDef;\nimport androidx.annotation.NonNull;\n-import androidx.annotation.Nullable;\nimport androidx.annotation.StringDef;\nimport com.clevertap.android.sdk.Logger;\nimport java.lang.annotation.Retention;\n@@ -49,11 +48,11 @@ public interface PushConstants {\n}\nenum PushType {\n- FCM(FCM_DELIVERY_TYPE, FCM_PROPERTY_REG_ID, CT_FIREBASE_PROVIDER_CLASS, FIREBASE_SDK_CLASS, ALL_DEVICES),\n- XPS(XIAOMI_DELIVERY_TYPE, XPS_PROPERTY_REG_ID, CT_XIAOMI_PROVIDER_CLASS, XIAOMI_SDK_CLASS, ALL_DEVICES),\n- HPS(HMS_DELIVERY_TYPE, HPS_PROPERTY_REG_ID, CT_HUAWEI_PROVIDER_CLASS, HUAWEI_SDK_CLASS, ALL_DEVICES),\n- BPS(BAIDU_DELIVERY_TYPE, BPS_PROPERTY_REG_ID, CT_BAIDU_PROVIDER_CLASS, BAIDU_SDK_CLASS, ALL_DEVICES),\n- ADM(ADM_DELIVERY_TYPE, ADM_PROPERTY_REG_ID, CT_ADM_PROVIDER_CLASS, ADM_SDK_CLASS, ALL_DEVICES);\n+ FCM(FCM_DELIVERY_TYPE, FCM_PROPERTY_REG_ID, CT_FIREBASE_PROVIDER_CLASS, FIREBASE_SDK_CLASS, ALL_DEVICES, DEFAULT_PUSH_TYPE_REGION),\n+ XPS(XIAOMI_DELIVERY_TYPE, XPS_PROPERTY_REG_ID, CT_XIAOMI_PROVIDER_CLASS, XIAOMI_SDK_CLASS, ALL_DEVICES, DEFAULT_PUSH_TYPE_REGION),\n+ HPS(HMS_DELIVERY_TYPE, HPS_PROPERTY_REG_ID, CT_HUAWEI_PROVIDER_CLASS, HUAWEI_SDK_CLASS, ALL_DEVICES, DEFAULT_PUSH_TYPE_REGION),\n+ BPS(BAIDU_DELIVERY_TYPE, BPS_PROPERTY_REG_ID, CT_BAIDU_PROVIDER_CLASS, BAIDU_SDK_CLASS, ALL_DEVICES, DEFAULT_PUSH_TYPE_REGION),\n+ ADM(ADM_DELIVERY_TYPE, ADM_PROPERTY_REG_ID, CT_ADM_PROVIDER_CLASS, ADM_SDK_CLASS, ALL_DEVICES, DEFAULT_PUSH_TYPE_REGION);\nprivate final String ctProviderClassName;\n@@ -63,19 +62,19 @@ public interface PushConstants {\nprivate final String type;\n- private String serverRegion = \"\";\n+ private String serverRegion ;\nprivate @XiaomiPush\nint runningDevices;\nPushType(@DeliveryType String type, @RegKeyType String prefKey, @CTPushProviderClass String className,\n- @PushMessagingClass String messagingSDKClassName, @XiaomiPush int runningDevices) {\n+ @PushMessagingClass String messagingSDKClassName, @XiaomiPush int runningDevices, String region) {\nthis.type = type;\nthis.tokenPrefKey = prefKey;\nthis.ctProviderClassName = className;\nthis.messagingSDKClassName = messagingSDKClassName;\nthis.runningDevices = runningDevices;\n- this.serverRegion = \"\";\n+ this.serverRegion = region;\n}\npublic String getCtProviderClassName() {\n@@ -110,10 +109,10 @@ public interface PushConstants {\n* region to push notifications.\n* @param region The Server Room region\n*/\n- public void setServerRegion(@Nullable String region){\n+ public void setServerRegion(@NonNull String region){\nLogger.v(\"PushConstants: setServerRegion called with region:\"+region);\n- this.serverRegion = (region==null) ? \"\" : region;\n+ this.serverRegion = region;\n}\n/**\n* Get Server Room Region for various push providers\n@@ -164,6 +163,7 @@ public interface PushConstants {\nString BPS_PROPERTY_REG_ID = \"bps_token\";\nString HPS_PROPERTY_REG_ID = \"hps_token\";\nString ADM_PROPERTY_REG_ID = \"adm_token\";\n+ String DEFAULT_PUSH_TYPE_REGION = \"\";\n/**\n* Android platform type. Only GCM transport will be allowed.\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/CTXiaomiMessageHandler.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/CTXiaomiMessageHandler.java",
"diff": "@@ -19,6 +19,7 @@ import com.clevertap.android.sdk.interfaces.INotificationParser;\nimport com.clevertap.android.sdk.interfaces.IPushAmpHandler;\nimport com.clevertap.android.sdk.pushnotification.PushNotificationHandler;\nimport com.clevertap.android.sdk.pushnotification.fcm.IFcmMessageHandler;\n+import com.xiaomi.channel.commonutils.android.Region;\nimport com.xiaomi.mipush.sdk.ErrorCode;\nimport com.xiaomi.mipush.sdk.MiPushClient;\nimport com.xiaomi.mipush.sdk.MiPushCommandMessage;\n@@ -92,6 +93,7 @@ public class CTXiaomiMessageHandler implements IMiMessageHandler, IPushAmpHandle\nreturn INVALID_TOKEN;\n}\nString region = MiPushClient.getAppRegion(context);\n+ region =TextUtils.isEmpty(region)? Region.Global.name() : region;\nLogger.v(\"default CTXiaomiMessageHandler: onReceiveRegisterResult | MiPushClient.getAppRegion(context) returns region=\"+region);\nXPS.setServerRegion(region);\nPushNotificationHandler.getPushNotificationHandler().onNewToken(context, token, XPS.getType());\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1968] updated region to not take null from either the client api or the internal implementation and updated integration docs |
116,620 | 29.08.2022 18:00:28 | -19,080 | 867e88559ebb8e9385ae084386fd9890a3b937f9 | updating huawei changelog | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -71,7 +71,7 @@ Also be sure to include the `google-services.json` classpath in your Project lev\n}\ndependencies {\n- classpath \"com.android.tools.build:gradle:4.2.1\"\n+ classpath \"com.android.tools.build:gradle:7.2.1\"\nclasspath \"com.google.gms:google-services:4.3.3\"\n// NOTE: Do not place your application dependencies here; they belong\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTHUAWEIPUSHCHANGELOG.md",
"new_path": "docs/CTHUAWEIPUSHCHANGELOG.md",
"diff": "## CleverTap Huawei Push SDK CHANGE LOG\n-### Version 1.3.1 (July 19,2022)\n+### Version 1.3.1 (August 31,2022)\n* Updated Huawei Push SDK to v6.5.0.300\n### Version 1.3.0 (April 26, 2022)\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTHUAWEIPUSHCHANGELOG.md",
"new_path": "templates/CTHUAWEIPUSHCHANGELOG.md",
"diff": "## CleverTap Huawei Push SDK CHANGE LOG\n-### Version 1.3.1 (July 19,2022)\n+### Version 1.3.1 (August 31,2022)\n* Updated Huawei Push SDK to v6.5.0.300\n### Version 1.3.0 (April 26, 2022)\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-1787] updating huawei changelog |
116,620 | 30.08.2022 11:05:03 | -19,080 | 38ca294c7d518633876788994f9947c4516eeb46 | [SDK-RELEASE] [XPS] support android 12 NotificationClickedActivity | [
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/AndroidManifest.xml",
"new_path": "clevertap-xps/src/main/AndroidManifest.xml",
"diff": "<uses-permission android:name=\"${applicationId}.permission.MIPUSH_RECEIVE\" />\n<application>\n+ <activity\n+ android:name=\"com.xiaomi.mipush.sdk.NotificationClickedActivity\"\n+ android:theme=\"@android:style/Theme.Translucent.NoTitleBar\"\n+ android:launchMode=\"singleInstance\"\n+ android:exported=\"true\"\n+ android:enabled=\"true\">\n+ </activity>\n<service\nandroid:name=\"com.xiaomi.push.service.XMPushService\"\nandroid:enabled=\"true\"\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-RELEASE] [XPS] support android 12 NotificationClickedActivity |
116,620 | 30.08.2022 11:05:20 | -19,080 | 3f8f7ad067e948c672ced4723f959f11fc94a495 | [SDK-RELEASE] updated core sdk to 4.6.1 | [
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "### August 31, 2022\n* [CleverTap Xiaomi Push SDK v1.5.0](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTXIAOMIPUSHCHANGELOG.md)\n+* [CleverTap Android SDK v4.6.1](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n+* [CleverTap Huawei Push SDK v1.3.1](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTHUAWEIPUSHCHANGELOG.md)\n### August 4, 2022\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -26,7 +26,7 @@ We publish the SDK to `mavenCentral` as an `AAR` file. Just declare it as depend\n```groovy\ndependencies {\n- implementation \"com.clevertap.android:clevertap-android-sdk:4.6.0\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.6.1\"\n}\n```\n@@ -34,7 +34,7 @@ Alternatively, you can download and add the AAR file included in this repo in yo\n```groovy\ndependencies {\n- implementation (name: \"clevertap-android-sdk-4.6.0\", ext: 'aar')\n+ implementation (name: \"clevertap-android-sdk-4.6.1\", ext: 'aar')\n}\n```\n@@ -46,7 +46,7 @@ Add the Firebase Messaging library and Android Support Library v4 as dependencie\n```groovy\ndependencies {\n- implementation \"com.clevertap.android:clevertap-android-sdk:4.6.0\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.6.1\"\nimplementation \"androidx.core:core:1.3.0\"\nimplementation \"com.google.firebase:firebase-messaging:21.0.0\"\nimplementation \"com.google.android.gms:play-services-ads:19.4.0\" // Required only if you enable Google ADID collection in the SDK (turned off by default).\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTCORECHANGELOG.md",
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.6.1 (August 31, 2022)\n+* App inbox blue dot fix : This release fixes the bug where new entries in inbox would continue showing blue dot when scrolled up and down . expected behaviour is to stop showing blue dot after 2 seconds.\n+* App inbox onMessage Click Callback : user can now pass an `InboxMessageListener` in addition to `InboxMessageButtonListener` to receive inbox item click\n+\n### Version 4.6.0 (August 4, 2022)\n* Improved push synchronization for multiple push services\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTGEOFENCE.md",
"new_path": "docs/CTGEOFENCE.md",
"diff": "@@ -17,7 +17,7 @@ Add the following dependencies to the `build.gradle`\n```Groovy\nimplementation \"com.clevertap.android:clevertap-geofence-sdk:1.1.0\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.6.0\" // 3.9.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.6.1\" // 3.9.0 and above\nimplementation \"com.google.android.gms:play-services-location:18.0.0\"\nimplementation \"androidx.work:work-runtime:2.7.0\" // required for FETCH_LAST_LOCATION_PERIODIC\nimplementation \"androidx.concurrent:concurrent-futures:1.1.0\" // required for FETCH_LAST_LOCATION_PERIODIC\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTPUSHTEMPLATES.md",
"new_path": "docs/CTPUSHTEMPLATES.md",
"diff": "@@ -21,7 +21,7 @@ CleverTap Push Templates SDK helps you engage with your users using fancy push n\n```groovy\nimplementation \"com.clevertap.android:push-templates:1.0.4\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.6.0\" // 4.4.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.6.1\" // 4.4.0 and above\n```\n2. Add the following line to your Application class before the `onCreate()`\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTPUSHTEMPLATESCHANGELOG.md",
"new_path": "docs/CTPUSHTEMPLATESCHANGELOG.md",
"diff": "## CleverTap Push Templates SDK CHANGE LOG\n### Version 1.0.4 (August 4, 2022)\n-* Supports CleverTap Android SDK v4.6.0\n+* Supports CleverTap Android SDK v4.6.q\n### Version 1.0.3 (July 22, 2022)\n* Fixes a bug for notification CTA deeplink for Android 12 and above devices - On clicking notification CTA, deeplink launches third party app instead of X app even though X app is capable of handling deeplink. For example, if X app is capable of handling https://google.com(sample link) but deeplink launches browser instead of X app.\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/build.gradle",
"new_path": "sample/build.gradle",
"diff": "@@ -72,7 +72,7 @@ dependencies {\nimplementation project(':clevertap-core')\nimplementation fileTree(include: ['*.aar'], dir: 'libs')\n- //implementation \"com.clevertap.android:clevertap-android-sdk:4.6.0\"\n+ //implementation \"com.clevertap.android:clevertap-android-sdk:4.6.1\"\nimplementation project(':clevertap-geofence')\n//implementation \"com.clevertap.android:clevertap-geofence-sdk:1.1.0\"\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTCORECHANGELOG.md",
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.6.1 (August 31, 2022)\n+* App inbox blue dot fix : This release fixes the bug where new entries in inbox would continue showing blue dot when scrolled up and down . expected behaviour is to stop showing blue dot after 2 seconds.\n+* App inbox onMessage Click Callback : user can now pass an `InboxMessageListener` in addition to `InboxMessageButtonListener` to receive inbox item click\n+\n### Version 4.6.0 (August 4, 2022)\n* Improved push synchronization for multiple push services\n"
},
{
"change_type": "MODIFY",
"old_path": "versions.properties",
"new_path": "versions.properties",
"diff": "@@ -321,7 +321,7 @@ version.com.android.installreferrer..installreferrer=2.2\nversion.com.android.tools.lint..lint-api=27.0.1\nversion.com.android.tools.lint..lint-checks=27.0.1\n-version.com.clevertap.android..clevertap-android-sdk=4.6.0\n+version.com.clevertap.android..clevertap-android-sdk=4.6.1\nversion.com.clevertap.android..clevertap-geofence-sdk=1.1.0\nversion.com.clevertap.android..clevertap-hms-sdk=1.3.0\nversion.com.clevertap.android..clevertap-xiaomi-sdk=1.5.0\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-RELEASE] updated core sdk to 4.6.1 |
116,620 | 30.08.2022 12:27:50 | -19,080 | 9a8b07c02a6da35c219d9a0b4d802948336fad02 | [SDK-RELEASE] fixing typo | [
{
"change_type": "MODIFY",
"old_path": "docs/CTPUSHTEMPLATESCHANGELOG.md",
"new_path": "docs/CTPUSHTEMPLATESCHANGELOG.md",
"diff": "## CleverTap Push Templates SDK CHANGE LOG\n### Version 1.0.4 (August 4, 2022)\n-* Supports CleverTap Android SDK v4.6.q\n+* Supports CleverTap Android SDK v4.6.0\n### Version 1.0.3 (July 22, 2022)\n* Fixes a bug for notification CTA deeplink for Android 12 and above devices - On clicking notification CTA, deeplink launches third party app instead of X app even though X app is capable of handling deeplink. For example, if X app is capable of handling https://google.com(sample link) but deeplink launches browser instead of X app.\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-RELEASE] fixing typo |
116,620 | 02.09.2022 13:20:57 | -19,080 | 5528e58b0f8a98e7c0132d6ad8d686e9fa02c1ea | [SDK-RELEASE] fixing bug where notification does not hide blue dot for different inbox catregories | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxActivity.java",
"diff": "@@ -179,6 +179,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\npublic void onTabSelected(TabLayout.Tab tab) {\nCTInboxListViewFragment fragment = (CTInboxListViewFragment) inboxTabAdapter\n.getItem(tab.getPosition());\n+ fragment.updateAdapterContent();\nif (fragment.getMediaRecyclerView() != null) {\nfragment.getMediaRecyclerView().onRestartPlayer();\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-RELEASE] fixing bug where notification does not hide blue dot for different inbox catregories |
116,620 | 05.09.2022 14:05:06 | -19,080 | d6c2c601b3c97bee9eb0a31d86a8c88776286ed2 | [SDK-RELEASE] adding more information to exception logs | [
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiMessageReceiver.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiMessageReceiver.java",
"diff": "@@ -46,18 +46,18 @@ public class XiaomiMessageReceiver extends PushMessageReceiver {\nprivate void pushNotificationViewedEvent(Context context, MiPushMessage miPushMessage, XiaomiNotificationParser xpsParser) {\ntry {\n- Objects.requireNonNull(miPushMessage);\n- Objects.requireNonNull(xpsParser);\n+ Objects.requireNonNull(miPushMessage,\"MiPushMessage must not be null\");\n+ Objects.requireNonNull(xpsParser, \"XiaomiNotificationParser must not be null\");\nBundle data = xpsParser.toBundle(miPushMessage);\n- Objects.requireNonNull(data);\n+ Objects.requireNonNull(data , \"Bundle data must not be null\");\nString acc = PushNotificationUtil.getAccountIdFromNotificationBundle(data);\n- Objects.requireNonNull(context);\n- Objects.requireNonNull(acc);\n+ Objects.requireNonNull(context,\"Context must not be null\");\n+ Objects.requireNonNull(acc, \"acc must not be null\");\nCleverTapAPI ct = CleverTapAPI.getGlobalInstance(context, acc);\n- Objects.requireNonNull(ct);\n+ Objects.requireNonNull(ct,\"CleverTapAPI must not be null\");\nct.pushNotificationViewedEvent(data);\n}\ncatch (Throwable t){\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-RELEASE] adding more information to exception logs |
116,612 | 05.09.2022 17:00:45 | -19,080 | 474f15908720251046dd3110d6874965cd53252b | fix(SDK-2129): send notification viewed callback for last push on device in a process session | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -7,7 +7,6 @@ import android.content.Context;\nimport android.location.Location;\nimport android.net.Uri;\nimport android.os.Bundle;\n-\nimport androidx.annotation.NonNull;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.events.BaseEventQueueManager;\n@@ -629,6 +628,7 @@ public class AnalyticsManager extends BaseAnalyticsManager {\n} catch (Throwable ignored) {\n//no-op\n}\n+ coreMetaData.setLastNotificationId(extras.getString(Constants.WZRK_PUSH_ID));\nbaseEventQueueManager.queueEvent(context, event, Constants.NV_EVENT);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"diff": "@@ -55,6 +55,11 @@ public class CoreMetaData extends CleverTapMetaData {\nprivate boolean offline;\n+ /**\n+ * Last notification received on device from CleverTap in an active session of a process(before process is killed)\n+ */\n+ private String lastNotificationId;\n+\nprivate final Object optOutFlagLock = new Object();\nprivate HashMap<String, Integer> customSdkVersions = new HashMap<>();\n@@ -71,6 +76,14 @@ public class CoreMetaData extends CleverTapMetaData {\nreturn (currentActivity == null) ? null : currentActivity.get();\n}\n+ public String getLastNotificationId() {\n+ return lastNotificationId;\n+ }\n+\n+ void setLastNotificationId(final String lastNotificationId) {\n+ this.lastNotificationId = lastNotificationId;\n+ }\n+\nstatic int getInitialAppEnteredForegroundTime() {\nreturn initialAppEnteredForegroundTime;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"diff": "@@ -420,8 +420,7 @@ public class NetworkManager extends BaseNetworkManager {\nheader.put(\"af\", appFields);\nHashMap<String, Integer> allCustomSdkVersions = coreMetaData.getAllCustomSdkVersions();\n- for (Entry<String, Integer> entries :allCustomSdkVersions.entrySet())\n- {\n+ for (Entry<String, Integer> entries : allCustomSdkVersions.entrySet()) {\nheader.put(entries.getKey(), entries.getValue());\n}\n@@ -676,12 +675,34 @@ public class NetworkManager extends BaseNetworkManager {\nsetFirstRequestTimestampIfNeeded(getCurrentRequestTimestamp());\nif (eventGroup == EventGroup.PUSH_NOTIFICATION_VIEWED) {\n+ // get last push id from queue\n+\n+ JSONObject notification = queue.getJSONObject(queue.length() - 1).optJSONObject(\"evtData\");\n+ if (notification != null) {\n+ String lastPushInQueue = notification.optString(Constants.WZRK_PUSH_ID);\n+ /**\n+ * Check if, sent push notification viewed event is for latest push notification or older\n+ * If it's for latest push which just came on device then give render callback to listeners\n+ * This will make sure that callback will be given only when viewed event for latest push on device is\n+ * sent to BE.\n+ */\n+ if (coreMetaData.getLastNotificationId() != null && coreMetaData.getLastNotificationId()\n+ .equals(lastPushInQueue)) {\nNotificationRenderedListener notificationRenderedListener\n= callbackManager.getNotificationRenderedListener();\n- logger.verbose(config.getAccountId(), \"push notification viewed event sent successfully\");\n+\n+ logger.verbose(config.getAccountId(),\n+ \"push notification viewed event sent successfully for push id = \" + lastPushInQueue);\nif (notificationRenderedListener != null) {\nnotificationRenderedListener.onNotificationRendered(true);\n}\n+\n+ }\n+ }\n+\n+ logger.verbose(config.getAccountId(),\n+ \"push notification viewed event sent successfully\");\n+\n}\nlogger.debug(config.getAccountId(), \"Queue sent successfully\");\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(SDK-2129): send notification viewed callback for last push on device in a process session |
116,616 | 05.09.2022 18:01:55 | -19,080 | cd5102be80995a110ec861feeb0d9f6689c6c9f8 | task(SDK-2093,2094,2095)-Create a builder pattern to render local in-app(half-interstitial, alert type) | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/AndroidManifest.xml",
"new_path": "clevertap-core/src/main/AndroidManifest.xml",
"diff": "<manifest package=\"com.clevertap.android.sdk\"\nxmlns:android=\"http://schemas.android.com/apk/res/android\">\n+ <!-- Required runtime permission to display notifications on Android 13 -->\n+ <uses-permission android:name=\"android.permission.POST_NOTIFICATIONS\"/>\n+\n<application>\n<activity\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"diff": "@@ -20,6 +20,9 @@ public class CTWebInterface {\nthis.weakReference = new WeakReference<>(instance);\n}\n+\n+ //Handle push primer click and directly call requestPermissions() inside InAppActivity\n+\n/**\n* Method to be called from WebView Javascript to add profile properties in CleverTap\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -31,6 +31,7 @@ import com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.events.EventDetail;\nimport com.clevertap.android.sdk.events.EventGroup;\nimport com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\n+import com.clevertap.android.sdk.inapp.CTLocalInAppSettings;\nimport com.clevertap.android.sdk.inbox.CTInboxActivity;\nimport com.clevertap.android.sdk.inbox.CTInboxMessage;\nimport com.clevertap.android.sdk.inbox.CTMessageDAO;\n@@ -1029,6 +1030,23 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n+ public void promptPushPrimer(CTLocalInAppSettings builder){\n+ if (instances == null) {\n+ return;\n+ }\n+\n+ for (String accountId : CleverTapAPI.instances.keySet()) {\n+ CleverTapAPI instance = CleverTapAPI.instances.get(accountId);\n+ try {\n+ if (instance != null) {\n+ instance.coreState.getInAppController().promptPushPrimer(builder);\n+ }\n+ } catch (Throwable t) {\n+ // Ignore\n+ }\n+ }\n+ }\n+\n// Initialize\nprivate CleverTapAPI(final Context context, final CleverTapInstanceConfig config, String cleverTapID) {\nthis.context = context;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -215,6 +215,8 @@ public interface Constants {\nString BLACK = \"#000000\";\nString WHITE = \"#FFFFFF\";\nString BLUE = \"#0000FF\";\n+ String GREEN = \"#00FF00\";\n+ String LIGHT_BLUE = \"#818ce5\";\n/**\n* Profile command constants.\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFragment.java",
"diff": "@@ -140,6 +140,9 @@ public abstract class CTInAppBaseFragment extends Fragment {\ndidClick(data, button.getKeyValues());\n+// check API and toolsSDK version, inapp type, whether the btn was meant for PN.\n+// requestPermissions()\n+\nString actionUrl = button.getActionUrl();\nif (actionUrl != null) {\nfireUrlThroughIntent(actionUrl, data);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"diff": "@@ -572,6 +572,47 @@ public class CTInAppNotification implements Parcelable {\nlistener.notificationReady(this);\n}\n+ public CTInAppNotification configureWithLocalData(CTLocalInAppSettings ctLocalInAppSettings){\n+ this.id = \"\";//\n+ this.campaignId = \"\";//\n+ this.type = ctLocalInAppSettings.getInAppAlertType();//alert-template\n+ this.excludeFromCaps = false;//\n+ this.totalLifetimeCount = -1;//\n+ this.totalDailyCount = -1;//\n+ this.inAppType = CTInAppType.fromString(this.type);\n+ this.isTablet = false;//\n+ this.backgroundColor = Constants.WHITE;\n+ this.isPortrait = true;//\n+ this.isLandscape = true;//\n+ this.timeToLive = System.currentTimeMillis() + 2 * Constants.ONE_DAY_IN_MILLIS;\n+\n+\n+ this.title = ctLocalInAppSettings.getTitleText();\n+ this.titleColor = Constants.BLACK;\n+\n+ this.message = ctLocalInAppSettings.getBodyText();\n+ this.messageColor = Constants.BLACK;\n+\n+ this.hideCloseButton = true;\n+\n+ //CTINAPPNOTIFMedia obj\n+\n+ //Positive Button\n+ CTInAppNotificationButton inAppNotificationPositiveButton = new CTInAppNotificationButton()\n+ .initWithLocalData(ctLocalInAppSettings.getPositiveConfirmationBtnText(),ctLocalInAppSettings.getPositiveConfirmationBtnColor());\n+ if (inAppNotificationPositiveButton != null) {\n+ this.buttons.add(inAppNotificationPositiveButton);\n+ }\n+\n+ //Negative Button\n+ CTInAppNotificationButton inAppNotificationNegativeButton = new CTInAppNotificationButton()\n+ .initWithLocalData(ctLocalInAppSettings.getNegativeConfirmationBtnText(),ctLocalInAppSettings.getPositiveConfirmationBtnColor());\n+ if (inAppNotificationNegativeButton != null) {\n+ this.buttons.add(inAppNotificationNegativeButton);\n+ }\n+ return this;\n+ }\n+\nprivate void configureWithJson(JSONObject jsonObject) {\ntry {\nthis.id = jsonObject.has(Constants.INAPP_ID_IN_PAYLOAD) ? jsonObject\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationButton.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationButton.java",
"diff": "@@ -213,6 +213,17 @@ public class CTInAppNotificationButton implements Parcelable {\nreturn this;\n}\n+ CTInAppNotificationButton initWithLocalData(String text, String btnBackgroundColor) {\n+ this.text = text;\n+ this.textColor = Constants.WHITE;\n+ this.backgroundColor = btnBackgroundColor.isEmpty() ? btnBackgroundColor\n+ : Constants.LIGHT_BLUE;\n+ this.borderColor = Constants.GREEN;\n+ this.borderRadius = \"4\";//From sample payload\n+\n+ return this;\n+ }\n+\n/**\n* Checks if custom Key Value pair is present or not\n*\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTLocalInAppSettings.java",
"diff": "+package com.clevertap.android.sdk.inapp;\n+\n+import java.util.Objects;\n+\n+public class CTLocalInAppSettings {\n+\n+\n+ public static final class Builder {\n+ private String inAppAlertType;\n+ private String titleText;\n+ private String bodyText;\n+ private String positiveConfirmationBtnText;\n+ private String negativeConfirmationBtnText;\n+ private String positiveConfirmationBtnColor;\n+\n+ public Builder() {\n+ }\n+\n+ public CTLocalInAppSettings build(){\n+ return new CTLocalInAppSettings(this);\n+ }\n+\n+ public CTLocalInAppSettings.Builder setInAppAlertType(String inAppAlertType) {\n+ this.inAppAlertType = inAppAlertType;\n+ return this;\n+ }\n+\n+ public CTLocalInAppSettings.Builder setTitleText(String titleText){\n+ this.titleText = titleText;\n+ return this;\n+ }\n+\n+ public CTLocalInAppSettings.Builder setBodyText(String bodyText){\n+ this.bodyText = bodyText;\n+ return this;\n+ }\n+\n+ public CTLocalInAppSettings.Builder setPositiveConfirmationBtnText(String positiveConfirmationBtnText){\n+ this.positiveConfirmationBtnText = positiveConfirmationBtnText;\n+ return this;\n+ }\n+\n+ public CTLocalInAppSettings.Builder setNegativeConfirmationBtnText(String negativeConfirmationBtnText){\n+ this.negativeConfirmationBtnText = negativeConfirmationBtnText;\n+ return this;\n+ }\n+\n+ public CTLocalInAppSettings.Builder setPositiveConfirmationBtnColor(String positiveConfirmationBtnColor){\n+ this.positiveConfirmationBtnColor = positiveConfirmationBtnColor;\n+ return this;\n+ }\n+ }\n+\n+ private final String inAppAlertType;\n+ private final String titleText;\n+ private final String bodyText;\n+ private final String positiveConfirmationBtnText;\n+ private final String negativeConfirmationBtnText;\n+ private final String positiveConfirmationBtnColor;\n+\n+ private CTLocalInAppSettings(Builder builder) {\n+ inAppAlertType = builder.inAppAlertType;\n+ titleText = builder.titleText;\n+ bodyText = builder.bodyText;\n+ positiveConfirmationBtnText = builder.positiveConfirmationBtnText;\n+ negativeConfirmationBtnText = builder.negativeConfirmationBtnText;\n+ positiveConfirmationBtnColor = builder.positiveConfirmationBtnColor;\n+ }\n+\n+ @Override\n+ public boolean equals(Object o) {\n+ if (this == o) return true;\n+ if (o == null || getClass() != o.getClass()) return false;\n+ CTLocalInAppSettings that = (CTLocalInAppSettings) o;\n+ return Objects.equals(inAppAlertType, that.inAppAlertType) && Objects.equals(titleText, that.titleText) && Objects.equals(bodyText, that.bodyText) && Objects.equals(positiveConfirmationBtnText, that.positiveConfirmationBtnText) && Objects.equals(negativeConfirmationBtnText, that.negativeConfirmationBtnText) && Objects.equals(positiveConfirmationBtnColor, that.positiveConfirmationBtnColor);\n+ }\n+\n+ @Override\n+ public int hashCode() {\n+ return super.hashCode();\n+ }\n+\n+ public String getInAppAlertType() {\n+ return inAppAlertType;\n+ }\n+\n+ public String getTitleText() {\n+ return titleText;\n+ }\n+\n+ public String getBodyText() {\n+ return bodyText;\n+ }\n+\n+ public String getPositiveConfirmationBtnText() {\n+ return positiveConfirmationBtnText;\n+ }\n+\n+ public String getNegativeConfirmationBtnText() {\n+ return negativeConfirmationBtnText;\n+ }\n+\n+ public String getPositiveConfirmationBtnColor() {\n+ return positiveConfirmationBtnColor;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -42,7 +42,9 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nprivate final WeakReference<InAppController> inAppControllerWeakReference;\n- private final JSONObject jsonObject;\n+ private JSONObject jsonObject;\n+\n+ private CTLocalInAppSettings ctLocalInAppSettings;\nprivate final boolean videoSupport = Utils.haveVideoPlayerSupport;\n@@ -51,10 +53,22 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nthis.jsonObject = jsonObject;\n}\n+ NotificationPrepareRunnable(InAppController inAppController, CTLocalInAppSettings ctLocalInAppSettings) {\n+ this.inAppControllerWeakReference = new WeakReference<>(inAppController);\n+ this.ctLocalInAppSettings = ctLocalInAppSettings;\n+ }\n+\n@Override\npublic void run() {\n- final CTInAppNotification inAppNotification = new CTInAppNotification()\n+ final CTInAppNotification inAppNotification;\n+ if (jsonObject != null) {//If jsonObj is available then render in-app via JSON\n+ inAppNotification = new CTInAppNotification()\n.initWithJSON(jsonObject, videoSupport);\n+ }else {//render in-app via local in-app builder\n+ inAppNotification = new CTInAppNotification()\n+ .configureWithLocalData(ctLocalInAppSettings);\n+ }\n+\nif (inAppNotification.getError() != null) {\nlogger\n.debug(config.getAccountId(),\n@@ -167,6 +181,10 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\n}\n+ public void promptPushPrimer(CTLocalInAppSettings ctLocalInAppSettings) {//Change method name here to avoid confusion\n+ prepareNotificationForDisplay(ctLocalInAppSettings);\n+ }\n+\npublic void discardInApps() {\nthis.inAppState = InAppState.DISCARDED;\nlogger.verbose(config.getAccountId(), \"InAppState is DISCARDED\");\n@@ -418,6 +436,18 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n});\n}\n+ private void prepareNotificationForDisplay(final CTLocalInAppSettings ctLocalInAppSettings) {\n+ logger.debug(config.getAccountId(), \"Preparing local In-App using CTLocalInAppSettings for display\");//Need correct error mssg\n+ Task<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask(Constants.TAG_FEATURE_IN_APPS);\n+ task.execute(\"InappController#prepareNotificationForDisplay\", new Callable<Void>() {\n+ @Override\n+ public Void call() {\n+ new NotificationPrepareRunnable(InAppController.this, ctLocalInAppSettings).run();\n+ return null;\n+ }\n+ });\n+ }\n+\nprivate void showInAppNotificationIfAny() {\nif (!config.isAnalyticsOnly()) {\nTask<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask(Constants.TAG_FEATURE_IN_APPS);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-2093,2094,2095)-Create a builder pattern to render local in-app(half-interstitial, alert type) |
116,616 | 05.09.2022 18:03:25 | -19,080 | 02136212e699aa5c39607060c209daa7ec6eb2e7 | task(SDK-2093,2094,2095)-Update sample to show local IAM(half-interstitial & alter type) | [
{
"change_type": "MODIFY",
"old_path": "sample/src/main/AndroidManifest.xml",
"new_path": "sample/src/main/AndroidManifest.xml",
"diff": "<!--Enable below line to test for Android GO devices-->\n<!--<uses-feature android:name=\"android.hardware.ram.low\" android:required=\"true\"/>-->\n- <!-- Required runtime permission to display notifications on Android 13 -->\n- <uses-permission android:name=\"android.permission.POST_NOTIFICATIONS\"/>\n-\n<application\nandroid:name=\".MyApplication\"\nandroid:allowBackup=\"false\"\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"diff": "@@ -63,6 +63,10 @@ object HomeScreenModel {\n\"Input Box - reminder - DOC true\",\n\"Input Box - reminder - DOC false\",\n\"Three CTA\"\n+ ),\n+ \"PROMPT LOCAL IN-APP\" to listOf(\n+ \"Generate Half-Interstitial Local InApp\",\n+ \"Generate Alert Local InApp\"\n)\n)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "@@ -6,8 +6,9 @@ import androidx.lifecycle.MutableLiveData\nimport androidx.lifecycle.ViewModel\nimport com.clevertap.android.sdk.CTInboxStyleConfig\nimport com.clevertap.android.sdk.CleverTapAPI\n-import java.util.ArrayList\n-import java.util.Date\n+import com.clevertap.android.sdk.Constants\n+import com.clevertap.android.sdk.inapp.CTLocalInAppSettings\n+import java.util.*\nclass HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel() {\n@@ -322,6 +323,25 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\n\"917\"-> cleverTapAPI?.pushEvent(\"Send Input Box Reminder DOC true\")\n\"918\"-> cleverTapAPI?.pushEvent(\"Send Input Box Reminder DOC false\")\n\"919\"-> cleverTapAPI?.pushEvent(\"Send Three CTA Notification\")\n+ \"100\"-> {\n+ val builder = CTLocalInAppSettings.Builder().setTitleText(\"Get Notified\")\n+ .setInAppAlertType(\"half-interstitial\")\n+ .setBodyText(\"Please enable notifications on your device to use Push Notifications.\")\n+ .setPositiveConfirmationBtnText(\"Allow\")\n+ .setNegativeConfirmationBtnText(\"Cancel\")\n+ .setPositiveConfirmationBtnColor(Constants.LIGHT_BLUE).build()//Add image,inapp type\n+ cleverTapAPI?.promptPushPrimer(builder)\n+ }\n+\n+ \"101\"->{\n+ val builder = CTLocalInAppSettings.Builder().setTitleText(\"Get Notified\")\n+ .setInAppAlertType(\"alert-template\")\n+ .setBodyText(\"Please enable notifications on your device to use Push Notifications.\")\n+ .setPositiveConfirmationBtnText(\"Allow\")\n+ .setNegativeConfirmationBtnText(\"Cancel\")\n+ .setPositiveConfirmationBtnColor(Constants.LIGHT_BLUE).build()//Add image,inapp type\n+ cleverTapAPI?.promptPushPrimer(builder)\n+ }\n//\"60\" -> webViewClickListener?.onWebViewClick()\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-2093,2094,2095)-Update sample to show local IAM(half-interstitial & alter type) |
116,620 | 06.09.2022 13:44:55 | -19,080 | f1329098c9e72adec6fce04cf97fdaec85b26645 | [SDK-RELEASE] fixing push provider bug. payload sends boolean but we always use it as string | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -193,6 +193,7 @@ public interface Constants {\nString KEY_ALLOWED_PUSH_TYPES = \"allowedPushTypes\";\nString KEY_IDENTITY_TYPES = \"identityTypes\";\nString WZRK_PUSH_ID = \"wzrk_pid\";\n+ String WZRK_PUSH_SILENT = \"wzrk_pn_s\";\nString EXTRAS_FROM = \"extras_from\";\nString NOTIF_MSG = \"nm\";\nString NOTIF_TITLE = \"nt\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushProviders.java",
"diff": "@@ -151,7 +151,8 @@ public class PushProviders implements CTPushProviderListener {\n}\ntry {\n- if(extras.getBoolean(\"wzrk_pn_s\")){\n+ boolean isSilent = extras.getString(Constants.WZRK_PUSH_SILENT,\"\").equalsIgnoreCase(\"true\");\n+ if(isSilent){\nanalyticsManager.pushNotificationViewedEvent(extras);\nreturn ;\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-RELEASE] fixing push provider bug. payload sends boolean but we always use it as string |
116,620 | 06.09.2022 14:11:01 | -19,080 | 6eef2cb8523c18390f16e3bb3b5b4dca062bfe7f | [SDK-RELEASE] update release date | [
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG.\n-### August 31, 2022\n+### September 6, 2022\n* [CleverTap Xiaomi Push SDK v1.5.0](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTXIAOMIPUSHCHANGELOG.md)\n* [CleverTap Android SDK v4.6.1](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTCORECHANGELOG.md",
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n-### Version 4.6.1 (August 31, 2022)\n+### Version 4.6.1 (September 6, 2022)\n* App inbox blue dot fix : This release fixes the bug where new entries in inbox would continue showing blue dot when scrolled up and down . expected behaviour is to stop showing blue dot after 2 seconds.\n* App inbox onMessage Click Callback : user can now pass an `InboxMessageListener` in addition to `InboxMessageButtonListener` to receive inbox item click\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTHUAWEIPUSHCHANGELOG.md",
"new_path": "docs/CTHUAWEIPUSHCHANGELOG.md",
"diff": "## CleverTap Huawei Push SDK CHANGE LOG\n-### Version 1.3.1 (August 31,2022)\n+### Version 1.3.1 (September 6, 2022)\n* Updated Huawei Push SDK to v6.5.0.300\n### Version 1.3.0 (April 26, 2022)\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTXIAOMIPUSHCHANGELOG.md",
"new_path": "docs/CTXIAOMIPUSHCHANGELOG.md",
"diff": "## CleverTap Xiaomi Push SDK CHANGE LOG\n-### Version 1.5.0 (August 31, 2022)\n+### Version 1.5.0 (September 6, 2022)\n* Supporting Xiaomi Regions\n* This Release makes the CT XPS SDK compatible with the latest [Xiaomi Privacy Upgrades](https://dev.mi.com/console/doc/detail?pId=2761)\n* **[Breaking Change]** This release makes it mandatory for Clients to include the Xiaomi Push Library as a part of their gradle dependencies. Check the [integration doc](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTXIAOMIPUSH.md)for more info\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTCORECHANGELOG.md",
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n-### Version 4.6.1 (August 31, 2022)\n+### Version 4.6.1 (September 6, 2022)\n* App inbox blue dot fix : This release fixes the bug where new entries in inbox would continue showing blue dot when scrolled up and down . expected behaviour is to stop showing blue dot after 2 seconds.\n* App inbox onMessage Click Callback : user can now pass an `InboxMessageListener` in addition to `InboxMessageButtonListener` to receive inbox item click\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTHUAWEIPUSHCHANGELOG.md",
"new_path": "templates/CTHUAWEIPUSHCHANGELOG.md",
"diff": "## CleverTap Huawei Push SDK CHANGE LOG\n-### Version 1.3.1 (August 31,2022)\n+### Version 1.3.1 (September 6, 2022)\n* Updated Huawei Push SDK to v6.5.0.300\n### Version 1.3.0 (April 26, 2022)\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTXIAOMIPUSHCHANGELOG.md",
"new_path": "templates/CTXIAOMIPUSHCHANGELOG.md",
"diff": "## CleverTap Xiaomi Push SDK CHANGE LOG\n-### Version 1.5.0 (August 31, 2022)\n+### Version 1.5.0 (September 6, 2022)\n* Supporting Xiaomi Regions\n* This Release makes the CT XPS SDK compatible with the latest [Xiaomi Privacy Upgrades](https://dev.mi.com/console/doc/detail?pId=2761)\n* **[Breaking Change]** This release makes it mandatory for Clients to include the Xiaomi Push Library as a part of their gradle dependencies. Check the [integration doc](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTXIAOMIPUSH.md)for more info\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-RELEASE] update release date |
116,620 | 06.09.2022 14:58:49 | -19,080 | 9b4b484e07423a8514614ed06aa24a46ee1fdc97 | [SDK-RELEASE] name change and doc fixes | [
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "### September 6, 2022\n-* [CleverTap Xiaomi Push SDK v1.5.0](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTXIAOMIPUSHCHANGELOG.md)\n* [CleverTap Android SDK v4.6.1](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n+* [CleverTap Xiaomi Push SDK v1.5.0](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTXIAOMIPUSHCHANGELOG.md)\n* [CleverTap Huawei Push SDK v1.3.1](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTHUAWEIPUSHCHANGELOG.md)\n### August 4, 2022\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -140,7 +140,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nprivate WeakReference<InboxMessageButtonListener> inboxMessageButtonListener;\n- private WeakReference<CTInboxMessageListener> inboxMessageListener;\n+ private WeakReference<InboxMessageListener> inboxMessageListener;\n/**\n* This method is used to change the credentials of CleverTap account Id and token programmatically\n@@ -2411,7 +2411,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n@SuppressWarnings(\"unused\")\n- public void setCTInboxMessageListener(CTInboxMessageListener listener){\n+ public void setCTInboxMessageListener(InboxMessageListener listener){\nthis.inboxMessageListener = new WeakReference<>(listener);\n}\n"
},
{
"change_type": "RENAME",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTInboxMessageListener.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InboxMessageListener.java",
"diff": "@@ -2,7 +2,7 @@ package com.clevertap.android.sdk;\nimport com.clevertap.android.sdk.inbox.CTInboxMessage;\n-public interface CTInboxMessageListener {\n+public interface InboxMessageListener {\n/**\n* callback to transfer payload when an inbox item is clicked\n*/\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-RELEASE] name change and doc fixes |
116,616 | 08.09.2022 11:00:05 | -19,080 | 87b1c5c91a52961bf77e363070f3cb93cc7e0a70 | task(SDK-2127)-Add alert dialog for opt-in nudge if permission is denied | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "package com.clevertap.android.sdk;\n+import static com.clevertap.android.sdk.Utils.isAndroid13;\n+\nimport android.app.AlertDialog;\nimport android.content.Context;\nimport android.content.DialogInterface;\nimport android.content.Intent;\n+import android.content.pm.PackageManager;\nimport android.content.res.Configuration;\nimport android.net.Uri;\nimport android.os.Bundle;\nimport android.view.WindowManager;\n+import android.widget.Toast;\n+\n+import androidx.annotation.NonNull;\n+import androidx.core.app.ActivityCompat;\nimport androidx.fragment.app.FragmentActivity;\n+\n+import com.clevertap.android.sdk.inapp.AlertDialogPromptForSettings;\nimport com.clevertap.android.sdk.inapp.CTInAppBaseFullFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppHtmlCoverFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppHtmlHalfInterstitialFragment;\n@@ -22,6 +31,8 @@ import com.clevertap.android.sdk.inapp.CTInAppNativeInterstitialImageFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppNotification;\nimport com.clevertap.android.sdk.inapp.CTInAppType;\nimport com.clevertap.android.sdk.inapp.InAppListener;\n+import com.clevertap.android.sdk.inapp.NavigateToAndroidSettingsForNotifications;\n+\nimport java.lang.ref.WeakReference;\nimport java.util.HashMap;\n@@ -35,6 +46,13 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nprivate WeakReference<InAppListener> listenerWeakReference;\n+ private static boolean neverAskAgainClicked;\n+\n+ private static final int PERMISSION_REQUEST_CODE = 2;\n+\n+ private static final String ANDROID_PERMISSION_STRING = \"android.permission.POST_NOTIFICATIONS\";\n+\n+\npublic void onCreate(Bundle savedInstanceState) {\nsuper.onCreate(savedInstanceState);\nint orientation = this.getResources().getConfiguration().orientation;\n@@ -146,6 +164,56 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\n}\n+ public void prompt(){\n+ if (isAndroid13(InAppNotificationActivity.this)){\n+ requestPermission();\n+ }\n+ }\n+\n+ public void requestPermission() {\n+ neverAskAgainClicked = !ActivityCompat.shouldShowRequestPermissionRationale(\n+ InAppNotificationActivity.this, ANDROID_PERMISSION_STRING);\n+\n+ if (neverAskAgainClicked) {\n+ ActivityCompat.requestPermissions(this,\n+ new String[]{ANDROID_PERMISSION_STRING}, PERMISSION_REQUEST_CODE);\n+ }else{\n+ showFallbackAlertDialog();\n+ }\n+ }\n+\n+ @Override\n+ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {\n+ super.onRequestPermissionsResult(requestCode, permissions, grantResults);\n+ if (requestCode == PERMISSION_REQUEST_CODE) {\n+ boolean granted = grantResults.length > 0 && grantResults[0] ==\n+ PackageManager.PERMISSION_GRANTED;\n+ if (granted) {\n+// callback.onAccept();//Give callback when permission is granted\n+ Toast.makeText(InAppNotificationActivity.this,\n+ \"Notification Permission is granted\", Toast.LENGTH_SHORT).show();\n+ }else {\n+// callback.onReject(shouldShowSettings());//Give callback when permission is rejected\n+ }\n+ didDismiss(null);\n+ }\n+ }\n+\n+ public void showFallbackAlertDialog() {\n+ AlertDialogPromptForSettings.INSTANCE.show(this, new AlertDialogPromptForSettings.Callback() {\n+ @Override\n+ public void onAccept() {\n+ NavigateToAndroidSettingsForNotifications.INSTANCE.show(getBaseContext());\n+ didDismiss(null);\n+ }\n+\n+ @Override\n+ public void onDecline() {\n+ didDismiss(null);\n+ }\n+ });\n+ }\n+\nvoid didDismiss(Bundle data) {\nif (isAlertVisible) {\nisAlertVisible = false;\n@@ -257,8 +325,12 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nfireUrlThroughIntent(actionUrl, data);\nreturn;\n}\n+ if (inAppNotification.isLocalInApp()) {\n+ prompt();\n+ }else {\ndidDismiss(data);\n}\n+ }\n})\n.create();\nif (inAppNotification.getButtons().size() == 2) {\n@@ -304,6 +376,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nreturn;\n}\ndidDismiss(data);\n+\n}\n}).create();\nif (inAppNotification.getButtons().size() == 2) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "@@ -9,6 +9,7 @@ import android.app.ActivityManager;\nimport android.app.ActivityManager.RunningAppProcessInfo;\nimport android.content.Context;\nimport android.content.Intent;\n+import android.content.pm.ApplicationInfo;\nimport android.content.pm.PackageInfo;\nimport android.content.pm.PackageManager;\nimport android.content.pm.ResolveInfo;\n@@ -662,6 +663,23 @@ public final class Utils {\n}\n+ public static boolean isAndroid13(Context context){\n+ return Build.VERSION.SDK_INT > 32 && getTargetSdkVersion(context) > 32;\n+ }\n+\n+ public static int getTargetSdkVersion(Context context) {\n+ String packageName = context.getPackageName();\n+ PackageManager packageManager = context.getPackageManager();\n+ try {\n+ ApplicationInfo applicationInfo = packageManager.getApplicationInfo(packageName, 0);\n+ return applicationInfo.targetSdkVersion;\n+ } catch (PackageManager.NameNotFoundException e) {\n+ e.printStackTrace();\n+ }\n+\n+ return Build.VERSION_CODES.JELLY_BEAN;\n+ }\n+\nstatic {\nhaveVideoPlayerSupport = checkForExoPlayer();\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/AlertDialogPromptForSettings.kt",
"diff": "+package com.clevertap.android.sdk.inapp\n+\n+import android.app.Activity\n+import android.app.AlertDialog\n+import com.clevertap.android.sdk.R\n+\n+object AlertDialogPromptForSettings {\n+\n+ interface Callback {\n+ fun onAccept()\n+ fun onDecline()\n+ }\n+\n+ fun show(\n+ activity: Activity,\n+ callback: Callback,\n+ ) {\n+ val title = activity.getString(R.string.permission_not_available_title)\n+\n+ val message = activity.getString(R.string.permission_not_available_message)\n+\n+ AlertDialog.Builder(activity)\n+ .setTitle(title)\n+ .setMessage(message)\n+ .setPositiveButton(R.string.permission_not_available_open_settings_option) { dialog, which ->\n+ callback.onAccept()\n+ }\n+ .setNegativeButton(android.R.string.no) { dialog, which ->\n+ callback.onDecline()\n+ }\n+ .show()\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFragment.java",
"diff": "@@ -10,6 +10,7 @@ import androidx.annotation.Nullable;\nimport androidx.fragment.app.Fragment;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\n+import com.clevertap.android.sdk.InAppNotificationActivity;\nimport com.clevertap.android.sdk.Utils;\nimport com.clevertap.android.sdk.customviews.CloseImageView;\nimport java.lang.ref.WeakReference;\n@@ -143,12 +144,16 @@ public abstract class CTInAppBaseFragment extends Fragment {\n// check API and toolsSDK version, inapp type, whether the btn was meant for PN.\n// requestPermissions()\n+ if (index == 0 && inAppNotification.isLocalInApp()) {\n+ ((InAppNotificationActivity) context).prompt();\n+ }else {\nString actionUrl = button.getActionUrl();\nif (actionUrl != null) {\nfireUrlThroughIntent(actionUrl, data);\nreturn;\n}\ndidDismiss(data);\n+ }\n} catch (Throwable t) {\nconfig.getLogger().debug(\"Error handling notification button click: \" + t.getCause());\ndidDismiss(null);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"diff": "@@ -220,6 +220,8 @@ public class CTInAppNotification implements Parcelable {\nprivate int widthPercentage;\n+ private boolean isLocalInApp = false;\n+\nCTInAppNotification() {\n}\n@@ -267,6 +269,7 @@ public class CTInAppNotification implements Parcelable {\njsEnabled = in.readByte() != 0x00;\nisPortrait = in.readByte() != 0x00;\nisLandscape = in.readByte() != 0x00;\n+ isLocalInApp = in.readByte() != 0x00;\nlandscapeImageUrl = in.readString();\n_landscapeImageCacheKey = in.readString();\ntimeToLive = in.readLong();\n@@ -354,6 +357,7 @@ public class CTInAppNotification implements Parcelable {\ndest.writeByte((byte) (jsEnabled ? 0x01 : 0x00));\ndest.writeByte((byte) (isPortrait ? 0x01 : 0x00));\ndest.writeByte((byte) (isLandscape ? 0x01 : 0x00));\n+ dest.writeByte((byte) (isLocalInApp ? 0x01 : 0x00));\ndest.writeString(landscapeImageUrl);\ndest.writeString(_landscapeImageCacheKey);\ndest.writeLong(timeToLive);\n@@ -391,6 +395,10 @@ public class CTInAppNotification implements Parcelable {\nreturn error;\n}\n+ public boolean isLocalInApp() {\n+ return isLocalInApp;\n+ }\n+\nbyte[] getGifByteArray(CTInAppNotificationMedia inAppMedia) {\nreturn GifCache.getByteArray(inAppMedia.getCacheKey());\n}\n@@ -584,6 +592,7 @@ public class CTInAppNotification implements Parcelable {\nthis.backgroundColor = Constants.WHITE;\nthis.isPortrait = true;//\nthis.isLandscape = true;//\n+ this.isLocalInApp = true;\nthis.timeToLive = System.currentTimeMillis() + 2 * Constants.ONE_DAY_IN_MILLIS;\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/NavigateToAndroidSettingsForNotifications.kt",
"diff": "+package com.clevertap.android.sdk.inapp\n+\n+import android.content.Context\n+import android.content.Intent\n+\n+object NavigateToAndroidSettingsForNotifications {\n+ fun show(context: Context) {\n+ val intent = Intent()\n+ intent.action = \"android.settings.APP_NOTIFICATION_SETTINGS\"\n+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)\n+\n+ //for Android 5-7\n+ intent.putExtra(\"app_package\", context.getPackageName())\n+ intent.putExtra(\"app_uid\", context.getApplicationInfo().uid)\n+\n+ // for Android 8 and above\n+ intent.putExtra(\"android.provider.extra.APP_PACKAGE\", context.getPackageName())\n+ context.startActivity(intent)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/res/values/strings.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<resources>\n+\n+ <string name=\"permission_not_available_title\">Permission Not Available</string>\n+ <string name=\"permission_not_available_message\">You have previously denied notification permission. Please go to settings to enable notifications.</string>\n+ <string name=\"permission_not_available_open_settings_option\">Settings</string>\n+\n+ <string name=\"notification_permission_name_for_title\">Notifications</string>\n+ <string name=\"notification_permission_settings_message\">Notifications</string>\n+</resources>\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-2127)-Add alert dialog for opt-in nudge if permission is denied |
116,620 | 12.09.2022 12:47:20 | -19,080 | 9b9ecb848e0b0b5116e5d75b14b0c496ec86336b | upgrading exoplayer to 2.17.1 | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -88,9 +88,9 @@ apply plugin: 'com.google.gms.google-services'\nInterstitial InApp Notification templates support Audio and Video with the help of ExoPlayer. To enable Audio/Video in your Interstitial InApp Notifications, add the following dependencies in your `build.gradle` file :\n```groovy\n- implementation \"com.google.android.exoplayer:exoplayer:2.15.1\"\n- implementation \"com.google.android.exoplayer:exoplayer-hls:2.15.1\"\n- implementation \"com.google.android.exoplayer:exoplayer-ui:2.15.1\"\n+ implementation \"com.google.android.exoplayer:exoplayer:2.17.1\"\n+ implementation \"com.google.android.exoplayer:exoplayer-hls:2.17.1\"\n+ implementation \"com.google.android.exoplayer:exoplayer-ui:2.17.1\"\n```\nOnce you've updated your module `build.gradle` file, make sure you have specified `mavenCentral()` and `google()` as a repositories in your project `build.gradle` and then sync your project in File -> Sync Project with Gradle Files.\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ControllerManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ControllerManager.java",
"diff": "@@ -145,6 +145,7 @@ public class ControllerManager {\ncallbackManager._notifyInboxInitialized();\nreturn;\n}\n+ Logger.v(\"ControllerManager|_initializeInbox: support for video player = \"+Utils.haveVideoPlayerSupport);\nif (deviceInfo.getDeviceID() != null) {\nsetCTInboxController(new CTInboxController(config, deviceInfo.getDeviceID(),\nbaseDatabaseManager.loadDBAdapter(context),\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "@@ -613,9 +613,9 @@ public final class Utils {\nboolean exoPlayerPresent = false;\nClass className = null;\ntry {\n- className = Class.forName(\"com.google.android.exoplayer2.SimpleExoPlayer\");\n+ className = Class.forName(\"com.google.android.exoplayer2.ExoPlayer\");\nclassName = Class.forName(\"com.google.android.exoplayer2.source.hls.HlsMediaSource\");\n- className = Class.forName(\"com.google.android.exoplayer2.ui.PlayerView\");\n+ className = Class.forName(\"com.google.android.exoplayer2.ui.StyledPlayerView\");\nLogger.d(\"ExoPlayer is present\");\nexoPlayerPresent = true;\n} catch (Throwable t) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/customviews/MediaPlayerRecyclerView.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/customviews/MediaPlayerRecyclerView.java",
"diff": "package com.clevertap.android.sdk.customviews;\n-\nimport android.content.Context;\nimport android.content.res.Configuration;\nimport android.graphics.Color;\n@@ -18,26 +17,26 @@ import androidx.recyclerview.widget.RecyclerView;\nimport com.clevertap.android.sdk.R;\nimport com.clevertap.android.sdk.inbox.CTInboxActivity;\nimport com.clevertap.android.sdk.inbox.CTInboxBaseMessageViewHolder;\n+import com.google.android.exoplayer2.ExoPlayer;\nimport com.google.android.exoplayer2.Player;\n-import com.google.android.exoplayer2.SimpleExoPlayer;\nimport com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;\nimport com.google.android.exoplayer2.trackselection.DefaultTrackSelector;\nimport com.google.android.exoplayer2.trackselection.ExoTrackSelection;\nimport com.google.android.exoplayer2.trackselection.TrackSelector;\nimport com.google.android.exoplayer2.ui.AspectRatioFrameLayout;\n-import com.google.android.exoplayer2.ui.PlayerView;\n+import com.google.android.exoplayer2.ui.StyledPlayerView;\n@RestrictTo(Scope.LIBRARY)\npublic class MediaPlayerRecyclerView extends RecyclerView {\n- SimpleExoPlayer player;\n+ ExoPlayer player;\nprivate Context appContext;\nprivate CTInboxBaseMessageViewHolder playingHolder;\n//surface view for playing video\n- private PlayerView videoSurfaceView;\n+ private StyledPlayerView videoSurfaceView;\n/**\n* {@inheritDoc}\n@@ -125,6 +124,7 @@ public class MediaPlayerRecyclerView extends RecyclerView {\nvideoSurfaceView = null;\n}\n+ @SuppressWarnings(\"unused\")\npublic void removePlayer() {\nif (videoSurfaceView != null) {\nremoveVideoView();\n@@ -172,7 +172,7 @@ public class MediaPlayerRecyclerView extends RecyclerView {\nprivate void initialize(Context context) {\nappContext = context.getApplicationContext();\n- videoSurfaceView = new PlayerView(appContext);\n+ videoSurfaceView = new StyledPlayerView(appContext);\nvideoSurfaceView.setBackgroundColor(Color.TRANSPARENT);\nif (CTInboxActivity.orientation == Configuration.ORIENTATION_LANDSCAPE) {\nvideoSurfaceView.setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_FILL);\n@@ -188,7 +188,7 @@ public class MediaPlayerRecyclerView extends RecyclerView {\nTrackSelector trackSelector =\nnew DefaultTrackSelector(appContext, videoTrackSelectionFactory);\n- player = new SimpleExoPlayer.Builder(context).setTrackSelector(trackSelector).build();\n+ player = new ExoPlayer.Builder(context).setTrackSelector(trackSelector).build();\nplayer.setVolume(0f); // start off muted\nvideoSurfaceView.setUseController(true);\nvideoSurfaceView.setControllerAutoShow(false);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNativeInterstitialFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNativeInterstitialFragment.java",
"diff": "package com.clevertap.android.sdk.inapp;\n-import static com.google.android.exoplayer2.ui.PlayerView.SHOW_BUFFERING_WHEN_PLAYING;\nimport android.annotation.SuppressLint;\n+import android.app.Activity;\nimport android.app.Dialog;\n+import android.content.Context;\nimport android.content.res.Configuration;\nimport android.graphics.Bitmap;\nimport android.graphics.Color;\nimport android.graphics.drawable.ColorDrawable;\nimport android.graphics.drawable.Drawable;\n-import android.net.Uri;\nimport android.os.Build;\nimport android.os.Bundle;\nimport android.util.TypedValue;\n@@ -24,6 +24,7 @@ import android.widget.ImageView;\nimport android.widget.LinearLayout;\nimport android.widget.RelativeLayout;\nimport android.widget.TextView;\n+\nimport androidx.annotation.NonNull;\nimport androidx.annotation.Nullable;\nimport androidx.annotation.RequiresApi;\n@@ -32,18 +33,20 @@ import androidx.core.content.res.ResourcesCompat;\nimport com.clevertap.android.sdk.R;\nimport com.clevertap.android.sdk.customviews.CloseImageView;\nimport com.clevertap.android.sdk.gif.GifImageView;\n+import com.google.android.exoplayer2.ExoPlayer;\n+import com.google.android.exoplayer2.MediaItem;\nimport com.google.android.exoplayer2.Player;\n-import com.google.android.exoplayer2.SimpleExoPlayer;\nimport com.google.android.exoplayer2.source.hls.HlsMediaSource;\nimport com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;\nimport com.google.android.exoplayer2.trackselection.DefaultTrackSelector;\nimport com.google.android.exoplayer2.trackselection.ExoTrackSelection;\nimport com.google.android.exoplayer2.trackselection.TrackSelector;\n-import com.google.android.exoplayer2.ui.PlayerView;\n+import com.google.android.exoplayer2.ui.StyledPlayerView;\nimport com.google.android.exoplayer2.upstream.BandwidthMeter;\nimport com.google.android.exoplayer2.upstream.DataSource;\nimport com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;\n-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;\n+import com.google.android.exoplayer2.upstream.DefaultDataSource;\n+import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;\nimport com.google.android.exoplayer2.upstream.TransferListener;\nimport com.google.android.exoplayer2.util.Util;\nimport java.util.ArrayList;\n@@ -60,9 +63,9 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nprivate GifImageView gifImageView;\n- private SimpleExoPlayer player;\n+ private ExoPlayer player;\n- private PlayerView playerView;\n+ private StyledPlayerView playerView;\nprivate RelativeLayout relativeLayout;\n@@ -73,15 +76,15 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\n@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)\n@Nullable\n@Override\n- public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,\n- Bundle savedInstanceState) {\n+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {\nArrayList<Button> inAppButtons = new ArrayList<>();\nView inAppView;\nif (inAppNotification.isTablet() && isTablet()) {\ninAppView = inflater.inflate(R.layout.tab_inapp_interstitial, container, false);\n- } else {\n+ }\n+ else {\ninAppView = inflater.inflate(R.layout.inapp_interstitial, container, false);\n}\n@@ -213,16 +216,13 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nfl.setBackground(new ColorDrawable(0xBB000000));\n- closeImageView.setOnClickListener(new View.OnClickListener() {\n- @SuppressWarnings(\"ConstantConditions\")\n- @Override\n- public void onClick(View v) {\n+ closeImageView.setOnClickListener(v -> {\ndidDismiss(null);\nif (gifImageView != null) {\ngifImageView.clear();\n}\n- getActivity().finish();\n- }\n+ Activity activity = getActivity();\n+ if(activity!=null) activity.finish();\n});\nif (!inAppNotification.isHideCloseButton()) {\n@@ -247,8 +247,7 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\npublic void onResume() {\nsuper.onResume();\nif (!inAppNotification.getMediaList().isEmpty()) {\n- if (player == null && (inAppNotification.getMediaList().get(0).isVideo() || inAppNotification\n- .getMediaList().get(0).isAudio())) {\n+ if (player == null && (inAppNotification.getMediaList().get(0).isVideo() || inAppNotification.getMediaList().get(0).isAudio())) {\nprepareMedia();\nplayMedia();\n}\n@@ -339,8 +338,7 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\n((ViewGroup) playerView.getParent()).removeView(playerView);\n((ViewGroup) fullScreenIcon.getParent()).removeView(fullScreenIcon);\n((ViewGroup) videoFrameLayout.getParent()).removeView(videoFrameLayout);\n- fullScreenDialog.addContentView(playerView,\n- new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));\n+ fullScreenDialog.addContentView(playerView, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));\nexoPlayerFullscreen = true;\nfullScreenDialog.show();\n}\n@@ -356,19 +354,16 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nvideoFrameLayout = relativeLayout.findViewById(R.id.video_frame);\nvideoFrameLayout.setVisibility(View.VISIBLE);\n- playerView = new PlayerView(this.context);\n+ playerView = new StyledPlayerView(this.context);\nfullScreenIcon = new ImageView(this.context);\nfullScreenIcon.setImageDrawable(\nResourcesCompat.getDrawable(this.context.getResources(), R.drawable.ct_ic_fullscreen_expand, null));\n- fullScreenIcon.setOnClickListener(new View.OnClickListener() {\n- @Override\n- public void onClick(View v) {\n+ fullScreenIcon.setOnClickListener(v -> {\nif (!exoPlayerFullscreen) {\nopenFullscreenDialog();\n} else {\ncloseFullscreenDialog();\n}\n- }\n});\nif (inAppNotification.isTablet() && isTablet()) {\n@@ -410,7 +405,7 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nlayoutParams.setMargins(0, iconTop, iconRight, 0);\nfullScreenIcon.setLayoutParams(layoutParams);\n}\n- playerView.setShowBuffering(SHOW_BUFFERING_WHEN_PLAYING);\n+ playerView.setShowBuffering(StyledPlayerView.SHOW_BUFFERING_WHEN_PLAYING);\nplayerView.setUseArtwork(true);\nplayerView.setControllerAutoShow(false);\nvideoFrameLayout.addView(playerView);\n@@ -424,16 +419,19 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nTrackSelector trackSelector = new DefaultTrackSelector(this.context,\nvideoTrackSelectionFactory);\n// 2. Create the player\n- player = new SimpleExoPlayer.Builder(this.context).setTrackSelector(trackSelector).build();\n+ player = new ExoPlayer.Builder(this.context).setTrackSelector(trackSelector).build();\n// 3. Produces DataSource instances through which media data is loaded.\n- DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(this.context,\n- Util.getUserAgent(this.context, this.context.getApplicationContext().getPackageName()),\n- (TransferListener) bandwidthMeter);\n- HlsMediaSource hlsMediaSource;\n- hlsMediaSource = new HlsMediaSource.Factory(dataSourceFactory)\n- .createMediaSource(Uri.parse(inAppNotification.getMediaList().get(0).getMediaUrl()));\n+ Context ctx = this.context;\n+ String userAgent = Util.getUserAgent(ctx,ctx.getPackageName());\n+ String url = inAppNotification.getMediaList().get(0).getMediaUrl();\n+ TransferListener listener = bandwidthMeter.getTransferListener();\n+ DefaultHttpDataSource.Factory dsf = new DefaultHttpDataSource.Factory().setUserAgent(userAgent).setTransferListener(listener);\n+ DataSource.Factory dataSourceFactory = new DefaultDataSource.Factory(ctx,dsf);\n+ MediaItem mediaItem = MediaItem.fromUri(url);\n+ HlsMediaSource hlsMediaSource = new HlsMediaSource.Factory(dataSourceFactory).createMediaSource(mediaItem);\n+ player.setMediaSource(hlsMediaSource);\n// 4. Prepare the player with the source.\n- player.prepare(hlsMediaSource);\n+ player.prepare();\nplayer.setRepeatMode(Player.REPEAT_MODE_ONE);\nplayer.seekTo(mediaPosition);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -53,6 +53,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n@Override\npublic void run() {\n+ Logger.v(\"InAppController|run : support for video player = \"+videoSupport);\nfinal CTInAppNotification inAppNotification = new CTInAppNotification()\n.initWithJSON(jsonObject, videoSupport);\nif (inAppNotification.getError() != null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxBaseMessageViewHolder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxBaseMessageViewHolder.java",
"diff": "package com.clevertap.android.sdk.inbox;\n-import static com.google.android.exoplayer2.ui.PlayerView.SHOW_BUFFERING_NEVER;\n-\nimport android.annotation.SuppressLint;\nimport android.content.Context;\nimport android.content.res.Configuration;\nimport android.content.res.Resources;\nimport android.graphics.Color;\n-import android.net.Uri;\nimport android.util.DisplayMetrics;\nimport android.util.TypedValue;\nimport android.view.Gravity;\n@@ -18,18 +15,22 @@ import android.widget.FrameLayout;\nimport android.widget.ImageView;\nimport android.widget.LinearLayout;\nimport android.widget.RelativeLayout;\n+\nimport androidx.annotation.NonNull;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport androidx.core.content.res.ResourcesCompat;\nimport androidx.recyclerview.widget.RecyclerView;\n+\nimport com.clevertap.android.sdk.R;\n-import com.google.android.exoplayer2.SimpleExoPlayer;\n+import com.google.android.exoplayer2.ExoPlayer;\n+import com.google.android.exoplayer2.MediaItem;\nimport com.google.android.exoplayer2.source.hls.HlsMediaSource;\n-import com.google.android.exoplayer2.ui.PlayerView;\n+import com.google.android.exoplayer2.ui.StyledPlayerView;\nimport com.google.android.exoplayer2.upstream.DataSource;\nimport com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;\n-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;\n+import com.google.android.exoplayer2.upstream.DefaultDataSource;\n+import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;\nimport com.google.android.exoplayer2.util.Util;\nimport java.lang.ref.WeakReference;\nimport java.text.SimpleDateFormat;\n@@ -66,7 +67,7 @@ public class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nsuper(itemView);\n}\n- public boolean addMediaPlayer(PlayerView videoSurfaceView) {\n+ public boolean addMediaPlayer(StyledPlayerView videoSurfaceView) {\nif (!requiresMediaPlayer) {\nreturn false;\n}\n@@ -105,7 +106,7 @@ public class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nprogressBarFrameLayout.setVisibility(View.VISIBLE);\n}\n- final SimpleExoPlayer player = (SimpleExoPlayer) videoSurfaceView.getPlayer();\n+ final ExoPlayer player =(ExoPlayer) videoSurfaceView.getPlayer();\nfloat currentVolume = 0;\nif (player != null) {\ncurrentVolume = player.getVolume();\n@@ -129,41 +130,44 @@ public class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nlayoutParams.setMargins(0, iconTop, iconRight, 0);\nlayoutParams.gravity = Gravity.END;\nmuteIcon.setLayoutParams(layoutParams);\n- muteIcon.setOnClickListener(new View.OnClickListener() {\n- @Override\n- public void onClick(View v) {\n- float currentVolume = 0;\n+ muteIcon.setOnClickListener(v -> {\n+ float currentVolume1 = 0;\nif (player != null) {\n- currentVolume = player.getVolume();\n+ currentVolume1 = player.getVolume();\n}\n- if (currentVolume > 0) {\n+ if (currentVolume1 > 0) {\nplayer.setVolume(0f);\nmuteIcon.setImageDrawable(\nResourcesCompat.getDrawable(context.getResources(), R.drawable.ct_volume_off, null));\n- } else if (currentVolume == 0) {\n+ } else if (currentVolume1 == 0) {\nif (player != null) {\nplayer.setVolume(1);\n}\nmuteIcon.setImageDrawable(\nResourcesCompat.getDrawable(context.getResources(), R.drawable.ct_volume_on, null));\n}\n- }\n});\nframeLayout.addView(muteIcon);\n}\nvideoSurfaceView.requestFocus();\n- videoSurfaceView.setShowBuffering(SHOW_BUFFERING_NEVER);\n+ videoSurfaceView.setShowBuffering(StyledPlayerView.SHOW_BUFFERING_NEVER);\nDefaultBandwidthMeter defaultBandwidthMeter = new DefaultBandwidthMeter.Builder(context).build();\n- DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(context,\n- Util.getUserAgent(context, context.getPackageName()), defaultBandwidthMeter);\n+\n+ Context ctx = this.context;\n+ String userAgent = Util.getUserAgent(ctx,ctx.getPackageName());\nString uriString = firstContentItem.getMedia();\n+ MediaItem mediaItem = MediaItem.fromUri(uriString);\n+ DefaultHttpDataSource.Factory dsf = new DefaultHttpDataSource.Factory().setUserAgent(userAgent).setTransferListener(defaultBandwidthMeter);\n+ DataSource.Factory dataSourceFactory = new DefaultDataSource.Factory(ctx,dsf);\n+\n+\nif (uriString != null) {\n- HlsMediaSource hlsMediaSource = new HlsMediaSource.Factory(dataSourceFactory)\n- .createMediaSource(Uri.parse(uriString));\n+ HlsMediaSource hlsMediaSource = new HlsMediaSource.Factory(dataSourceFactory).createMediaSource(mediaItem);\n// Prepare the player with the source.\nif (player != null) {\n- player.prepare(hlsMediaSource);\n+ player.setMediaSource(hlsMediaSource);\n+ player.prepare();\nif (firstContentItem.mediaIsAudio()) {\nvideoSurfaceView.showController();//show controller for audio as it is not autoplay\nplayer.setPlayWhenReady(false);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxListViewFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxListViewFragment.java",
"diff": "@@ -122,6 +122,7 @@ public class CTInboxListViewFragment extends Fragment {\nfinal LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());\ninboxMessageAdapter= new CTInboxMessageAdapter(inboxMessages, this);\n+ Logger.v(\"CTInboxListViewFragment|onCreateView : support for video player = \"+haveVideoPlayerSupport);\nif (haveVideoPlayerSupport) {\nmediaRecyclerView = new MediaPlayerRecyclerView(getActivity());\nsetMediaRecyclerView(mediaRecyclerView);\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/build.gradle",
"new_path": "sample/build.gradle",
"diff": "@@ -93,9 +93,9 @@ dependencies {\nimplementation 'com.google.firebase:firebase-messaging:21.0.0' //Needed for FCM\nimplementation 'com.google.android.gms:play-services-ads:20.4.0' //Needed to use Google Ad Ids\n//ExoPlayer Libraries for Audio/Video InApp Notifications\n- implementation 'com.google.android.exoplayer:exoplayer:2.15.1'\n- implementation 'com.google.android.exoplayer:exoplayer-hls:2.15.1'\n- implementation 'com.google.android.exoplayer:exoplayer-ui:2.15.1'\n+ implementation 'com.google.android.exoplayer:exoplayer:2.17.1'\n+ implementation 'com.google.android.exoplayer:exoplayer-hls:2.17.1'\n+ implementation 'com.google.android.exoplayer:exoplayer-ui:2.17.1'\nimplementation 'com.github.bumptech.glide:glide:4.12.0'\n//Mandatory if you are using Notification Inbox\n"
},
{
"change_type": "MODIFY",
"old_path": "versions.properties",
"new_path": "versions.properties",
"diff": "@@ -329,7 +329,7 @@ version.com.clevertap.android..push-templates=1.0.4\nversion.com.github.bumptech.glide..glide=4.12.0\n## # available=4.12.0\n-version.com.google.android.exoplayer..exoplayer=2.15.1\n+version.com.google.android.exoplayer..exoplayer=2.17.1\n## # available=2.11.6\n## # available=2.11.7\n## # available=2.11.8\n@@ -346,7 +346,7 @@ version.com.google.android.exoplayer..exoplayer=2.15.1\n## # available=2.14.2\n## # available=2.15.0\n## # available=2.15.1\n-version.com.google.android.exoplayer..exoplayer-hls=2.15.1\n+version.com.google.android.exoplayer..exoplayer-hls=2.17.1\n## # available=2.11.6\n## # available=2.11.7\n## # available=2.11.8\n@@ -363,7 +363,7 @@ version.com.google.android.exoplayer..exoplayer-hls=2.15.1\n## # available=2.14.2\n## # available=2.15.0\n## # available=2.15.1\n-version.com.google.android.exoplayer..exoplayer-ui=2.15.1\n+version.com.google.android.exoplayer..exoplayer-ui=2.17.1\n## # available=2.11.6\n## # available=2.11.7\n## # available=2.11.8\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2155] upgrading exoplayer to 2.17.1 |
116,620 | 12.09.2022 12:58:10 | -19,080 | 3189cab9e2ad70ea3517b0f41e2bc5f9cce1fda1 | added space | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "@@ -616,6 +616,7 @@ public final class Utils {\nclassName = Class.forName(\"com.google.android.exoplayer2.ExoPlayer\");\nclassName = Class.forName(\"com.google.android.exoplayer2.source.hls.HlsMediaSource\");\nclassName = Class.forName(\"com.google.android.exoplayer2.ui.StyledPlayerView\");\n+\nLogger.d(\"ExoPlayer is present\");\nexoPlayerPresent = true;\n} catch (Throwable t) {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2155] added space |
116,620 | 12.09.2022 17:46:08 | -19,080 | 936273af418202c437a29244efd0e91372210af9 | release documentation 2 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/consumer-rules.pro",
"new_path": "clevertap-core/consumer-rules.pro",
"diff": "-keep class com.clevertap.android.hms.HmsPushProvider{*;}\n-keep class com.google.firebase.messaging.FirebaseMessagingService{*;}\n-keep class com.clevertap.android.sdk.pushnotification.CTNotificationIntentService{*;}\n--keep class com.google.android.exoplayer2.SimpleExoPlayer{*;}\n+-keep class com.google.android.exoplayer2.ExoPlayer{*;}\n-keep class com.google.android.exoplayer2.source.hls.HlsMediaSource{*;}\n--keep class com.google.android.exoplayer2.ui.PlayerView{*;}\n+-keep class com.google.android.exoplayer2.ui.StyledPlayerView{*;}\n-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient{*;}\n-keep class com.google.android.gms.common.GooglePlayServicesUtil{*;}\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTCORECHANGELOG.md",
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n### Version 4.6.1 (September 19, 2022)\n-* Support for exoplayer `v2.17.1` . Note : this upgrade will result in minor ui changes for interstitial in app and inbox notifications that uses exoplayer\n+* Support for exoplayer [`v2.17.1`](https://github.com/google/ExoPlayer/releases/tag/r2.17.1) . Note : this upgrade will result in minor ui changes for interstitial in app and inbox notifications that uses exoplayer\n### Version 4.6.1 (September 6, 2022)\n* App inbox blue dot fix : This release fixes the bug where new entries in inbox would continue showing blue dot when scrolled up and down . expected behaviour is to stop showing blue dot after 2 seconds.\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTCORECHANGELOG.md",
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n### Version 4.6.1 (September 19, 2022)\n-* Support for exoplayer `v2.17.1` . Note : this upgrade will result in minor ui changes for interstitial in app and inbox notifications that uses exoplayer\n+* Support for exoplayer [`v2.17.1`](https://github.com/google/ExoPlayer/releases/tag/r2.17.1) . Note : this upgrade will result in minor ui changes for interstitial in app and inbox notifications that uses exoplayer\n### Version 4.6.1 (September 6, 2022)\n* App inbox blue dot fix : This release fixes the bug where new entries in inbox would continue showing blue dot when scrolled up and down . expected behaviour is to stop showing blue dot after 2 seconds.\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2155] release documentation 2 |
116,616 | 12.09.2022 19:07:54 | -19,080 | 40be5c7958c521a3220fee14fac4303126dca800 | task(SDK-2154)-Add callbacks for soft/hard dialogs | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"diff": "@@ -28,6 +28,8 @@ public abstract class BaseCallbackManager {\npublic abstract InAppNotificationListener getInAppNotificationListener();\n+ public abstract PushPermissionNotificationResponseListener getPushPermissionNotificationResponseListener();\n+\npublic abstract CTInboxListener getInboxListener();\npublic abstract CTProductConfigListener getProductConfigListener();\n@@ -60,6 +62,8 @@ public abstract class BaseCallbackManager {\npublic abstract void setInAppNotificationListener(InAppNotificationListener inAppNotificationListener);\n+ public abstract void setPushPermissionNotificationResponseListener(PushPermissionNotificationResponseListener pushPermissionNotificationResponseListener);\n+\npublic abstract void setInboxListener(CTInboxListener inboxListener);\npublic abstract void setProductConfigListener(\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"diff": "@@ -28,6 +28,8 @@ public class CallbackManager extends BaseCallbackManager {\nprivate InAppNotificationListener inAppNotificationListener;\n+ private PushPermissionNotificationResponseListener pushPermissionNotificationResponseListener;\n+\nprivate CTInboxListener inboxListener;\nprivate final CleverTapInstanceConfig config;\n@@ -131,11 +133,21 @@ public class CallbackManager extends BaseCallbackManager {\nreturn inAppNotificationListener;\n}\n+ @Override\n+ public PushPermissionNotificationResponseListener getPushPermissionNotificationResponseListener() {\n+ return pushPermissionNotificationResponseListener;\n+ }\n+\n@Override\npublic void setInAppNotificationListener(final InAppNotificationListener inAppNotificationListener) {\nthis.inAppNotificationListener = inAppNotificationListener;\n}\n+ @Override\n+ public void setPushPermissionNotificationResponseListener(PushPermissionNotificationResponseListener pushPermissionNotificationResponseListener) {\n+ this.pushPermissionNotificationResponseListener = pushPermissionNotificationResponseListener;\n+ }\n+\n@Override\npublic CTInboxListener getInboxListener() {\nreturn inboxListener;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1597,8 +1597,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn coreState.getLocalDataStore().getEventHistory(context);\n}\n- //DeepLink\n-\n/**\n* Returns the InAppNotificationListener object\n*\n@@ -1619,6 +1617,26 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getCallbackManager().setInAppNotificationListener(inAppNotificationListener);\n}\n+ /**\n+ * Returns the PushPermissionNotificationResponseListener object\n+ *\n+ * @return An {@link PushPermissionNotificationResponseListener} object\n+ */\n+ @SuppressWarnings({\"unused\", \"WeakerAccess\"})\n+ public PushPermissionNotificationResponseListener getPushPermissionNotificationResponseListener() {\n+ return coreState.getCallbackManager().getPushPermissionNotificationResponseListener();\n+ }\n+\n+ /**\n+ * This method sets the PushPermissionNotificationResponseListener\n+ *\n+ * @param pushPermissionNotificationResponseListener An {@link PushPermissionNotificationResponseListener} object\n+ */\n+ @SuppressWarnings({\"unused\"})\n+ public void setPushPermissionNotificationResponseListener(PushPermissionNotificationResponseListener pushPermissionNotificationResponseListener) {\n+ coreState.getCallbackManager().setPushPermissionNotificationResponseListener(pushPermissionNotificationResponseListener);\n+ }\n+\n/**\n* Returns the count of all inbox messages for the user\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -46,12 +46,16 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nprivate WeakReference<InAppListener> listenerWeakReference;\n- private static boolean neverAskAgainClicked;\n+ private WeakReference<PermissionCallback> permissionCallbackWeakReference;\nprivate static final int PERMISSION_REQUEST_CODE = 2;\nprivate static final String ANDROID_PERMISSION_STRING = \"android.permission.POST_NOTIFICATIONS\";\n+ public interface PermissionCallback {\n+ void onAccept();\n+ void onReject();\n+ }\npublic void onCreate(Bundle savedInstanceState) {\nsuper.onCreate(savedInstanceState);\n@@ -70,6 +74,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nconfig = configBundle.getParcelable(\"config\");\n}\nsetListener(CleverTapAPI.instanceWithConfig(this, config).getCoreState().getInAppController());\n+\n+ setPermissionCallback(CleverTapAPI.instanceWithConfig(this, config).getCoreState().getInAppController());\n} catch (Throwable t) {\nLogger.v(\"Cannot find a valid notification bundle to show!\", t);\nfinish();\n@@ -171,13 +177,14 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\npublic void requestPermission() {\n- neverAskAgainClicked = !ActivityCompat.shouldShowRequestPermissionRationale(\n+ boolean neverAskAgainClicked = !ActivityCompat.shouldShowRequestPermissionRationale(\nInAppNotificationActivity.this, ANDROID_PERMISSION_STRING);\nif (neverAskAgainClicked) {\nActivityCompat.requestPermissions(this,\nnew String[]{ANDROID_PERMISSION_STRING}, PERMISSION_REQUEST_CODE);\n}else{\n+ permissionCallbackWeakReference.get().onReject();\nshowFallbackAlertDialog();\n}\n}\n@@ -189,11 +196,9 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nboolean granted = grantResults.length > 0 && grantResults[0] ==\nPackageManager.PERMISSION_GRANTED;\nif (granted) {\n-// callback.onAccept();//Give callback when permission is granted\n- Toast.makeText(InAppNotificationActivity.this,\n- \"Notification Permission is granted\", Toast.LENGTH_SHORT).show();\n+ permissionCallbackWeakReference.get().onAccept();\n}else {\n-// callback.onReject(shouldShowSettings());//Give callback when permission is rejected\n+ permissionCallbackWeakReference.get().onReject();\n}\ndidDismiss(null);\n}\n@@ -260,6 +265,10 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nlistenerWeakReference = new WeakReference<>(listener);\n}\n+ public void setPermissionCallback(PermissionCallback callback){\n+ permissionCallbackWeakReference = new WeakReference<>(callback);\n+ }\n+\nprivate CTInAppBaseFullFragment createContentFragment() {\nCTInAppType type = inAppNotification.getInAppType();\nCTInAppBaseFullFragment viewFragment = null;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationListener.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationListener.java",
"diff": "package com.clevertap.android.sdk;\nimport androidx.annotation.Nullable;\n+\n+import com.clevertap.android.sdk.inapp.CTInAppNotification;\n+\nimport java.util.Map;\n/**\n@@ -19,6 +22,14 @@ public interface InAppNotificationListener {\n*/\nboolean beforeShow(Map<String, Object> extras);\n+ /**\n+ * This is called when an in-app notification is rendered.\n+ *\n+ * @param ctInAppNotification The CTInAppNotification object for this notification.\n+ * {@link CTInAppNotification} object\n+ */\n+ void onShow(CTInAppNotification ctInAppNotification);\n+\n/**\n* When an in-app notification is dismissed (either by the close button, or a call to action),\n* this method will be called.\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushPermissionNotificationResponseListener.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+/**\n+ * A listener for notification permission.\n+ */\n+public interface PushPermissionNotificationResponseListener {\n+\n+ /**\n+ * This is called when user either grants allow/dismiss permission for notifications for Android 13+\n+ *\n+ * @param accepted This boolean will return true if notification permission is granted and will retrun\n+ * false if permission is denied.\n+ */\n+ void response(boolean accepted);//Change method name here, sounds ambiguous\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -19,6 +19,7 @@ import com.clevertap.android.sdk.InAppNotificationActivity;\nimport com.clevertap.android.sdk.InAppNotificationListener;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.ManifestInfo;\n+import com.clevertap.android.sdk.PushPermissionNotificationResponseListener;\nimport com.clevertap.android.sdk.StorageHelper;\nimport com.clevertap.android.sdk.Utils;\nimport com.clevertap.android.sdk.task.CTExecutorFactory;\n@@ -35,7 +36,25 @@ import java.util.concurrent.Callable;\nimport org.json.JSONArray;\nimport org.json.JSONObject;\n-public class InAppController implements CTInAppNotification.CTInAppNotificationListener, InAppListener {\n+public class InAppController implements CTInAppNotification.CTInAppNotificationListener, InAppListener, InAppNotificationActivity.PermissionCallback {\n+\n+ @Override\n+ public void onAccept() {\n+ Logger.i(\"OnAccept called\");\n+ final PushPermissionNotificationResponseListener listener = callbackManager.getPushPermissionNotificationResponseListener();\n+ if (listener != null){\n+ listener.response(true);\n+ }\n+ }\n+\n+ @Override\n+ public void onReject() {\n+ Logger.i(\"onReject Called\");\n+ final PushPermissionNotificationResponseListener listener = callbackManager.getPushPermissionNotificationResponseListener();\n+ if (listener != null){\n+ listener.response(false);\n+ }\n+ }\n//InApp\nprivate final class NotificationPrepareRunnable implements Runnable {\n@@ -251,6 +270,16 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n@Override\npublic void inAppNotificationDidShow(CTInAppNotification inAppNotification, Bundle formData) {\nanalyticsManager.pushInAppNotificationStateEvent(false, inAppNotification, formData);\n+\n+ //Fire onShow() callback when InApp is shown.\n+ try {\n+ final InAppNotificationListener listener = callbackManager.getInAppNotificationListener();\n+ if (listener != null) {\n+ listener.onShow(inAppNotification);\n+ }\n+ } catch (Throwable t) {\n+ Logger.v(config.getAccountId(), \"Failed to call the in-app notification listener\", t);\n+ }\n}\n//InApp\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/HomeScreenActivity.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/HomeScreenActivity.kt",
"diff": "@@ -10,13 +10,11 @@ import android.os.Bundle\nimport android.util.Log\nimport androidx.appcompat.app.AppCompatActivity\nimport androidx.fragment.app.commitNow\n-import com.clevertap.android.sdk.CTFeatureFlagsListener\n-import com.clevertap.android.sdk.CTInboxListener\n-import com.clevertap.android.sdk.CleverTapAPI\n+import com.clevertap.android.sdk.*\nimport com.clevertap.android.sdk.CleverTapAPI.LogLevel.VERBOSE\n-import com.clevertap.android.sdk.SyncListener\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit\n+import com.clevertap.android.sdk.inapp.CTInAppNotification\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener\nimport com.clevertap.demo.ui.main.HomeScreenFragment\n@@ -31,7 +29,7 @@ import org.json.JSONObject\nprivate const val TAG = \"HomeScreenActivity\"\nclass HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitListener, CTProductConfigListener,\n- CTFeatureFlagsListener, SyncListener {\n+ CTFeatureFlagsListener, SyncListener, InAppNotificationListener, PushPermissionNotificationResponseListener {\nvar cleverTapDefaultInstance: CleverTapAPI? = null\n@@ -142,6 +140,11 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\nsetCTFeatureFlagsListener(this@HomeScreenActivity)\n//Initialize the inbox and wait for callbacks on overridden methods\ninitializeInbox()\n+\n+ inAppNotificationListener = this@HomeScreenActivity\n+\n+ pushPermissionNotificationResponseListener = this@HomeScreenActivity\n+\n}\n//With CleverTap Android SDK v3.2.0 you can create additional instances to send data to multiple CleverTap accounts\n@@ -234,4 +237,24 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\n// Show Dialog\nmDialog.show()\n}\n+\n+ override fun beforeShow(extras: MutableMap<String, Any>?): Boolean {\n+ Log.i(TAG, \"InApp---> beforeShow() called\")\n+ return true\n+ }\n+\n+ override fun onShow(ctInAppNotification: CTInAppNotification?) {\n+ Log.i(TAG, \"InApp---> onShow() called\")\n+ }\n+\n+ override fun onDismissed(\n+ extras: MutableMap<String, Any>?,\n+ actionExtras: MutableMap<String, Any>?\n+ ) {\n+ Log.i(TAG, \"InApp---> onDismissed() called\")\n+ }\n+\n+ override fun response(accepted: Boolean) {\n+ Log.i(TAG, \"InApp---> response() called $accepted\")\n+ }\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-2154)-Add callbacks for soft/hard dialogs |
116,616 | 12.09.2022 20:30:04 | -19,080 | 6ec0e4e463e8701e77ffbe6359992e2ccc902350 | chore(SDK-2154)-Refactor InAppController.java | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTLocalInAppSettings.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTLocalInAppSettings.java",
"diff": "@@ -72,7 +72,11 @@ public class CTLocalInAppSettings {\nif (this == o) return true;\nif (o == null || getClass() != o.getClass()) return false;\nCTLocalInAppSettings that = (CTLocalInAppSettings) o;\n- return Objects.equals(inAppAlertType, that.inAppAlertType) && Objects.equals(titleText, that.titleText) && Objects.equals(bodyText, that.bodyText) && Objects.equals(positiveConfirmationBtnText, that.positiveConfirmationBtnText) && Objects.equals(negativeConfirmationBtnText, that.negativeConfirmationBtnText) && Objects.equals(positiveConfirmationBtnColor, that.positiveConfirmationBtnColor);\n+ return Objects.equals(inAppAlertType, that.inAppAlertType) && Objects.equals(titleText, that.titleText)\n+ && Objects.equals(bodyText, that.bodyText) &&\n+ Objects.equals(positiveConfirmationBtnText, that.positiveConfirmationBtnText)\n+ && Objects.equals(negativeConfirmationBtnText, that.negativeConfirmationBtnText)\n+ && Objects.equals(positiveConfirmationBtnColor, that.positiveConfirmationBtnColor);\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -36,25 +36,8 @@ import java.util.concurrent.Callable;\nimport org.json.JSONArray;\nimport org.json.JSONObject;\n-public class InAppController implements CTInAppNotification.CTInAppNotificationListener, InAppListener, InAppNotificationActivity.PermissionCallback {\n-\n- @Override\n- public void onAccept() {\n- Logger.i(\"OnAccept called\");\n- final PushPermissionNotificationResponseListener listener = callbackManager.getPushPermissionNotificationResponseListener();\n- if (listener != null){\n- listener.response(true);\n- }\n- }\n-\n- @Override\n- public void onReject() {\n- Logger.i(\"onReject Called\");\n- final PushPermissionNotificationResponseListener listener = callbackManager.getPushPermissionNotificationResponseListener();\n- if (listener != null){\n- listener.response(false);\n- }\n- }\n+public class InAppController implements CTInAppNotification.CTInAppNotificationListener, InAppListener,\n+ InAppNotificationActivity.PermissionCallback {\n//InApp\nprivate final class NotificationPrepareRunnable implements Runnable {\n@@ -305,6 +288,22 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\ndisplayNotification(inAppNotification);\n}\n+ @Override\n+ public void onAccept() {\n+ final PushPermissionNotificationResponseListener listener = callbackManager.getPushPermissionNotificationResponseListener();\n+ if (listener != null){\n+ listener.response(true);\n+ }\n+ }\n+\n+ @Override\n+ public void onReject() {\n+ final PushPermissionNotificationResponseListener listener = callbackManager.getPushPermissionNotificationResponseListener();\n+ if (listener != null){\n+ listener.response(false);\n+ }\n+ }\n+\npublic void resumeInApps() {\nthis.inAppState = InAppState.RESUMED;\nlogger.verbose(config.getAccountId(), \"InAppState is RESUMED\");\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(SDK-2154)-Refactor InAppController.java |
116,612 | 12.09.2022 20:53:26 | -19,080 | a098c49ea3318e21a49668ff11bd2fe3fc76aa1a | fix(SDK-2160): add subtitle to notification header above android 12 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-pushtemplates/src/main/java/com/clevertap/android/pushtemplates/styles/Style.kt",
"new_path": "clevertap-pushtemplates/src/main/java/com/clevertap/android/pushtemplates/styles/Style.kt",
"diff": "@@ -3,6 +3,7 @@ package com.clevertap.android.pushtemplates.styles\nimport android.app.PendingIntent\nimport android.content.Context\nimport android.graphics.Color\n+import android.os.Build\nimport android.os.Bundle\nimport android.text.Html\nimport android.widget.RemoteViews\n@@ -28,6 +29,11 @@ abstract class Style(private var renderer: TemplateRenderer) {\nif (contentViewBig != null) {\nnotificationBuilder.setCustomBigContentView(contentViewBig)\n}\n+\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {\n+ notificationBuilder.setSubText(renderer.pt_subtitle)\n+ }\n+\nreturn notificationBuilder.setSmallIcon(renderer.smallIcon)\n.setContentTitle(Html.fromHtml(pt_title))\n.setContentIntent(pIntent)\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(SDK-2160): add subtitle to notification header above android 12 |
116,620 | 13.09.2022 11:21:19 | -19,080 | e0d036f9a79131d119bd5b5759bbefdd46fb77de | remove non essential logs | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ControllerManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ControllerManager.java",
"diff": "@@ -145,7 +145,6 @@ public class ControllerManager {\ncallbackManager._notifyInboxInitialized();\nreturn;\n}\n- Logger.v(\"ControllerManager|_initializeInbox: support for video player = \"+Utils.haveVideoPlayerSupport);\nif (deviceInfo.getDeviceID() != null) {\nsetCTInboxController(new CTInboxController(config, deviceInfo.getDeviceID(),\nbaseDatabaseManager.loadDBAdapter(context),\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -53,7 +53,6 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n@Override\npublic void run() {\n- Logger.v(\"InAppController|run : support for video player = \"+videoSupport);\nfinal CTInAppNotification inAppNotification = new CTInAppNotification()\n.initWithJSON(jsonObject, videoSupport);\nif (inAppNotification.getError() != null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxListViewFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxListViewFragment.java",
"diff": "@@ -122,7 +122,6 @@ public class CTInboxListViewFragment extends Fragment {\nfinal LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());\ninboxMessageAdapter= new CTInboxMessageAdapter(inboxMessages, this);\n- Logger.v(\"CTInboxListViewFragment|onCreateView : support for video player = \"+haveVideoPlayerSupport);\nif (haveVideoPlayerSupport) {\nmediaRecyclerView = new MediaPlayerRecyclerView(getActivity());\nsetMediaRecyclerView(mediaRecyclerView);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | remove non essential logs |
116,620 | 13.09.2022 12:37:26 | -19,080 | 75c1a84c3b5f476597ed17d0681fc1bc4e8592ef | update push templates changelog , ct core changelog | [
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG.\n-### September 19, 2022\n-\n+### September 13, 2022\n* [CleverTap Android SDK v4.6.2](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n+* [CleverTap Push Templates SDK v1.0.5](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTPUSHTEMPLATESCHANGELOG.md)\n+\n### September 6, 2022\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -26,7 +26,7 @@ We publish the SDK to `mavenCentral` as an `AAR` file. Just declare it as depend\n```groovy\ndependencies {\n- implementation \"com.clevertap.android:clevertap-android-sdk:4.6.1\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.6.2\"\n}\n```\n@@ -34,7 +34,7 @@ Alternatively, you can download and add the AAR file included in this repo in yo\n```groovy\ndependencies {\n- implementation (name: \"clevertap-android-sdk-4.6.1\", ext: 'aar')\n+ implementation (name: \"clevertap-android-sdk-4.6.2\", ext: 'aar')\n}\n```\n@@ -46,7 +46,7 @@ Add the Firebase Messaging library and Android Support Library v4 as dependencie\n```groovy\ndependencies {\n- implementation \"com.clevertap.android:clevertap-android-sdk:4.6.1\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.6.2\"\nimplementation \"androidx.core:core:1.3.0\"\nimplementation \"com.google.firebase:firebase-messaging:21.0.0\"\nimplementation \"com.google.android.gms:play-services-ads:19.4.0\" // Required only if you enable Google ADID collection in the SDK (turned off by default).\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTCORECHANGELOG.md",
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n-### Version 4.6.1 (September 19, 2022)\n+### Version 4.6.2 (September 13, 2022)\n* Support for exoplayer [`v2.17.1`](https://github.com/google/ExoPlayer/releases/tag/r2.17.1) . Note : this upgrade will result in minor ui changes for interstitial in app and inbox notifications that uses exoplayer\n### Version 4.6.1 (September 6, 2022)\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTGEOFENCE.md",
"new_path": "docs/CTGEOFENCE.md",
"diff": "@@ -17,7 +17,7 @@ Add the following dependencies to the `build.gradle`\n```Groovy\nimplementation \"com.clevertap.android:clevertap-geofence-sdk:1.1.0\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.6.1\" // 3.9.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.6.2\" // 3.9.0 and above\nimplementation \"com.google.android.gms:play-services-location:18.0.0\"\nimplementation \"androidx.work:work-runtime:2.7.0\" // required for FETCH_LAST_LOCATION_PERIODIC\nimplementation \"androidx.concurrent:concurrent-futures:1.1.0\" // required for FETCH_LAST_LOCATION_PERIODIC\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTPUSHTEMPLATES.md",
"new_path": "docs/CTPUSHTEMPLATES.md",
"diff": "@@ -20,8 +20,8 @@ CleverTap Push Templates SDK helps you engage with your users using fancy push n\n1. Add the dependencies to the `build.gradle`\n```groovy\n-implementation \"com.clevertap.android:push-templates:1.0.4\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.6.1\" // 4.4.0 and above\n+implementation \"com.clevertap.android:push-templates:1.0.5\"\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.6.2\" // 4.4.0 and above\n```\n2. Add the following line to your Application class before the `onCreate()`\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTPUSHTEMPLATESCHANGELOG.md",
"new_path": "docs/CTPUSHTEMPLATESCHANGELOG.md",
"diff": "## CleverTap Push Templates SDK CHANGE LOG\n+### Version 1.0.5 (September 13, 2022)\n+* fixes a bug on android 12 where push template notification header was not displaying subtitle text.\n+\n### Version 1.0.4 (August 4, 2022)\n* Supports CleverTap Android SDK v4.6.0\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/build.gradle",
"new_path": "sample/build.gradle",
"diff": "@@ -72,7 +72,7 @@ dependencies {\nimplementation project(':clevertap-core')\nimplementation fileTree(include: ['*.aar'], dir: 'libs')\n- //implementation \"com.clevertap.android:clevertap-android-sdk:4.6.1\"\n+ //implementation \"com.clevertap.android:clevertap-android-sdk:4.6.2\"\nimplementation project(':clevertap-geofence')\n//implementation \"com.clevertap.android:clevertap-geofence-sdk:1.1.0\"\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTCORECHANGELOG.md",
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n-### Version 4.6.1 (September 19, 2022)\n+### Version 4.6.2 (September 13, 2022)\n* Support for exoplayer [`v2.17.1`](https://github.com/google/ExoPlayer/releases/tag/r2.17.1) . Note : this upgrade will result in minor ui changes for interstitial in app and inbox notifications that uses exoplayer\n### Version 4.6.1 (September 6, 2022)\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTPUSHTEMPLATESCHANGELOG.md",
"new_path": "templates/CTPUSHTEMPLATESCHANGELOG.md",
"diff": "## CleverTap Push Templates SDK CHANGE LOG\n+### Version 1.0.5 (September 13, 2022)\n+* fixes a bug on android 12 where push template notification header was not displaying subtitle text.\n+\n### Version 1.0.4 (August 4, 2022)\n* Supports CleverTap Android SDK v4.6.0\n"
},
{
"change_type": "MODIFY",
"old_path": "versions.properties",
"new_path": "versions.properties",
"diff": "@@ -321,11 +321,11 @@ version.com.android.installreferrer..installreferrer=2.2\nversion.com.android.tools.lint..lint-api=27.0.1\nversion.com.android.tools.lint..lint-checks=27.0.1\n-version.com.clevertap.android..clevertap-android-sdk=4.6.1\n+version.com.clevertap.android..clevertap-android-sdk=4.6.2\nversion.com.clevertap.android..clevertap-geofence-sdk=1.1.0\nversion.com.clevertap.android..clevertap-hms-sdk=1.3.1\nversion.com.clevertap.android..clevertap-xiaomi-sdk=1.5.0\n-version.com.clevertap.android..push-templates=1.0.4\n+version.com.clevertap.android..push-templates=1.0.5\nversion.com.github.bumptech.glide..glide=4.12.0\n## # available=4.12.0\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2155] update push templates changelog , ct core changelog |
116,612 | 13.09.2022 15:53:03 | -19,080 | 316e96d79a4257377b119821da3ee6e37ae6df9b | fix(SDK-2160): add subtitle to notification header above android 12 for input box in PushTemplateReceiver | [
{
"change_type": "MODIFY",
"old_path": "clevertap-pushtemplates/src/main/java/com/clevertap/android/pushtemplates/PushTemplateReceiver.java",
"new_path": "clevertap-pushtemplates/src/main/java/com/clevertap/android/pushtemplates/PushTemplateReceiver.java",
"diff": "@@ -328,6 +328,11 @@ public class PushTemplateReceiver extends BroadcastReceiver {\nrepliedNotification = new NotificationCompat.Builder(context);\n}\nsetSmallIcon(context);\n+\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {\n+ repliedNotification.setSubText(pt_subtitle);\n+ }\n+\nrepliedNotification.setSmallIcon(smallIcon)\n.setContentTitle(pt_title)\n.setContentText(extras.getString(PTConstants.PT_INPUT_FEEDBACK))\n@@ -473,7 +478,7 @@ public class PushTemplateReceiver extends BroadcastReceiver {\nif (notification != null) {\ncontentViewRating = notification.bigContentView;\ncontentViewSmall = notification.contentView;\n- }\n+ } // why null check just return if no notification exist in drawer\nif (1 == extras.getInt(PTConstants.KEY_CLICKED_STAR, 0)) {\ncontentViewRating.setImageViewResource(R.id.star1, R.drawable.pt_star_filled);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | fix(SDK-2160): add subtitle to notification header above android 12 for input box in PushTemplateReceiver |
116,616 | 13.09.2022 19:06:56 | -19,080 | 31c2e29fe3bfb547654375140b40593927f11db4 | task(SDK-2154)-Add `requestPermission()` flow from InAppController.java to directly call hard permission request dialog | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1047,6 +1047,23 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n+ public void promptForNotificationPermission(){\n+ if (instances == null) {\n+ return;\n+ }\n+\n+ for (String accountId : CleverTapAPI.instances.keySet()) {\n+ CleverTapAPI instance = CleverTapAPI.instances.get(accountId);\n+ try {\n+ if (instance != null) {\n+ instance.coreState.getInAppController().promptPermission();\n+ }\n+ } catch (Throwable t) {\n+ // Ignore\n+ }\n+ }\n+ }\n+\n// Initialize\nprivate CleverTapAPI(final Context context, final CleverTapInstanceConfig config, String cleverTapID) {\nthis.context = context;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk;\nimport static com.clevertap.android.sdk.Utils.isAndroid13;\n+import android.app.Activity;\nimport android.app.AlertDialog;\nimport android.content.Context;\nimport android.content.DialogInterface;\n@@ -11,7 +12,6 @@ import android.content.res.Configuration;\nimport android.net.Uri;\nimport android.os.Bundle;\nimport android.view.WindowManager;\n-import android.widget.Toast;\nimport androidx.annotation.NonNull;\nimport androidx.core.app.ActivityCompat;\n@@ -69,6 +69,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nthrow new IllegalArgumentException();\n}\ninAppNotification = notif.getParcelable(\"inApp\");\n+ boolean displayHardNotificationDialog = notif.getBoolean(\"displayHardPermissionDialog\",false);\nBundle configBundle = notif.getBundle(\"configBundle\");\nif (configBundle != null) {\nconfig = configBundle.getParcelable(\"config\");\n@@ -76,6 +77,10 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nsetListener(CleverTapAPI.instanceWithConfig(this, config).getCoreState().getInAppController());\nsetPermissionCallback(CleverTapAPI.instanceWithConfig(this, config).getCoreState().getInAppController());\n+ if (displayHardNotificationDialog){\n+ prompt();\n+ return;\n+ }\n} catch (Throwable t) {\nLogger.v(\"Cannot find a valid notification bundle to show!\", t);\nfinish();\n@@ -219,13 +224,25 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n});\n}\n+ public static void startPrompt(Activity activity, CleverTapInstanceConfig config){\n+ if (!activity.getClass().equals(InAppNotificationActivity.class)) {\n+ Intent intent = new Intent(activity, InAppNotificationActivity.class);\n+ intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);\n+ Bundle configBundle = new Bundle();\n+ configBundle.putParcelable(\"config\", config);\n+ intent.putExtra(\"configBundle\", configBundle);\n+ intent.putExtra(\"displayHardPermissionDialog\", true);\n+ activity.startActivity(intent);\n+ }\n+ }\n+\nvoid didDismiss(Bundle data) {\nif (isAlertVisible) {\nisAlertVisible = false;\n}\nfinish();\nInAppListener listener = getListener();\n- if (listener != null && getBaseContext() != null) {\n+ if (listener != null && getBaseContext() != null && inAppNotification != null && data != null) {\nlistener.inAppNotificationDidDismiss(getBaseContext(), inAppNotification, data);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -32,6 +32,7 @@ import java.util.Collections;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.List;\n+import java.util.Objects;\nimport java.util.concurrent.Callable;\nimport org.json.JSONArray;\nimport org.json.JSONObject;\n@@ -187,6 +188,11 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nprepareNotificationForDisplay(ctLocalInAppSettings);\n}\n+ public void promptPermission(){\n+ InAppNotificationActivity.startPrompt(Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n+ config);\n+ }\n+\npublic void discardInApps() {\nthis.inAppState = InAppState.DISCARDED;\nlogger.verbose(config.getAccountId(), \"InAppState is DISCARDED\");\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"diff": "@@ -66,7 +66,8 @@ object HomeScreenModel {\n),\n\"PROMPT LOCAL IN-APP\" to listOf(\n\"Generate Half-Interstitial Local InApp\",\n- \"Generate Alert Local InApp\"\n+ \"Generate Alert Local InApp\",\n+ \"Generate hard permission dialog\"\n)\n)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "@@ -343,6 +343,10 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.promptPushPrimer(builder)\n}\n+ \"102\"->{\n+ cleverTapAPI?.promptForNotificationPermission()\n+ }\n+\n//\"60\" -> webViewClickListener?.onWebViewClick()\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-2154)-Add `requestPermission()` flow from InAppController.java to directly call hard permission request dialog |
116,616 | 15.09.2022 13:19:41 | -19,080 | 9b0fa7e47815885aae4c52b605cbcafbeea4df30 | task(SDK-2167)-Add WebView JS interface method to directly call hard permission flow from HTML fragment | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"diff": "@@ -20,8 +20,19 @@ public class CTWebInterface {\nthis.weakReference = new WeakReference<>(instance);\n}\n-\n- //Handle push primer click and directly call requestPermissions() inside InAppActivity\n+ /**\n+ * Method to be called from WebView Javascript to request permission for notification\n+ * for Android 13 and above\n+ */\n+ @JavascriptInterface\n+ public void promptForNotificationPermission() {\n+ CleverTapAPI cleverTapAPI = weakReference.get();\n+ if (cleverTapAPI == null) {\n+ Logger.d(\"CleverTap Instance is null.\");\n+ } else {\n+ cleverTapAPI.promptForNotificationPermission();\n+ }\n+ }\n/**\n* Method to be called from WebView Javascript to add profile properties in CleverTap\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -227,7 +227,6 @@ public final class InAppNotificationActivity extends FragmentActivity implements\npublic static void startPrompt(Activity activity, CleverTapInstanceConfig config){\nif (!activity.getClass().equals(InAppNotificationActivity.class)) {\nIntent intent = new Intent(activity, InAppNotificationActivity.class);\n- intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);\nBundle configBundle = new Bundle();\nconfigBundle.putParcelable(\"config\", config);\nintent.putExtra(\"configBundle\", configBundle);\n@@ -242,7 +241,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\nfinish();\nInAppListener listener = getListener();\n- if (listener != null && getBaseContext() != null && inAppNotification != null && data != null) {\n+ if (listener != null && getBaseContext() != null && inAppNotification != null) {\nlistener.inAppNotificationDidDismiss(getBaseContext(), inAppNotification, data);\n}\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-2167)-Add WebView JS interface method to directly call hard permission flow from HTML fragment |
116,620 | 20.09.2022 13:40:42 | -19,080 | 2497417a0568299c3b70044bbaad4cffb7f7ae86 | fix app inbox bug | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/customviews/MediaPlayerRecyclerView.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/customviews/MediaPlayerRecyclerView.java",
"diff": "@@ -190,6 +190,10 @@ public class MediaPlayerRecyclerView extends RecyclerView {\nplayer = new ExoPlayer.Builder(context).setTrackSelector(trackSelector).build();\nplayer.setVolume(0f); // start off muted\n+ //if (CleverTapAPI.getDebugLevel()>= CleverTapAPI.LogLevel.DEBUG.intValue()){\n+ // EventLogger logger = new EventLogger((MappingTrackSelector) trackSelector);\n+ // player.addAnalyticsListener(logger);\n+ //}\nvideoSurfaceView.setUseController(true);\nvideoSurfaceView.setControllerAutoShow(false);\nvideoSurfaceView.setPlayer(player);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNativeInterstitialFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNativeInterstitialFragment.java",
"diff": "@@ -30,6 +30,8 @@ import androidx.annotation.Nullable;\nimport androidx.annotation.RequiresApi;\nimport androidx.core.content.ContextCompat;\nimport androidx.core.content.res.ResourcesCompat;\n+\n+import com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.R;\nimport com.clevertap.android.sdk.customviews.CloseImageView;\nimport com.clevertap.android.sdk.gif.GifImageView;\n@@ -40,6 +42,7 @@ import com.google.android.exoplayer2.source.hls.HlsMediaSource;\nimport com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;\nimport com.google.android.exoplayer2.trackselection.DefaultTrackSelector;\nimport com.google.android.exoplayer2.trackselection.ExoTrackSelection;\n+import com.google.android.exoplayer2.trackselection.MappingTrackSelector;\nimport com.google.android.exoplayer2.trackselection.TrackSelector;\nimport com.google.android.exoplayer2.ui.StyledPlayerView;\nimport com.google.android.exoplayer2.upstream.BandwidthMeter;\n@@ -48,6 +51,7 @@ import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;\nimport com.google.android.exoplayer2.upstream.DefaultDataSource;\nimport com.google.android.exoplayer2.upstream.DefaultHttpDataSource;\nimport com.google.android.exoplayer2.upstream.TransferListener;\n+import com.google.android.exoplayer2.util.EventLogger;\nimport com.google.android.exoplayer2.util.Util;\nimport java.util.ArrayList;\n@@ -420,6 +424,10 @@ public class CTInAppNativeInterstitialFragment extends CTInAppBaseFullNativeFrag\nvideoTrackSelectionFactory);\n// 2. Create the player\nplayer = new ExoPlayer.Builder(this.context).setTrackSelector(trackSelector).build();\n+ //if (CleverTapAPI.getDebugLevel()>= CleverTapAPI.LogLevel.DEBUG.intValue()){\n+ // EventLogger logger = new EventLogger((MappingTrackSelector) trackSelector);\n+ // player.addAnalyticsListener(logger);\n+ //}\n// 3. Produces DataSource instances through which media data is loaded.\nContext ctx = this.context;\nString userAgent = Util.getUserAgent(ctx,ctx.getPackageName());\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxActivity.java",
"diff": "@@ -226,14 +226,38 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n@Override\npublic void inboxMessagesDidUpdate() {\n- Logger.d(\"CTInboxActivity: called inboxMessagesDidUpdate\");\n- if (inboxContentUpdatedListener != null) {\n+ Logger.v(\"CTInboxActivity|inboxMessagesDidUpdate called\");\n+ try {\n+ boolean isCUListenerAvailable = inboxContentUpdatedListener != null;\n+ Logger.v(\"CTInboxActivity|inboxMessagesDidUpdate: inboxContentUpdatedListener available:\" + isCUListenerAvailable);\n+\n+ boolean isUsingMultipleTabs = styleConfig.isUsingTabs();\n+ Logger.v(\"CTInboxActivity|inboxMessagesDidUpdate: isUsingMultipleTabs : \" + isUsingMultipleTabs);\n+\n+ if (isCUListenerAvailable) {\ninboxContentUpdatedListener.inboxMessagesDidUpdate();\n}\n-\n+ if (isUsingMultipleTabs) {\nint position = viewPager.getCurrentItem();\nCTInboxListViewFragment fragment = (CTInboxListViewFragment) inboxTabAdapter.getItem(position);\nfragment.updateAdapterContent();\n+ }\n+ else {\n+ List<Fragment> fragments = getSupportFragmentManager().getFragments();\n+ String singleTabTag = getFragmentTag();\n+ for (Fragment f : fragments) {\n+ String currentFTag = f.getTag();\n+ if (f instanceof CTInboxListViewFragment && currentFTag != null && currentFTag.equalsIgnoreCase(singleTabTag)) {\n+ ((CTInboxListViewFragment) f).updateAdapterContent();\n+ }\n+ }\n+\n+ }\n+\n+ } catch (Throwable t) {\n+ Logger.i(\"Something Went Wrong\", t);\n+ }\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"diff": "@@ -19,7 +19,7 @@ object HomeScreenModel {\n\"onUserLogin\"\n),\n\"INBOX\" to listOf(\n- \"Open Inbox\", \"Show Total Counts\", \"Show Unread Counts\", \"Get All Inbox Messages\",\n+ \"Open Inbox(with tabs)\",\"Open Inbox(without tabs)\",\"Show Total Counts\", \"Show Unread Counts\", \"Get All Inbox Messages\",\n\"Get Unread Messages\", \"Get InboxMessage by messageID\", \"Delete InboxMessage by messageID\",\n\"Delete InboxMessage by Object\", \"Mark as read by messageID\", \"Mark as read by Object\",\n\"Notification Viewed event for Message\", \"Notification Clicked event for Message\"\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "@@ -157,7 +157,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.onUserLogin(newProfile)\n}\n\"20\" -> {\n- // Open Inbox\n+ // Open Inbox(Customised, with tabs)\nval inboxTabs =\narrayListOf(\"Promotions\", \"Offers\", \"Others\")//Anything after the first 2 will be ignored\nCTInboxStyleConfig().apply {\n@@ -175,18 +175,35 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.showAppInbox(this) //Opens activity With Tabs\n}\n}\n- \"21\" -> println(\"Total inbox message count = ${cleverTapAPI?.inboxMessageCount}\") // show total inbox message count\n- \"22\" -> println(\"Unread inbox message count = ${cleverTapAPI?.inboxMessageUnreadCount}\") // show unread inbox message count\n- \"23\" -> // All inbox messages\n+ \"21\" -> {\n+ // Open Inbox(Customised, without tabs)\n+ CTInboxStyleConfig().apply {\n+ tabBackgroundColor = \"#FF0000\"\n+ selectedTabIndicatorColor = \"#0000FF\"\n+ selectedTabColor = \"#000000\"\n+ unselectedTabColor = \"#FFFFFF\"\n+ backButtonColor = \"#FF0000\"\n+ navBarTitleColor = \"#FF0000\"\n+ navBarTitle = \"MY INBOX\"\n+ navBarColor = \"#FFFFFF\"\n+ inboxBackgroundColor = \"#00FF00\"\n+ cleverTapAPI?.showAppInbox(this) //Opens activity Without Tabs\n+ }\n+ }\n+\n+\n+ \"22\" -> println(\"Total inbox message count = ${cleverTapAPI?.inboxMessageCount}\") // show total inbox message count\n+ \"23\" -> println(\"Unread inbox message count = ${cleverTapAPI?.inboxMessageUnreadCount}\") // show unread inbox message count\n+ \"24\" -> // All inbox messages\ncleverTapAPI?.allInboxMessages?.forEach {\nprintln(\"All inbox messages ID = ${it.messageId}\")\n}\n- \"24\" -> // All unread inbox messages\n+ \"25\" -> // All unread inbox messages\ncleverTapAPI?.unreadInboxMessages?.forEach {\nprintln(\"All unread inbox messages ID = ${it.messageId}\")\n}\n- \"25\" -> {\n+ \"26\" -> {\nval firstMessageId = cleverTapAPI?.allInboxMessages?.firstOrNull()?.messageId\n//Get message object belonging to the given message id only. Message id should be a String\nfirstMessageId?.also {\n@@ -194,7 +211,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nprintln(\"inboxMessage For Id $it = ${inboxMessageForId?.data}\")\n} ?: println(\"inboxMessage Id is null\")\n}\n- \"26\" -> {\n+ \"27\" -> {\nval firstMessageId = cleverTapAPI?.allInboxMessages?.firstOrNull()?.messageId\n//Delete message object belonging to the given message id only. Message id should be a String\nfirstMessageId?.also {\n@@ -202,7 +219,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nprintln(\"Deleted inboxMessage For Id = $it\")\n} ?: println(\"inboxMessage Id is null\")\n}\n- \"27\" -> {\n+ \"28\" -> {\nval firstMessage = cleverTapAPI?.allInboxMessages?.firstOrNull()\n//Delete message object belonging to the given CTInboxMessage.\nfirstMessage?.also {\n@@ -210,7 +227,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nprintln(\"Deleted inboxMessage = ${it.messageId}\")\n} ?: println(\"inboxMessage is null\")\n}\n- \"28\" -> {\n+ \"29\" -> {\nval firstMessageId = cleverTapAPI?.unreadInboxMessages?.firstOrNull()?.messageId\n//Mark Message as Read. Message id should be a String\nfirstMessageId?.also {\n@@ -218,7 +235,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nprintln(\"Marked Message as Read For Id = $it\")\n} ?: println(\"inboxMessage Id is null\")\n}\n- \"29\" -> {\n+ \"210\" -> {\nval firstMessage = cleverTapAPI?.unreadInboxMessages?.firstOrNull()\n//Mark message as Read. Message should object of CTInboxMessage\nfirstMessage?.also {\n@@ -226,7 +243,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nprintln(\"Marked Message as Read = ${it.messageId}\")\n} ?: println(\"inboxMessage is null\")\n}\n- \"210\" -> {\n+ \"211\" -> {\nval firstMessageId = cleverTapAPI?.allInboxMessages?.firstOrNull()?.messageId\n//Raise Notification Viewed event for Inbox Message. Message id should be a String\nfirstMessageId?.also {\n@@ -234,7 +251,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nprintln(\"Raised Notification Viewed event For Id = $it\")\n} ?: println(\"inboxMessage Id is null\")\n}\n- \"211\" -> {\n+ \"212\" -> {\nval firstMessageId = cleverTapAPI?.allInboxMessages?.firstOrNull()?.messageId\n//Raise Notification Clicked event for Inbox Message. Message id should be a String\nfirstMessageId?.also {\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2214] fix app inbox bug |
116,620 | 20.09.2022 13:45:35 | -19,080 | ee82c7d6ae15d83e19af729a547bd65073cd7f3a | Release v 4.6.3 | [
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## CHANGE LOG.\n+### September 20, 2022\n+* [CleverTap Android SDK v4.6.3](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n+\n### September 13, 2022\n* [CleverTap Android SDK v4.6.2](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n+\n* [CleverTap Push Templates SDK v1.0.5](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTPUSHTEMPLATESCHANGELOG.md)\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -26,7 +26,7 @@ We publish the SDK to `mavenCentral` as an `AAR` file. Just declare it as depend\n```groovy\ndependencies {\n- implementation \"com.clevertap.android:clevertap-android-sdk:4.6.2\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.6.3\"\n}\n```\n@@ -34,7 +34,7 @@ Alternatively, you can download and add the AAR file included in this repo in yo\n```groovy\ndependencies {\n- implementation (name: \"clevertap-android-sdk-4.6.2\", ext: 'aar')\n+ implementation (name: \"clevertap-android-sdk-4.6.3\", ext: 'aar')\n}\n```\n@@ -46,7 +46,7 @@ Add the Firebase Messaging library and Android Support Library v4 as dependencie\n```groovy\ndependencies {\n- implementation \"com.clevertap.android:clevertap-android-sdk:4.6.2\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.6.3\"\nimplementation \"androidx.core:core:1.3.0\"\nimplementation \"com.google.firebase:firebase-messaging:21.0.0\"\nimplementation \"com.google.android.gms:play-services-ads:19.4.0\" // Required only if you enable Google ADID collection in the SDK (turned off by default).\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTCORECHANGELOG.md",
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.6.3 (September 20, 2022)\n+* Fix crash in App inbox when No additional tabs are used .\n+\n### Version 4.6.2 (September 13, 2022)\n* Support for exoplayer [`v2.17.1`](https://github.com/google/ExoPlayer/releases/tag/r2.17.1) . Note : this upgrade will result in minor ui changes for interstitial in app and inbox notifications that uses exoplayer\n+* Note: kindly upgrade to version 4.6.3 and above if you face any issues with app inbox\n### Version 4.6.1 (September 6, 2022)\n* App inbox blue dot fix : This release fixes the bug where new entries in inbox would continue showing blue dot when scrolled up and down . expected behaviour is to stop showing blue dot after 2 seconds.\n* App inbox onMessage Click Callback : user can now pass an `InboxMessageListener` in addition to `InboxMessageButtonListener` to receive inbox item click\n+* Note: kindly upgrade to version 4.6.3 and above if you face any issues with app inbox\n### Version 4.6.0 (August 4, 2022)\n* Improved push synchronization for multiple push services\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTGEOFENCE.md",
"new_path": "docs/CTGEOFENCE.md",
"diff": "@@ -17,7 +17,7 @@ Add the following dependencies to the `build.gradle`\n```Groovy\nimplementation \"com.clevertap.android:clevertap-geofence-sdk:1.1.0\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.6.2\" // 3.9.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.6.3\" // 3.9.0 and above\nimplementation \"com.google.android.gms:play-services-location:18.0.0\"\nimplementation \"androidx.work:work-runtime:2.7.0\" // required for FETCH_LAST_LOCATION_PERIODIC\nimplementation \"androidx.concurrent:concurrent-futures:1.1.0\" // required for FETCH_LAST_LOCATION_PERIODIC\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTPUSHTEMPLATES.md",
"new_path": "docs/CTPUSHTEMPLATES.md",
"diff": "@@ -21,7 +21,7 @@ CleverTap Push Templates SDK helps you engage with your users using fancy push n\n```groovy\nimplementation \"com.clevertap.android:push-templates:1.0.5\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.6.2\" // 4.4.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.6.3\" // 4.4.0 and above\n```\n2. Add the following line to your Application class before the `onCreate()`\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTCORECHANGELOG.md",
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.6.3 (September 20, 2022)\n+* Fix crash in App inbox when No additional tabs are used .\n+\n### Version 4.6.2 (September 13, 2022)\n* Support for exoplayer [`v2.17.1`](https://github.com/google/ExoPlayer/releases/tag/r2.17.1) . Note : this upgrade will result in minor ui changes for interstitial in app and inbox notifications that uses exoplayer\n+* Note: kindly upgrade to version 4.6.3 and above if you face any issues with app inbox\n### Version 4.6.1 (September 6, 2022)\n* App inbox blue dot fix : This release fixes the bug where new entries in inbox would continue showing blue dot when scrolled up and down . expected behaviour is to stop showing blue dot after 2 seconds.\n* App inbox onMessage Click Callback : user can now pass an `InboxMessageListener` in addition to `InboxMessageButtonListener` to receive inbox item click\n+* Note: kindly upgrade to version 4.6.3 and above if you face any issues with app inbox\n### Version 4.6.0 (August 4, 2022)\n* Improved push synchronization for multiple push services\n"
},
{
"change_type": "MODIFY",
"old_path": "versions.properties",
"new_path": "versions.properties",
"diff": "@@ -321,7 +321,7 @@ version.com.android.installreferrer..installreferrer=2.2\nversion.com.android.tools.lint..lint-api=27.0.1\nversion.com.android.tools.lint..lint-checks=27.0.1\n-version.com.clevertap.android..clevertap-android-sdk=4.6.2\n+version.com.clevertap.android..clevertap-android-sdk=4.6.3\nversion.com.clevertap.android..clevertap-geofence-sdk=1.1.0\nversion.com.clevertap.android..clevertap-hms-sdk=1.3.1\nversion.com.clevertap.android..clevertap-xiaomi-sdk=1.5.0\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2214] Release v 4.6.3 |
116,616 | 21.09.2022 17:19:38 | -19,080 | 9aad906918c33fc241a94c85cfd5fbabfe04c6a8 | task(SDK-1970)-Refactor local in-app builder to use mandatory/optional parameters | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -31,7 +31,8 @@ import com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\nimport com.clevertap.android.sdk.events.EventDetail;\nimport com.clevertap.android.sdk.events.EventGroup;\nimport com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\n-import com.clevertap.android.sdk.inapp.CTLocalInAppSettings;\n+import com.clevertap.android.sdk.inapp.CTAlertLocalInAppBuilder;\n+import com.clevertap.android.sdk.inapp.CTHalfInterstitialLocalInAppBuilder;\nimport com.clevertap.android.sdk.inbox.CTInboxActivity;\nimport com.clevertap.android.sdk.inbox.CTInboxMessage;\nimport com.clevertap.android.sdk.inbox.CTMessageDAO;\n@@ -1030,21 +1031,13 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n- public void promptPushPrimer(CTLocalInAppSettings builder){\n- if (instances == null) {\n- return;\n+ public void promptHalfInterstitialPushPrimer(CTHalfInterstitialLocalInAppBuilder\n+ halfInterstitialLocalInAppBuilder){\n+ coreState.getInAppController().promptPushPrimer(halfInterstitialLocalInAppBuilder);\n}\n- for (String accountId : CleverTapAPI.instances.keySet()) {\n- CleverTapAPI instance = CleverTapAPI.instances.get(accountId);\n- try {\n- if (instance != null) {\n- instance.coreState.getInAppController().promptPushPrimer(builder);\n- }\n- } catch (Throwable t) {\n- // Ignore\n- }\n- }\n+ public void promptAlertPushPrimer(CTAlertLocalInAppBuilder alertLocalInAppBuilder){\n+ coreState.getInAppController().promptPushPrimer(alertLocalInAppBuilder);\n}\npublic void promptForNotificationPermission(){\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -391,12 +391,12 @@ public class DeviceInfo {\n/**\n* Device is a smart phone\n*/\n- static final int SMART_PHONE = 1;\n+ public static final int SMART_PHONE = 1;\n/**\n* Device is a tablet\n*/\n- static final int TABLET = 2;\n+ public static final int TABLET = 2;\n/**\n* Device is a television\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTAlertLocalInAppBuilder.java",
"diff": "+package com.clevertap.android.sdk.inapp;\n+\n+import androidx.annotation.NonNull;\n+\n+import java.util.Objects;\n+\n+public class CTAlertLocalInAppBuilder {\n+\n+ private final String titleText;\n+ private final String bodyText;\n+ private final boolean followDeviceOrientation;\n+ private final String positiveBtnText;\n+ private final String negativeBtnText;\n+\n+ CTAlertLocalInAppBuilder(Builder.Builder1 builder) {\n+ this.titleText = builder.titleText;\n+ this.bodyText = builder.bodyText;\n+ this.followDeviceOrientation = builder.followDeviceOrientation;\n+ this.positiveBtnText = builder.positiveBtnText;\n+ this.negativeBtnText = builder.negativeBtnText;\n+ }\n+ public static Builder builder() {\n+ return new Builder();\n+ }\n+\n+ public static final class Builder {\n+ public Builder1 titleText(String titleText) {\n+ return new Builder1(titleText);\n+ }\n+ public static final class Builder1 {\n+ final String titleText;\n+ String bodyText;\n+ boolean followDeviceOrientation;\n+ String positiveBtnText;\n+ String negativeBtnText;\n+\n+ private Builder1(String titleText) {\n+ this.titleText = titleText;\n+ }\n+ public Builder2 bodyText(String bodyText) {\n+ this.bodyText = bodyText;\n+ return new Builder2(Builder1.this);\n+ }\n+ }\n+ public static final class Builder2 {\n+ final Builder1 builder;\n+\n+ private Builder2(Builder1 builder) {\n+ this.builder = builder;\n+ }\n+ public Builder3 followDeviceOrientation(boolean followDeviceOrientation) {\n+ this.builder.followDeviceOrientation = followDeviceOrientation;\n+ return new Builder3(this.builder);\n+ }\n+ }\n+ public static final class Builder3 {\n+ final Builder1 builder;\n+\n+ private Builder3(Builder1 builder) {\n+ this.builder = builder;\n+ }\n+ public Builder4 positiveBtnText(String positiveBtnText) {\n+ this.builder.positiveBtnText = positiveBtnText;\n+ return new Builder4(this.builder);\n+ }\n+ }\n+ public static final class Builder4 {\n+ final Builder1 builder;\n+\n+ private Builder4(Builder1 builder) {\n+ this.builder = builder;\n+ }\n+ public Builder5 negativeBtnText(String negativeBtnText) {\n+ this.builder.negativeBtnText = negativeBtnText;\n+ return new Builder5(this.builder);\n+ }\n+ }\n+ public static final class Builder5 {\n+ final Builder1 builder;\n+\n+ private Builder5(Builder1 builder) {\n+ this.builder = builder;\n+ }\n+ public CTAlertLocalInAppBuilder build() {\n+ return new CTAlertLocalInAppBuilder(this.builder);\n+ }\n+ }\n+ }\n+\n+ public String titleText() {\n+ return this.titleText;\n+ }\n+ public String bodyText() {\n+ return this.bodyText;\n+ }\n+ public boolean followDeviceOrientation() {\n+ return this.followDeviceOrientation;\n+ }\n+ public String positiveBtnText() {\n+ return this.positiveBtnText;\n+ }\n+ public String negativeBtnText() {\n+ return this.negativeBtnText;\n+ }\n+\n+ @NonNull\n+ @Override\n+ public String toString() {\n+ return \"CTAlertLocalInAppBuilder(titleText=\" + this.titleText + \", bodyText=\" + this.bodyText +\n+ \", followDeviceOrientation=\" + this.followDeviceOrientation + \", positiveBtnText=\" +\n+ this.positiveBtnText + \", negativeBtnText=\" + this.negativeBtnText + \")\";\n+ }\n+\n+ @Override\n+ public boolean equals(Object o) {\n+ if (this == o) return true;\n+ if (o == null || getClass() != o.getClass()) return false;\n+ CTAlertLocalInAppBuilder that = (CTAlertLocalInAppBuilder) o;\n+ return followDeviceOrientation == that.followDeviceOrientation &&\n+ Objects.equals(titleText, that.titleText) && Objects.equals(bodyText, that.bodyText) &&\n+ Objects.equals(positiveBtnText, that.positiveBtnText) &&\n+ Objects.equals(negativeBtnText, that.negativeBtnText);\n+ }\n+\n+ @Override\n+ public int hashCode() {\n+ return Objects.hash(titleText, bodyText, followDeviceOrientation, positiveBtnText, negativeBtnText);\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTHalfInterstitialLocalInAppBuilder.java",
"diff": "+package com.clevertap.android.sdk.inapp;\n+\n+\n+import androidx.annotation.NonNull;\n+\n+import java.util.Objects;\n+\n+public class CTHalfInterstitialLocalInAppBuilder {\n+\n+ private final String titleText;\n+ private final String titleTextColor;\n+ private final String bodyText;\n+ private final String bodyTextColor;\n+ private final String backgroundColor;\n+ private final boolean followDeviceOrientation;\n+ private final String positiveBtnText;\n+ private final String negativeBtnText;\n+ private final String btnTextColor;\n+ private final String btnBackgroundColor;\n+ private final String btnBorderColor;// Optional\n+ private final String btnBorderRadius;// Optional\n+ private boolean doesSupportTablet;\n+\n+ CTHalfInterstitialLocalInAppBuilder(Builder.Builder1 builder) {\n+ this.titleText = builder.titleText;\n+ this.titleTextColor = builder.titleTextColor;\n+ this.bodyText = builder.bodyText;\n+ this.bodyTextColor = builder.bodyTextColor;\n+ this.backgroundColor = builder.backgroundColor;\n+ this.followDeviceOrientation = builder.followDeviceOrientation;\n+ this.positiveBtnText = builder.positiveBtnText;\n+ this.negativeBtnText = builder.negativeBtnText;\n+ this.btnTextColor = builder.btnTextColor;\n+ this.btnBackgroundColor = builder.btnBackgroundColor;\n+ this.btnBorderColor = builder.btnBorderColor;\n+ this.btnBorderRadius = builder.btnBorderRadius;\n+ }\n+ public static Builder builder() {\n+ return new Builder();\n+ }\n+\n+ public static final class Builder {\n+ public Builder1 titleText(String titleText) {\n+ return new Builder1(titleText);\n+ }\n+ public static final class Builder1 {\n+ final String titleText;\n+ String titleTextColor;\n+ String bodyText;\n+ String bodyTextColor;\n+ String backgroundColor;\n+ boolean followDeviceOrientation;\n+ String positiveBtnText;\n+ String negativeBtnText;\n+ String btnTextColor;\n+ String btnBackgroundColor;\n+ String btnBorderColor;\n+ String btnBorderRadius;\n+\n+ private Builder1(String titleText) {\n+ this.titleText = titleText;\n+ }\n+ public Builder2 titleTextColor(String titleTextColor) {\n+ this.titleTextColor = titleTextColor;\n+ return new Builder2(Builder1.this);\n+ }\n+ }\n+ public static final class Builder2 {\n+ final Builder1 builder;\n+\n+ private Builder2(Builder1 builder) {\n+ this.builder = builder;\n+ }\n+ public Builder3 bodyText(String bodyText) {\n+ this.builder.bodyText = bodyText;\n+ return new Builder3(this.builder);\n+ }\n+ }\n+ public static final class Builder3 {\n+ final Builder1 builder;\n+\n+ private Builder3(Builder1 builder) {\n+ this.builder = builder;\n+ }\n+ public Builder4 bodyTextColor(String bodyTextColor) {\n+ this.builder.bodyTextColor = bodyTextColor;\n+ return new Builder4(this.builder);\n+ }\n+ }\n+ public static final class Builder4 {\n+ final Builder1 builder;\n+\n+ private Builder4(Builder1 builder) {\n+ this.builder = builder;\n+ }\n+ public Builder5 backgroundColor(String backgroundColor) {\n+ this.builder.backgroundColor = backgroundColor;\n+ return new Builder5(this.builder);\n+ }\n+ }\n+ public static final class Builder5 {\n+ final Builder1 builder;\n+\n+ private Builder5(Builder1 builder) {\n+ this.builder = builder;\n+ }\n+ public Builder6 followDeviceOrientation(boolean followDeviceOrientation) {\n+ this.builder.followDeviceOrientation = followDeviceOrientation;\n+ return new Builder6(this.builder);\n+ }\n+ }\n+ public static final class Builder6 {\n+ final Builder1 builder;\n+\n+ private Builder6(Builder1 builder) {\n+ this.builder = builder;\n+ }\n+ public Builder7 positiveBtnText(String positiveBtnText) {\n+ this.builder.positiveBtnText = positiveBtnText;\n+ return new Builder7(this.builder);\n+ }\n+ }\n+ public static final class Builder7 {\n+ final Builder1 builder;\n+\n+ private Builder7(Builder1 builder) {\n+ this.builder = builder;\n+ }\n+ public Builder8 negativeBtnText(String negativeBtnText) {\n+ this.builder.negativeBtnText = negativeBtnText;\n+ return new Builder8(this.builder);\n+ }\n+ }\n+ public static final class Builder8 {\n+ final Builder1 builder;\n+\n+ private Builder8(Builder1 builder) {\n+ this.builder = builder;\n+ }\n+ public Builder9 btnTextColor(String btnTextColor) {\n+ this.builder.btnTextColor = btnTextColor;\n+ return new Builder9(this.builder);\n+ }\n+ }\n+ public static final class Builder9 {\n+ final Builder1 builder;\n+\n+ private Builder9(Builder1 builder) {\n+ this.builder = builder;\n+ }\n+ public Builder10 btnBackgroundColor(String btnBackgroundColor) {\n+ this.builder.btnBackgroundColor = btnBackgroundColor;\n+ return new Builder10(this.builder);\n+ }\n+ }\n+ public static final class Builder10 {\n+ final Builder1 builder;\n+\n+ private Builder10(Builder1 builder) {\n+ this.builder = builder;\n+ }\n+ public Builder10 btnBorderColor(String btnBorderColor){\n+ this.builder.btnBorderColor = btnBorderColor;\n+ return this;\n+ }\n+ public Builder10 btnBorderRadius(String btnBorderRadius){\n+ this.builder.btnBorderRadius = btnBorderRadius;\n+ return this;\n+ }\n+ public CTHalfInterstitialLocalInAppBuilder build() {\n+ return new CTHalfInterstitialLocalInAppBuilder(this.builder);\n+ }\n+ }\n+ }\n+\n+ public String titleText() {\n+ return this.titleText;\n+ }\n+ public String titleTextColor() {\n+ return this.titleTextColor;\n+ }\n+ public String bodyText() {\n+ return this.bodyText;\n+ }\n+ public String bodyTextColor() {\n+ return this.bodyTextColor;\n+ }\n+ public String backgroundColor() {\n+ return this.backgroundColor;\n+ }\n+ public boolean followDeviceOrientation() {\n+ return this.followDeviceOrientation;\n+ }\n+ public String positiveBtnText() {\n+ return this.positiveBtnText;\n+ }\n+ public String negativeBtnText() {\n+ return this.negativeBtnText;\n+ }\n+ public String btnTextColor() {\n+ return this.btnTextColor;\n+ }\n+ public String btnBackgroundColor() {\n+ return this.btnBackgroundColor;\n+ }\n+ public String btnBorderColor() {\n+ return this.btnBorderColor;\n+ }\n+ public String btnBorderRadius() {\n+ return this.btnBorderRadius;\n+ }\n+\n+ @NonNull\n+ @Override\n+ public String toString() {\n+ return \"CTHalfInterstitialLocalInAppBuilder(titleText=\" + this.titleText + \", titleTextColor=\" +\n+ this.titleTextColor + \", bodyText=\" + this.bodyText + \", bodyTextColor=\" + this.bodyTextColor +\n+ \", backgroundColor=\" + this.backgroundColor + \", followDeviceOrientation=\" +\n+ this.followDeviceOrientation + \", positiveBtnText=\" + this.positiveBtnText +\n+ \", negativeBtnText=\" + this.negativeBtnText + \", btnTextColor=\" +\n+ this.btnTextColor + \", btnBackgroundColor=\" + this.btnBackgroundColor +\n+ \", btnBorderColor=\" + this.btnBorderColor + \", btnBorderRadius=\" + this.btnBorderRadius + \")\";\n+ }\n+\n+ @Override\n+ public boolean equals(Object o) {\n+ if (this == o) return true;\n+ if (o == null || getClass() != o.getClass()) return false;\n+ CTHalfInterstitialLocalInAppBuilder that = (CTHalfInterstitialLocalInAppBuilder) o;\n+ return followDeviceOrientation == that.followDeviceOrientation &&\n+ Objects.equals(titleText, that.titleText) && Objects.equals(titleTextColor, that.titleTextColor)\n+ && Objects.equals(bodyText, that.bodyText) && Objects.equals(bodyTextColor, that.bodyTextColor)\n+ && Objects.equals(backgroundColor, that.backgroundColor) &&\n+ Objects.equals(positiveBtnText, that.positiveBtnText) &&\n+ Objects.equals(negativeBtnText, that.negativeBtnText) &&\n+ Objects.equals(btnTextColor, that.btnTextColor) &&\n+ Objects.equals(btnBackgroundColor, that.btnBackgroundColor) &&\n+ Objects.equals(btnBorderColor, that.btnBorderColor) &&\n+ Objects.equals(btnBorderRadius, that.btnBorderRadius);\n+ }\n+\n+ @Override\n+ public int hashCode() {\n+ return Objects.hash(titleText, titleTextColor, bodyText, bodyTextColor, backgroundColor,\n+ followDeviceOrientation, positiveBtnText, negativeBtnText, btnTextColor,\n+ btnBackgroundColor, btnBorderColor, btnBorderRadius);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"diff": "@@ -9,6 +9,7 @@ import android.util.LruCache;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.Constants;\n+import com.clevertap.android.sdk.DeviceInfo;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.Utils;\nimport com.clevertap.android.sdk.utils.ImageCache;\n@@ -222,6 +223,9 @@ public class CTInAppNotification implements Parcelable {\nprivate boolean isLocalInApp = false;\n+ private static final String HALF_INTERSTITIAL_LOCAL_IN_APP = \"half-interstitial\";\n+ private static final String ALERT_LOCAL_IN_APP = \"alert-template\";\n+\nCTInAppNotification() {\n}\n@@ -579,47 +583,104 @@ public class CTInAppNotification implements Parcelable {\n}\nlistener.notificationReady(this);\n}\n+ public CTInAppNotification configureAlertLocalInApp(CTAlertLocalInAppBuilder alertLocalInAppBuilder,\n+ int deviceInfo){\n+ this.id = \"\";\n+ this.campaignId = \"\";\n+ this.type = ALERT_LOCAL_IN_APP;\n+ this.inAppType = CTInAppType.fromString(this.type);\n+ this.isTablet = deviceInfo == DeviceInfo.TABLET;\n+ this.isPortrait = true;\n+ this.isLandscape = alertLocalInAppBuilder.followDeviceOrientation();\n+ this.isLocalInApp = true;\n+ this.timeToLive = System.currentTimeMillis() + 2 * Constants.ONE_DAY_IN_MILLIS;\n+ this.title = alertLocalInAppBuilder.titleText() != null ? alertLocalInAppBuilder.titleText() : \"\";\n+ this.message = alertLocalInAppBuilder.bodyText() != null ? alertLocalInAppBuilder.bodyText() : \"\";\n- public CTInAppNotification configureWithLocalData(CTLocalInAppSettings ctLocalInAppSettings){\n- this.id = \"\";//\n- this.campaignId = \"\";//\n- this.type = ctLocalInAppSettings.getInAppAlertType();//alert-template\n- this.excludeFromCaps = false;//\n+ setupInAppActionButtons(alertLocalInAppBuilder.positiveBtnText(),\n+ alertLocalInAppBuilder.negativeBtnText(),\n+ null,null,null,null);\n+\n+ return this;\n+ }\n+\n+ public CTInAppNotification configureHalfInterstitialLocalInApp (CTHalfInterstitialLocalInAppBuilder\n+ halfInterstitialLocalInAppBuilder, int deviceInfo){\n+ //check how many times have they called via local builder.\n+// boolean,count TODO\n+\n+ this.id = \"\";\n+ this.campaignId = \"\";\n+ this.type = HALF_INTERSTITIAL_LOCAL_IN_APP;\n+\n+\n+ this.excludeFromCaps = false;//Check this withInAppFC Manager\nthis.totalLifetimeCount = -1;//\nthis.totalDailyCount = -1;//\n+\nthis.inAppType = CTInAppType.fromString(this.type);\n- this.isTablet = false;//\n- this.backgroundColor = Constants.WHITE;\n- this.isPortrait = true;//\n- this.isLandscape = true;//\n+ this.isTablet = deviceInfo == DeviceInfo.TABLET;\n+\n+ this.backgroundColor = halfInterstitialLocalInAppBuilder.backgroundColor() != null ?\n+ halfInterstitialLocalInAppBuilder.backgroundColor() : Constants.WHITE;\n+\n+ this.isPortrait = true;\n+ this.isLandscape = halfInterstitialLocalInAppBuilder.followDeviceOrientation();\n+\nthis.isLocalInApp = true;\nthis.timeToLive = System.currentTimeMillis() + 2 * Constants.ONE_DAY_IN_MILLIS;\n+ this.title = halfInterstitialLocalInAppBuilder.titleText() != null ?\n+ halfInterstitialLocalInAppBuilder.titleText() : \"\";\n+ this.titleColor = halfInterstitialLocalInAppBuilder.titleTextColor() !=null ?\n+ halfInterstitialLocalInAppBuilder.titleTextColor()\n+ : Constants.BLACK;\n- this.title = ctLocalInAppSettings.getTitleText();\n- this.titleColor = Constants.BLACK;\n-\n- this.message = ctLocalInAppSettings.getBodyText();\n- this.messageColor = Constants.BLACK;\n+ this.message = halfInterstitialLocalInAppBuilder.bodyText() != null ?\n+ halfInterstitialLocalInAppBuilder.bodyText() : \"\";\n+ this.messageColor = halfInterstitialLocalInAppBuilder.bodyTextColor() != null ?\n+ halfInterstitialLocalInAppBuilder.bodyTextColor()\n+ : Constants.BLACK;\nthis.hideCloseButton = true;\n- //CTINAPPNOTIFMedia obj\n+ //CTINAPPNOTIFMedia obj//1.local image in case of offline//TODO\n+ //2.support for URI\n+ //3. In case of failure in loading img should we load a placeholder img in layout.\n+\n+ setupInAppActionButtons(halfInterstitialLocalInAppBuilder.positiveBtnText(),\n+ halfInterstitialLocalInAppBuilder.negativeBtnText(),\n+ halfInterstitialLocalInAppBuilder.btnBackgroundColor(),\n+ halfInterstitialLocalInAppBuilder.btnTextColor(),\n+ halfInterstitialLocalInAppBuilder.btnBorderColor(),\n+ halfInterstitialLocalInAppBuilder.btnBorderRadius());\n+\n+ return this;\n+ }\n+\n+ private void setupInAppActionButtons(String positiveBtnText, String negativeBtnText,\n+ String btnBackgroundColor,\n+ String btnTextColor, String btnBorderColor,\n+ String btnBorderRadius){\n//Positive Button\nCTInAppNotificationButton inAppNotificationPositiveButton = new CTInAppNotificationButton()\n- .initWithLocalData(ctLocalInAppSettings.getPositiveConfirmationBtnText(),ctLocalInAppSettings.getPositiveConfirmationBtnColor());\n+ .initWithLocalData(positiveBtnText,\n+ btnBackgroundColor,btnTextColor,btnBorderColor,btnBorderRadius);\n+\nif (inAppNotificationPositiveButton != null) {\nthis.buttons.add(inAppNotificationPositiveButton);\n}\n//Negative Button\nCTInAppNotificationButton inAppNotificationNegativeButton = new CTInAppNotificationButton()\n- .initWithLocalData(ctLocalInAppSettings.getNegativeConfirmationBtnText(),ctLocalInAppSettings.getPositiveConfirmationBtnColor());\n+ .initWithLocalData(negativeBtnText,\n+ btnBackgroundColor,btnTextColor,\n+ btnBorderColor,btnBorderRadius);\n+\nif (inAppNotificationNegativeButton != null) {\nthis.buttons.add(inAppNotificationNegativeButton);\n}\n- return this;\n}\nprivate void configureWithJson(JSONObject jsonObject) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationButton.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationButton.java",
"diff": "@@ -207,20 +207,26 @@ public class CTInAppNotificationButton implements Parcelable {\n}\n}\n}\n+\n+ //check if action is request for permission(rfp) and innit variable here.\n} catch (JSONException e) {\nthis.error = \"Invalid JSON\";\n}\nreturn this;\n}\n- CTInAppNotificationButton initWithLocalData(String text, String btnBackgroundColor) {\n- this.text = text;\n- this.textColor = Constants.WHITE;\n- this.backgroundColor = btnBackgroundColor.isEmpty() ? btnBackgroundColor\n- : Constants.LIGHT_BLUE;\n- this.borderColor = Constants.GREEN;\n- this.borderRadius = \"4\";//From sample payload\n+ CTInAppNotificationButton initWithLocalData(String btnText, String btnBackgroundColor,\n+ String btnTextColor, String btnBorderColor,\n+ String btnBorderRadius) {\n+\n+ this.text = btnText != null ? btnText : \"\";\n+ this.backgroundColor = btnBackgroundColor != null ? btnBackgroundColor\n+ : Constants.BLUE;\n+ this.textColor = btnTextColor != null ? btnTextColor : Constants.BLUE;\n+ this.borderColor = btnBorderColor !=null ? btnBorderColor : Constants.WHITE;\n+ this.borderRadius = btnBorderRadius != null ? btnBorderRadius : \"2\";//Adding default value as 2 instead of an empty value.\n+ // If the value is empty then action btn defaults to standard btn without any customizations\nreturn this;\n}\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTLocalInAppSettings.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.inapp;\n-\n-import java.util.Objects;\n-\n-public class CTLocalInAppSettings {\n-\n-\n- public static final class Builder {\n- private String inAppAlertType;\n- private String titleText;\n- private String bodyText;\n- private String positiveConfirmationBtnText;\n- private String negativeConfirmationBtnText;\n- private String positiveConfirmationBtnColor;\n-\n- public Builder() {\n- }\n-\n- public CTLocalInAppSettings build(){\n- return new CTLocalInAppSettings(this);\n- }\n-\n- public CTLocalInAppSettings.Builder setInAppAlertType(String inAppAlertType) {\n- this.inAppAlertType = inAppAlertType;\n- return this;\n- }\n-\n- public CTLocalInAppSettings.Builder setTitleText(String titleText){\n- this.titleText = titleText;\n- return this;\n- }\n-\n- public CTLocalInAppSettings.Builder setBodyText(String bodyText){\n- this.bodyText = bodyText;\n- return this;\n- }\n-\n- public CTLocalInAppSettings.Builder setPositiveConfirmationBtnText(String positiveConfirmationBtnText){\n- this.positiveConfirmationBtnText = positiveConfirmationBtnText;\n- return this;\n- }\n-\n- public CTLocalInAppSettings.Builder setNegativeConfirmationBtnText(String negativeConfirmationBtnText){\n- this.negativeConfirmationBtnText = negativeConfirmationBtnText;\n- return this;\n- }\n-\n- public CTLocalInAppSettings.Builder setPositiveConfirmationBtnColor(String positiveConfirmationBtnColor){\n- this.positiveConfirmationBtnColor = positiveConfirmationBtnColor;\n- return this;\n- }\n- }\n-\n- private final String inAppAlertType;\n- private final String titleText;\n- private final String bodyText;\n- private final String positiveConfirmationBtnText;\n- private final String negativeConfirmationBtnText;\n- private final String positiveConfirmationBtnColor;\n-\n- private CTLocalInAppSettings(Builder builder) {\n- inAppAlertType = builder.inAppAlertType;\n- titleText = builder.titleText;\n- bodyText = builder.bodyText;\n- positiveConfirmationBtnText = builder.positiveConfirmationBtnText;\n- negativeConfirmationBtnText = builder.negativeConfirmationBtnText;\n- positiveConfirmationBtnColor = builder.positiveConfirmationBtnColor;\n- }\n-\n- @Override\n- public boolean equals(Object o) {\n- if (this == o) return true;\n- if (o == null || getClass() != o.getClass()) return false;\n- CTLocalInAppSettings that = (CTLocalInAppSettings) o;\n- return Objects.equals(inAppAlertType, that.inAppAlertType) && Objects.equals(titleText, that.titleText)\n- && Objects.equals(bodyText, that.bodyText) &&\n- Objects.equals(positiveConfirmationBtnText, that.positiveConfirmationBtnText)\n- && Objects.equals(negativeConfirmationBtnText, that.negativeConfirmationBtnText)\n- && Objects.equals(positiveConfirmationBtnColor, that.positiveConfirmationBtnColor);\n- }\n-\n- @Override\n- public int hashCode() {\n- return super.hashCode();\n- }\n-\n- public String getInAppAlertType() {\n- return inAppAlertType;\n- }\n-\n- public String getTitleText() {\n- return titleText;\n- }\n-\n- public String getBodyText() {\n- return bodyText;\n- }\n-\n- public String getPositiveConfirmationBtnText() {\n- return positiveConfirmationBtnText;\n- }\n-\n- public String getNegativeConfirmationBtnText() {\n- return negativeConfirmationBtnText;\n- }\n-\n- public String getPositiveConfirmationBtnColor() {\n- return positiveConfirmationBtnColor;\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -15,6 +15,7 @@ import com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.ControllerManager;\nimport com.clevertap.android.sdk.CoreMetaData;\n+import com.clevertap.android.sdk.DeviceInfo;\nimport com.clevertap.android.sdk.InAppNotificationActivity;\nimport com.clevertap.android.sdk.InAppNotificationListener;\nimport com.clevertap.android.sdk.Logger;\n@@ -47,7 +48,8 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nprivate JSONObject jsonObject;\n- private CTLocalInAppSettings ctLocalInAppSettings;\n+ private CTHalfInterstitialLocalInAppBuilder halfInterstitialLocalInAppBuilder;\n+ private CTAlertLocalInAppBuilder alertLocalInAppBuilder;\nprivate final boolean videoSupport = Utils.haveVideoPlayerSupport;\n@@ -56,9 +58,16 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nthis.jsonObject = jsonObject;\n}\n- NotificationPrepareRunnable(InAppController inAppController, CTLocalInAppSettings ctLocalInAppSettings) {\n+ NotificationPrepareRunnable(InAppController inAppController,\n+ CTHalfInterstitialLocalInAppBuilder halfInterstitialLocalInAppBuilder) {\nthis.inAppControllerWeakReference = new WeakReference<>(inAppController);\n- this.ctLocalInAppSettings = ctLocalInAppSettings;\n+ this.halfInterstitialLocalInAppBuilder = halfInterstitialLocalInAppBuilder;\n+ }\n+\n+ NotificationPrepareRunnable(InAppController inAppController,\n+ CTAlertLocalInAppBuilder alertLocalInAppBuilder) {\n+ this.inAppControllerWeakReference = new WeakReference<>(inAppController);\n+ this.alertLocalInAppBuilder = alertLocalInAppBuilder;\n}\n@Override\n@@ -68,8 +77,12 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\ninAppNotification = new CTInAppNotification()\n.initWithJSON(jsonObject, videoSupport);\n}else {//render in-app via local in-app builder\n- inAppNotification = new CTInAppNotification()\n- .configureWithLocalData(ctLocalInAppSettings);\n+ inAppNotification = halfInterstitialLocalInAppBuilder != null ? new CTInAppNotification()\n+ .configureHalfInterstitialLocalInApp(halfInterstitialLocalInAppBuilder,\n+ DeviceInfo.getDeviceType(context)) :\n+ new CTInAppNotification()\n+ .configureAlertLocalInApp(alertLocalInAppBuilder,\n+ DeviceInfo.getDeviceType(context));\n}\nif (inAppNotification.getError() != null) {\n@@ -184,8 +197,12 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\n}\n- public void promptPushPrimer(CTLocalInAppSettings ctLocalInAppSettings) {//Change method name here to avoid confusion\n- prepareNotificationForDisplay(ctLocalInAppSettings);\n+ public void promptPushPrimer(CTHalfInterstitialLocalInAppBuilder halfInterstitialLocalInAppBuilder){\n+ prepareNotificationForDisplay(halfInterstitialLocalInAppBuilder,null);\n+ }\n+\n+ public void promptPushPrimer(CTAlertLocalInAppBuilder alertLocalInAppBuilder){\n+ prepareNotificationForDisplay(null,alertLocalInAppBuilder);\n}\npublic void promptPermission(){\n@@ -470,13 +487,20 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n});\n}\n- private void prepareNotificationForDisplay(final CTLocalInAppSettings ctLocalInAppSettings) {\n- logger.debug(config.getAccountId(), \"Preparing local In-App using CTLocalInAppSettings for display\");//Need correct error mssg\n+ private void prepareNotificationForDisplay(CTHalfInterstitialLocalInAppBuilder\n+ halfInterstitialLocalInAppBuilder, CTAlertLocalInAppBuilder alertLocalInAppBuilder){\n+ logger.debug(config.getAccountId(), \"Preparing local In-App for display\");\nTask<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask(Constants.TAG_FEATURE_IN_APPS);\n- task.execute(\"InappController#prepareNotificationForDisplay\", new Callable<Void>() {\n+ task.execute(\"InappController#prepareLocalNotificationForDisplay\", new Callable<Void>() {\n@Override\npublic Void call() {\n- new NotificationPrepareRunnable(InAppController.this, ctLocalInAppSettings).run();\n+ if (halfInterstitialLocalInAppBuilder != null) {\n+ new NotificationPrepareRunnable(InAppController.this,\n+ halfInterstitialLocalInAppBuilder).run();\n+ }else if (alertLocalInAppBuilder != null){\n+ new NotificationPrepareRunnable(InAppController.this,\n+ alertLocalInAppBuilder).run();\n+ }\nreturn null;\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "@@ -7,7 +7,8 @@ import androidx.lifecycle.ViewModel\nimport com.clevertap.android.sdk.CTInboxStyleConfig\nimport com.clevertap.android.sdk.CleverTapAPI\nimport com.clevertap.android.sdk.Constants\n-import com.clevertap.android.sdk.inapp.CTLocalInAppSettings\n+import com.clevertap.android.sdk.inapp.CTAlertLocalInAppBuilder\n+import com.clevertap.android.sdk.inapp.CTHalfInterstitialLocalInAppBuilder\nimport java.util.*\nclass HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel() {\n@@ -324,23 +325,29 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\n\"918\"-> cleverTapAPI?.pushEvent(\"Send Input Box Reminder DOC false\")\n\"919\"-> cleverTapAPI?.pushEvent(\"Send Three CTA Notification\")\n\"100\"-> {\n- val builder = CTLocalInAppSettings.Builder().setTitleText(\"Get Notified\")\n- .setInAppAlertType(\"half-interstitial\")\n- .setBodyText(\"Please enable notifications on your device to use Push Notifications.\")\n- .setPositiveConfirmationBtnText(\"Allow\")\n- .setNegativeConfirmationBtnText(\"Cancel\")\n- .setPositiveConfirmationBtnColor(Constants.LIGHT_BLUE).build()//Add image,inapp type\n- cleverTapAPI?.promptPushPrimer(builder)\n+ val builder = CTHalfInterstitialLocalInAppBuilder.builder()\n+ .titleText(\"Get Notified\")\n+ .titleTextColor(Constants.WHITE)\n+ .bodyText(\"Please enable notifications on your device to use Push Notifications.\")\n+ .bodyTextColor(Constants.WHITE)\n+ .backgroundColor(Constants.BLACK)\n+ .followDeviceOrientation(false)\n+ .positiveBtnText(\"Allow\")\n+ .negativeBtnText(\"Cancel\")\n+ .btnTextColor(Constants.WHITE)\n+ .btnBackgroundColor(Constants.LIGHT_BLUE)\n+ .build()\n+ cleverTapAPI?.promptHalfInterstitialPushPrimer(builder)\n}\n\"101\"->{\n- val builder = CTLocalInAppSettings.Builder().setTitleText(\"Get Notified\")\n- .setInAppAlertType(\"alert-template\")\n- .setBodyText(\"Please enable notifications on your device to use Push Notifications.\")\n- .setPositiveConfirmationBtnText(\"Allow\")\n- .setNegativeConfirmationBtnText(\"Cancel\")\n- .setPositiveConfirmationBtnColor(Constants.LIGHT_BLUE).build()//Add image,inapp type\n- cleverTapAPI?.promptPushPrimer(builder)\n+ val builder = CTAlertLocalInAppBuilder.builder().titleText(\"Get Notified\")\n+ .bodyText(\"Please enable notifications on your device to use Push Notifications.\")\n+ .followDeviceOrientation(true)\n+ .positiveBtnText(\"Allow\")\n+ .negativeBtnText(\"Cancel\")\n+ .build()\n+ cleverTapAPI?.promptAlertPushPrimer(builder)\n}\n\"102\"->{\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1970)-Refactor local in-app builder to use mandatory/optional parameters |
116,616 | 27.09.2022 11:40:24 | -19,080 | 8cf6f096df61e45d94edd7319120a8d6121f825c | task(SDK-1970)-Refactor half-interstitial builder, add support for image support in local IAM | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTHalfInterstitialLocalInAppBuilder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTHalfInterstitialLocalInAppBuilder.java",
"diff": "@@ -19,31 +19,32 @@ public class CTHalfInterstitialLocalInAppBuilder {\nprivate final String btnBackgroundColor;\nprivate final String btnBorderColor;// Optional\nprivate final String btnBorderRadius;// Optional\n- private boolean doesSupportTablet;\n-\n- CTHalfInterstitialLocalInAppBuilder(Builder.Builder1 builder) {\n- this.titleText = builder.titleText;\n- this.titleTextColor = builder.titleTextColor;\n- this.bodyText = builder.bodyText;\n- this.bodyTextColor = builder.bodyTextColor;\n- this.backgroundColor = builder.backgroundColor;\n- this.followDeviceOrientation = builder.followDeviceOrientation;\n- this.positiveBtnText = builder.positiveBtnText;\n- this.negativeBtnText = builder.negativeBtnText;\n- this.btnTextColor = builder.btnTextColor;\n- this.btnBackgroundColor = builder.btnBackgroundColor;\n- this.btnBorderColor = builder.btnBorderColor;\n- this.btnBorderRadius = builder.btnBorderRadius;\n+ private final String image;// Optional\n+\n+ CTHalfInterstitialLocalInAppBuilder(Builder.LocalInAppBuilder localInAppBuilder) {\n+ this.titleText = localInAppBuilder.titleText;\n+ this.titleTextColor = localInAppBuilder.titleTextColor;\n+ this.bodyText = localInAppBuilder.bodyText;\n+ this.bodyTextColor = localInAppBuilder.bodyTextColor;\n+ this.backgroundColor = localInAppBuilder.backgroundColor;\n+ this.followDeviceOrientation = localInAppBuilder.followDeviceOrientation;\n+ this.positiveBtnText = localInAppBuilder.positiveBtnText;\n+ this.negativeBtnText = localInAppBuilder.negativeBtnText;\n+ this.btnTextColor = localInAppBuilder.btnTextColor;\n+ this.btnBackgroundColor = localInAppBuilder.btnBackgroundColor;\n+ this.btnBorderColor = localInAppBuilder.btnBorderColor;\n+ this.btnBorderRadius = localInAppBuilder.btnBorderRadius;\n+ this.image = localInAppBuilder.image;\n}\npublic static Builder builder() {\nreturn new Builder();\n}\npublic static final class Builder {\n- public Builder1 titleText(String titleText) {\n- return new Builder1(titleText);\n+ public LocalInAppBuilder titleText(String titleText) {\n+ return new LocalInAppBuilder(titleText);\n}\n- public static final class Builder1 {\n+ public static final class LocalInAppBuilder {\nfinal String titleText;\nString titleTextColor;\nString bodyText;\n@@ -56,114 +57,119 @@ public class CTHalfInterstitialLocalInAppBuilder {\nString btnBackgroundColor;\nString btnBorderColor;\nString btnBorderRadius;\n+ String image;\n- private Builder1(String titleText) {\n+ private LocalInAppBuilder(String titleText) {\nthis.titleText = titleText;\n}\n- public Builder2 titleTextColor(String titleTextColor) {\n+ public TitleTextColorBuilder titleTextColor(String titleTextColor) {\nthis.titleTextColor = titleTextColor;\n- return new Builder2(Builder1.this);\n+ return new TitleTextColorBuilder(LocalInAppBuilder.this);\n}\n}\n- public static final class Builder2 {\n- final Builder1 builder;\n+ public static final class TitleTextColorBuilder {\n+ final LocalInAppBuilder builder;\n- private Builder2(Builder1 builder) {\n+ private TitleTextColorBuilder(LocalInAppBuilder builder) {\nthis.builder = builder;\n}\n- public Builder3 bodyText(String bodyText) {\n+ public BodyTextBuilder bodyText(String bodyText) {\nthis.builder.bodyText = bodyText;\n- return new Builder3(this.builder);\n+ return new BodyTextBuilder(this.builder);\n}\n}\n- public static final class Builder3 {\n- final Builder1 builder;\n+ public static final class BodyTextBuilder {\n+ final LocalInAppBuilder builder;\n- private Builder3(Builder1 builder) {\n+ private BodyTextBuilder(LocalInAppBuilder builder) {\nthis.builder = builder;\n}\n- public Builder4 bodyTextColor(String bodyTextColor) {\n+ public BodyTextColorBuilder bodyTextColor(String bodyTextColor) {\nthis.builder.bodyTextColor = bodyTextColor;\n- return new Builder4(this.builder);\n+ return new BodyTextColorBuilder(this.builder);\n}\n}\n- public static final class Builder4 {\n- final Builder1 builder;\n+ public static final class BodyTextColorBuilder {\n+ final LocalInAppBuilder builder;\n- private Builder4(Builder1 builder) {\n+ private BodyTextColorBuilder(LocalInAppBuilder builder) {\nthis.builder = builder;\n}\n- public Builder5 backgroundColor(String backgroundColor) {\n+ public BackgroundColorBuilder backgroundColor(String backgroundColor) {\nthis.builder.backgroundColor = backgroundColor;\n- return new Builder5(this.builder);\n+ return new BackgroundColorBuilder(this.builder);\n}\n}\n- public static final class Builder5 {\n- final Builder1 builder;\n+ public static final class BackgroundColorBuilder {\n+ final LocalInAppBuilder builder;\n- private Builder5(Builder1 builder) {\n+ private BackgroundColorBuilder(LocalInAppBuilder builder) {\nthis.builder = builder;\n}\n- public Builder6 followDeviceOrientation(boolean followDeviceOrientation) {\n+ public FollowDeviceOrientationBuilder followDeviceOrientation(boolean followDeviceOrientation) {\nthis.builder.followDeviceOrientation = followDeviceOrientation;\n- return new Builder6(this.builder);\n+ return new FollowDeviceOrientationBuilder(this.builder);\n}\n}\n- public static final class Builder6 {\n- final Builder1 builder;\n+ public static final class FollowDeviceOrientationBuilder {\n+ final LocalInAppBuilder builder;\n- private Builder6(Builder1 builder) {\n+ private FollowDeviceOrientationBuilder(LocalInAppBuilder builder) {\nthis.builder = builder;\n}\n- public Builder7 positiveBtnText(String positiveBtnText) {\n+ public PositiveBtnTextBuilder positiveBtnText(String positiveBtnText) {\nthis.builder.positiveBtnText = positiveBtnText;\n- return new Builder7(this.builder);\n+ return new PositiveBtnTextBuilder(this.builder);\n}\n}\n- public static final class Builder7 {\n- final Builder1 builder;\n+ public static final class PositiveBtnTextBuilder {\n+ final LocalInAppBuilder builder;\n- private Builder7(Builder1 builder) {\n+ private PositiveBtnTextBuilder(LocalInAppBuilder builder) {\nthis.builder = builder;\n}\n- public Builder8 negativeBtnText(String negativeBtnText) {\n+ public NegativeBtnTextBuilder negativeBtnText(String negativeBtnText) {\nthis.builder.negativeBtnText = negativeBtnText;\n- return new Builder8(this.builder);\n+ return new NegativeBtnTextBuilder(this.builder);\n}\n}\n- public static final class Builder8 {\n- final Builder1 builder;\n+ public static final class NegativeBtnTextBuilder {\n+ final LocalInAppBuilder builder;\n- private Builder8(Builder1 builder) {\n+ private NegativeBtnTextBuilder(LocalInAppBuilder builder) {\nthis.builder = builder;\n}\n- public Builder9 btnTextColor(String btnTextColor) {\n+ public BtnTextColorBuilder btnTextColor(String btnTextColor) {\nthis.builder.btnTextColor = btnTextColor;\n- return new Builder9(this.builder);\n+ return new BtnTextColorBuilder(this.builder);\n}\n}\n- public static final class Builder9 {\n- final Builder1 builder;\n+ public static final class BtnTextColorBuilder {\n+ final LocalInAppBuilder builder;\n- private Builder9(Builder1 builder) {\n+ private BtnTextColorBuilder(LocalInAppBuilder builder) {\nthis.builder = builder;\n}\n- public Builder10 btnBackgroundColor(String btnBackgroundColor) {\n+ public LocalInAppOptionalBuilder btnBackgroundColor(String btnBackgroundColor) {\nthis.builder.btnBackgroundColor = btnBackgroundColor;\n- return new Builder10(this.builder);\n+ return new LocalInAppOptionalBuilder(this.builder);\n}\n}\n- public static final class Builder10 {\n- final Builder1 builder;\n+ public static final class LocalInAppOptionalBuilder {\n+ final LocalInAppBuilder builder;\n- private Builder10(Builder1 builder) {\n+ private LocalInAppOptionalBuilder(LocalInAppBuilder builder) {\nthis.builder = builder;\n}\n- public Builder10 btnBorderColor(String btnBorderColor){\n+ public LocalInAppOptionalBuilder image(String image){\n+ this.builder.image = image;\n+ return this;\n+ }\n+ public LocalInAppOptionalBuilder btnBorderColor(String btnBorderColor){\nthis.builder.btnBorderColor = btnBorderColor;\nreturn this;\n}\n- public Builder10 btnBorderRadius(String btnBorderRadius){\n+ public LocalInAppOptionalBuilder btnBorderRadius(String btnBorderRadius){\nthis.builder.btnBorderRadius = btnBorderRadius;\nreturn this;\n}\n@@ -203,6 +209,9 @@ public class CTHalfInterstitialLocalInAppBuilder {\npublic String btnBackgroundColor() {\nreturn this.btnBackgroundColor;\n}\n+ public String image() {\n+ return this.image;\n+ }\npublic String btnBorderColor() {\nreturn this.btnBorderColor;\n}\n@@ -219,7 +228,8 @@ public class CTHalfInterstitialLocalInAppBuilder {\nthis.followDeviceOrientation + \", positiveBtnText=\" + this.positiveBtnText +\n\", negativeBtnText=\" + this.negativeBtnText + \", btnTextColor=\" +\nthis.btnTextColor + \", btnBackgroundColor=\" + this.btnBackgroundColor +\n- \", btnBorderColor=\" + this.btnBorderColor + \", btnBorderRadius=\" + this.btnBorderRadius + \")\";\n+ \", image=\" + this.image + \", btnBorderColor=\" + this.btnBorderColor +\n+ \", btnBorderRadius=\" + this.btnBorderRadius + \")\";\n}\n@Override\n@@ -235,6 +245,7 @@ public class CTHalfInterstitialLocalInAppBuilder {\nObjects.equals(negativeBtnText, that.negativeBtnText) &&\nObjects.equals(btnTextColor, that.btnTextColor) &&\nObjects.equals(btnBackgroundColor, that.btnBackgroundColor) &&\n+ Objects.equals(image, that.image) &&\nObjects.equals(btnBorderColor, that.btnBorderColor) &&\nObjects.equals(btnBorderRadius, that.btnBorderRadius);\n}\n@@ -243,6 +254,6 @@ public class CTHalfInterstitialLocalInAppBuilder {\npublic int hashCode() {\nreturn Objects.hash(titleText, titleTextColor, bodyText, bodyTextColor, backgroundColor,\nfollowDeviceOrientation, positiveBtnText, negativeBtnText, btnTextColor,\n- btnBackgroundColor, btnBorderColor, btnBorderRadius);\n+ btnBackgroundColor, image, btnBorderColor, btnBorderRadius);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"diff": "@@ -606,9 +606,6 @@ public class CTInAppNotification implements Parcelable {\npublic CTInAppNotification configureHalfInterstitialLocalInApp (CTHalfInterstitialLocalInAppBuilder\nhalfInterstitialLocalInAppBuilder, int deviceInfo){\n- //check how many times have they called via local builder.\n-// boolean,count TODO\n-\nthis.id = \"\";\nthis.campaignId = \"\";\nthis.type = HALF_INTERSTITIAL_LOCAL_IN_APP;\n@@ -644,10 +641,9 @@ public class CTInAppNotification implements Parcelable {\nthis.hideCloseButton = true;\n-\n- //CTINAPPNOTIFMedia obj//1.local image in case of offline//TODO\n- //2.support for URI\n- //3. In case of failure in loading img should we load a placeholder img in layout.\n+ if (halfInterstitialLocalInAppBuilder.image() != null){\n+ setupInAppMediaImage(halfInterstitialLocalInAppBuilder.image());\n+ }\nsetupInAppActionButtons(halfInterstitialLocalInAppBuilder.positiveBtnText(),\nhalfInterstitialLocalInAppBuilder.negativeBtnText(),\n@@ -659,6 +655,20 @@ public class CTInAppNotification implements Parcelable {\nreturn this;\n}\n+ private void setupInAppMediaImage(String imageUrl) {\n+ CTInAppNotificationMedia portraitMedia = new CTInAppNotificationMedia()\n+ .initWithLocalData(imageUrl, Configuration.ORIENTATION_PORTRAIT);\n+ if (portraitMedia != null) {\n+ mediaList.add(portraitMedia);\n+ }\n+\n+ CTInAppNotificationMedia landscapeMedia = new CTInAppNotificationMedia()\n+ .initWithLocalData(imageUrl, Configuration.ORIENTATION_LANDSCAPE);\n+ if (landscapeMedia != null) {\n+ mediaList.add(landscapeMedia);\n+ }\n+ }\n+\nprivate void setupInAppActionButtons(String positiveBtnText, String negativeBtnText,\nString btnBackgroundColor,\nString btnTextColor, String btnBorderColor,\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationMedia.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationMedia.java",
"diff": "@@ -102,6 +102,20 @@ public class CTInAppNotificationMedia implements Parcelable {\n}\n}\n+ CTInAppNotificationMedia initWithLocalData(String imgURI, int orientation) {\n+ this.orientation = orientation;\n+ this.contentType = \"image\";\n+ if (!imgURI.isEmpty()) {\n+ this.mediaUrl = imgURI;\n+ this.cacheKey = UUID.randomUUID().toString();\n+ }\n+ if (contentType.isEmpty()) {\n+ return null;\n+ } else {\n+ return this;\n+ }\n+ }\n+\nboolean isAudio() {\nString contentType = this.getContentType();\nreturn contentType != null && this.mediaUrl != null && contentType.startsWith(\"audio\");\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "@@ -327,15 +327,16 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\n\"100\"-> {\nval builder = CTHalfInterstitialLocalInAppBuilder.builder()\n.titleText(\"Get Notified\")\n- .titleTextColor(Constants.WHITE)\n+ .titleTextColor(Constants.BLACK)\n.bodyText(\"Please enable notifications on your device to use Push Notifications.\")\n- .bodyTextColor(Constants.WHITE)\n- .backgroundColor(Constants.BLACK)\n- .followDeviceOrientation(false)\n+ .bodyTextColor(Constants.BLACK)\n+ .backgroundColor(Constants.WHITE)\n+ .followDeviceOrientation(true)\n.positiveBtnText(\"Allow\")\n.negativeBtnText(\"Cancel\")\n.btnTextColor(Constants.WHITE)\n.btnBackgroundColor(Constants.LIGHT_BLUE)\n+ .image(\"https://icons.iconarchive.com/icons/treetog/junior/64/camera-icon.png\")\n.build()\ncleverTapAPI?.promptHalfInterstitialPushPrimer(builder)\n}\n@@ -343,7 +344,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\n\"101\"->{\nval builder = CTAlertLocalInAppBuilder.builder().titleText(\"Get Notified\")\n.bodyText(\"Please enable notifications on your device to use Push Notifications.\")\n- .followDeviceOrientation(true)\n+ .followDeviceOrientation(false)\n.positiveBtnText(\"Allow\")\n.negativeBtnText(\"Cancel\")\n.build()\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1970)-Refactor half-interstitial builder, add support for image support in local IAM |
116,620 | 29.09.2022 12:39:41 | -19,080 | bde0f11736818cc5fd87fa2b42270c819f02764b | ConfigurableIdentityRepo test part 1 | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/login/ConfigurableIdentityRepoTest.kt",
"diff": "+package com.clevertap.android.sdk.login\n+\n+import android.content.Context\n+import com.clevertap.android.sdk.CleverTapInstanceConfig\n+import com.clevertap.android.sdk.Constants\n+import com.clevertap.android.sdk.CoreMetaData\n+import com.clevertap.android.sdk.DeviceInfo\n+import com.clevertap.android.sdk.validation.ValidationResultStack\n+import com.clevertap.android.shared.test.BaseTestCase\n+import org.junit.Assert\n+import org.junit.Test\n+import org.mockito.Mockito\n+import java.util.*\n+\n+class ConfigurableIdentityRepoTest:BaseTestCase() {\n+ private lateinit var configurableIdentityRepo: ConfigurableIdentityRepo\n+\n+ private lateinit var config: CleverTapInstanceConfig\n+ private lateinit var deviceInfo: DeviceInfo\n+ private lateinit var coreMetaData: CoreMetaData\n+ private lateinit var validationStack :ValidationResultStack\n+ private lateinit var loginInfoProvider: LoginInfoProvider\n+\n+\n+\n+ override fun setUp() {\n+ super.setUp()\n+ // using spy everywhere to easily provide a custom value when <someDependency>.publicGetter() is called\n+ coreMetaData = Mockito.spy(CoreMetaData())\n+ config = Mockito.spy(CleverTapInstanceConfig.createInstance(appCtx, \"id\", \"token\", \"region\"))\n+ deviceInfo = Mockito.spy(DeviceInfo(appCtx,config,\"clevertap_id\",coreMetaData))\n+ loginInfoProvider = Mockito.spy(LoginInfoProvider(appCtx,config,deviceInfo))\n+ validationStack = Mockito.spy(ValidationResultStack())\n+// configurableIdentityRepo = ConfigurableIdentityRepo(appCtx,config,loginInfoProvider,validationStack)\n+\n+ }\n+\n+\n+ /**\n+ * Loads the identity set:\n+ *\n+ * 1. create IdentitySet1 : 'prefKeySet'\n+ * |-- 1.1. A string is provided by loginInfoProvider.getCachedIdentityKeysForAccount()\n+ * |-- 1.2 This string is of format \"__,__,__etc\" and is split by ',' .the new list is filtered for wrong keys and finally used to create 'prefKeySet'\n+ *\n+ * 2. create IdentitySet2 : 'configKeySet'\n+ * |-- 2.1 A string array is provided by config.getIdentityKeys()\n+ * |-- 2.2 this array is filtered for wrong keys and finally used to create 'configKeySet'\n+ *\n+ * <note>: the validation critieria is that keyset must not be empty</note>\n+ *\n+ * 3. validate sets : handleError(prefKeySet, configKeySet);\n+ * |-- 3.1 : if prefKeySet.isValid() && configKeySet.isValid() && !prefKeySet.equals(configKeySet), it will generate a validation error on vr stack passed via external dependency\n+ *\n+ *\n+ * 4. setting identity set\n+ * |-- 4.1 identitySet = prefkeyset(if prefKeySet.isValid())\n+ * |-- 4.2 identitySet = configkeyset(if configKeySet.isValid()) or\n+ * |-- 4.3 (if above 2 doesn't apply) identitySet =IdentitySet.getDefault() = ['Identity','Email']\n+ *\n+ * 5. if (!prefKeySet.isValid() ) loginInfoProvider.saveIdentityKeysForAccount(identitySet) is also called on the newly initialised identitySet\n+ */\n+\n+ @Test\n+ fun getIdentitySet_when_ABC_should_XYZ(){\n+ val keys = arrayOf(Constants.TYPE_IDENTITY)\n+ Mockito.`when`(loginInfoProvider.cachedIdentityKeysForAccount).thenReturn(keys.joinToString(\",\"))\n+ Mockito.`when`(config.identityKeys).thenReturn(keys)\n+ configurableIdentityRepo = ConfigurableIdentityRepo(appCtx,config,loginInfoProvider,validationStack)\n+\n+ val result = configurableIdentityRepo.identitySet\n+ println(\"final result=== ${result.toString()}\")\n+ Assert.assertEquals(true,result.isValid)\n+ Assert.assertEquals(true,result.contains(Constants.TYPE_IDENTITY))\n+// Assert.assertEquals(true,result.contains(Constants.TYPE_PHONE))\n+ }\n+ @Test\n+ fun getIdentitySet2_when_ABC_should_XYZ(){\n+ configurableIdentityRepo.identitySet\n+ }\n+\n+\n+// @Test\n+// fun hasIdentity_when_ABC_should_XYZ(){\n+// configurableIdentityRepo.hasIdentity(\"key\")\n+// }\n+//\n+// @Test\n+// fun loadIdentitySet_when_ABC_should_XYZ(){\n+// configurableIdentityRepo.loadIdentitySet()\n+// }\n+}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2225] ConfigurableIdentityRepo test part 1 |
116,616 | 29.09.2022 13:29:07 | -19,080 | b29fb47d04624bdcc20f3a0d55e4bce1a54cac59 | task(SDK-1970)-Add public method to check notification permission status | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk;\nimport static android.content.Context.NOTIFICATION_SERVICE;\nimport static com.clevertap.android.sdk.Utils.getDCDomain;\n+import static com.clevertap.android.sdk.Utils.isAndroid13;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.FCM_LOG_TAG;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.PushType.FCM;\n@@ -1034,29 +1035,36 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n+ public boolean isNotificationPermissionGranted(){\n+ if (isAndroid13(context)) {\n+ return coreState.getInAppController().isNotificationPermissionGranted();\n+ }else{\n+ return false;\n+ }\n+ }\n+\npublic void promptHalfInterstitialPushPrimer(CTHalfInterstitialLocalInAppBuilder\nhalfInterstitialLocalInAppBuilder){\n+ if (isAndroid13(context)) {\ncoreState.getInAppController().promptPushPrimer(halfInterstitialLocalInAppBuilder);\n+ }else{\n+ Logger.v(\"Ensure your app support Android 13 to verify permission access for notifications.\");\n+ }\n}\npublic void promptAlertPushPrimer(CTAlertLocalInAppBuilder alertLocalInAppBuilder){\n+ if (isAndroid13(context)) {\ncoreState.getInAppController().promptPushPrimer(alertLocalInAppBuilder);\n+ }else{\n+ Logger.v(\"Ensure your app support Android 13 to verify permission access for notifications.\");\n}\n-\n- public void promptForNotificationPermission(){\n- if (instances == null) {\n- return;\n}\n- for (String accountId : CleverTapAPI.instances.keySet()) {\n- CleverTapAPI instance = CleverTapAPI.instances.get(accountId);\n- try {\n- if (instance != null) {\n- instance.coreState.getInAppController().promptPermission();\n- }\n- } catch (Throwable t) {\n- // Ignore\n- }\n+ public void promptForNotificationPermission(){\n+ if (isAndroid13(context)){//TODO check for multi instance support\n+ coreState.getInAppController().promptPermission();\n+ }else{\n+ Logger.v(\"Ensure your app support Android 13 to verify permission access for notifications.\");\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk;\nimport static com.clevertap.android.sdk.Utils.isAndroid13;\n+import android.Manifest;\nimport android.app.Activity;\nimport android.app.AlertDialog;\nimport android.content.Context;\n@@ -14,7 +15,9 @@ import android.os.Bundle;\nimport android.view.WindowManager;\nimport androidx.annotation.NonNull;\n+import androidx.annotation.RequiresApi;\nimport androidx.core.app.ActivityCompat;\n+import androidx.core.content.ContextCompat;\nimport androidx.fragment.app.FragmentActivity;\nimport com.clevertap.android.sdk.inapp.AlertDialogPromptForSettings;\n@@ -235,6 +238,12 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\n}\n+ @RequiresApi(api = 33)\n+ public static int isNotificationPermissionGranted(Activity activity){\n+ return ContextCompat.checkSelfPermission(\n+ activity, Manifest.permission.POST_NOTIFICATIONS);\n+ }\n+\nvoid didDismiss(Bundle data) {\nif (isAlertVisible) {\nisAlertVisible = false;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -4,8 +4,11 @@ import android.app.Activity;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.SharedPreferences;\n+import android.content.pm.PackageManager;\nimport android.os.Bundle;\nimport android.os.Looper;\n+\n+import androidx.annotation.RequiresApi;\nimport androidx.fragment.app.Fragment;\nimport androidx.fragment.app.FragmentActivity;\nimport androidx.fragment.app.FragmentTransaction;\n@@ -210,6 +213,13 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nconfig);\n}\n+ @RequiresApi(api = 33)\n+ public boolean isNotificationPermissionGranted(){\n+ int permissionStatus = InAppNotificationActivity.isNotificationPermissionGranted(\n+ Objects.requireNonNull(CoreMetaData.getCurrentActivity()));\n+ return permissionStatus == PackageManager.PERMISSION_GRANTED;\n+ }\n+\npublic void discardInApps() {\nthis.inAppState = InAppState.DISCARDED;\nlogger.verbose(config.getAccountId(), \"InAppState is DISCARDED\");\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "@@ -325,6 +325,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\n\"918\"-> cleverTapAPI?.pushEvent(\"Send Input Box Reminder DOC false\")\n\"919\"-> cleverTapAPI?.pushEvent(\"Send Three CTA Notification\")\n\"100\"-> {\n+ if (cleverTapAPI?.isNotificationPermissionGranted == false){\nval builder = CTHalfInterstitialLocalInAppBuilder.builder()\n.titleText(\"Get Notified\")\n.titleTextColor(Constants.BLACK)\n@@ -336,19 +337,26 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\n.negativeBtnText(\"Cancel\")\n.btnTextColor(Constants.WHITE)\n.btnBackgroundColor(Constants.LIGHT_BLUE)\n- .image(\"https://icons.iconarchive.com/icons/treetog/junior/64/camera-icon.png\")\n+ /*.image(\"https://icons.iconarchive.com/icons/treetog/junior/64/camera-icon.png\")*/\n.build()\n- cleverTapAPI?.promptHalfInterstitialPushPrimer(builder)\n+ cleverTapAPI.promptHalfInterstitialPushPrimer(builder)\n+ }else{\n+ Log.v(\"HomeScreenViewModel\",\"Notification permission is already granted.\")\n+ }\n}\n\"101\"->{\n+ if (cleverTapAPI?.isNotificationPermissionGranted == false) {\nval builder = CTAlertLocalInAppBuilder.builder().titleText(\"Get Notified\")\n.bodyText(\"Please enable notifications on your device to use Push Notifications.\")\n.followDeviceOrientation(false)\n.positiveBtnText(\"Allow\")\n.negativeBtnText(\"Cancel\")\n.build()\n- cleverTapAPI?.promptAlertPushPrimer(builder)\n+ cleverTapAPI.promptAlertPushPrimer(builder)\n+ }else{\n+ Log.v(\"HomeScreenViewModel\",\"Notification permission is already granted.\")\n+ }\n}\n\"102\"->{\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1970)-Add public method to check notification permission status |
116,620 | 29.09.2022 14:39:32 | -19,080 | cafce2e60f67b92c16788939e13845cf045a906e | ConfigurableIdentityRepo test part 2/2 | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -487,7 +487,8 @@ public class DeviceInfo {\nreturn sDeviceType;\n}\n- DeviceInfo(Context context, CleverTapInstanceConfig config, String cleverTapID,\n+ @RestrictTo(Scope.LIBRARY)\n+ public DeviceInfo(Context context, CleverTapInstanceConfig config, String cleverTapID,\nCoreMetaData coreMetaData) {\nthis.context = context;\nthis.config = config;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"diff": "@@ -38,6 +38,41 @@ public final class StorageHelper {\n}\n}\n+ /*\n+\n+ public static String getStringFromPrefs(@NonNull Context context,@NonNull CleverTapInstanceConfig config, String rawKey,\n+ String defaultValue) {\n+ // 2a1.1: config is default , we get string from rawkey+config_suffix\n+ // 2a1.2: config is default , we get string from rawkey\n+ // 2a1.3: config is default, we don't get string and return null ,\n+ // 2a1.4: config is non default , we get string from rawkey+config_suffix\n+ // 2a1.5: config is nondefault, we don't get string and return null ,\n+\n+ String finalData = \"\";\n+ if (config.isDefaultInstance()) {\n+ System.out.println(\"StorageHelper|getStringFromPrefs: config is default, case 1 or 2 or 3 will run\");\n+\n+ String _new = getString(context, storageKeyWithSuffix(config, rawKey), defaultValue);\n+\n+ if(_new==null){\n+ System.out.println(\"StorageHelper|getStringFromPrefs: rawkey+config_suffix returned null, case 2 or 3 will run\");\n+ }\n+ else {\n+ System.out.println(\"StorageHelper|getStringFromPrefs: rawkey+config_suffix returned string, case 1 has run\");\n+ }\n+\n+ finalData = _new != null ? _new : getString(context, rawKey, defaultValue);\n+ } else {\n+ System.out.println(\"StorageHelper|getStringFromPrefs: config is not default, case 4 or 5 will run\");\n+\n+ finalData = getString(context, storageKeyWithSuffix(config, rawKey), defaultValue);\n+ }\n+ System.out.println(\"StorageHelper|getStringFromPrefs: final data(1 or 2 or 3 or 4 or 5)='\"+finalData+\"'\");\n+ return finalData;\n+ }\n+\n+ * */\n+\npublic static void persist(final SharedPreferences.Editor editor) {\ntry {\neditor.apply();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/ConfigurableIdentityRepo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/ConfigurableIdentityRepo.java",
"diff": "@@ -4,6 +4,8 @@ import static com.clevertap.android.sdk.login.LoginConstants.LOG_TAG_ON_USER_LOG\nimport android.content.Context;\nimport androidx.annotation.NonNull;\n+import androidx.annotation.RestrictTo;\n+\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.DeviceInfo;\nimport com.clevertap.android.sdk.validation.ValidationResult;\n@@ -22,14 +24,24 @@ public class ConfigurableIdentityRepo implements IdentityRepo {\nprivate final ValidationResultStack validationResultStack;\n- public ConfigurableIdentityRepo(Context context, CleverTapInstanceConfig config, DeviceInfo deviceInfo,\n- ValidationResultStack mValidationResultStack) {\n+ public ConfigurableIdentityRepo(Context context, CleverTapInstanceConfig config, DeviceInfo deviceInfo, ValidationResultStack mValidationResultStack) {\nthis.config = config;\nthis.infoProvider = new LoginInfoProvider(context, config, deviceInfo);\nthis.validationResultStack = mValidationResultStack;\n+ loadIdentitySet(); // <--1\n+ }\n+\n+ @RestrictTo(RestrictTo.Scope.LIBRARY)\n+ public ConfigurableIdentityRepo(Context context, CleverTapInstanceConfig config,LoginInfoProvider loginInfoProvider, ValidationResultStack mValidationResultStack) {\n+ this.config = config;\n+ this.infoProvider = loginInfoProvider;\n+ this.validationResultStack = mValidationResultStack;\nloadIdentitySet();\n}\n+ /**\n+ * Returns the loaded identity set. checkout the loadIdentitySet() for implementation\n+ * */\n@Override\npublic IdentitySet getIdentitySet() {\nreturn identitySet;\n@@ -44,25 +56,49 @@ public class ConfigurableIdentityRepo implements IdentityRepo {\n}\n/**\n- * Loads the identity set\n+ * Loads the identity set:\n+ *\n+ * 1. create IdentitySet1 : 'prefKeySet'\n+ * |-- 1.1. A string is provided by loginInfoProvider.getCachedIdentityKeysForAccount()\n+ * | |-- 1.1.1-5 the above function gets either string or null from storage based on 5 scenarios: whether keyvalue are coming from sp of default/nondefault config, etc\n+ * |-- 1.2 This string is of format \"__,__,__etc\" and is split by ',' .the new list is filtered for wrong keys and finally used to create 'prefKeySet'\n+ *\n+ * 2. create IdentitySet2 : 'configKeySet'\n+ * |-- 2.1 A string array is provided by config.getIdentityKeys()\n+ * |-- 2.1.0 config is a dependency passed to ConfigurableIdentityRepo . it can be default or non default\n+ * |-- 2.1.1 for default config instance identitiyKeys =manifest.getProfileKeys()\n+ * |-- 2.1.2 for nondefault config instance , identitiyKeys = either null keys array or array of strings that are set post creation via config.setIdentityKeys(Constants.TYPE_EMAIL,Constants.TYPE_PHONE,..etc)\n+ * |-- 2.2 this array is filtered for wrong keys and finally used to create 'configKeySet'\n+ *\n+ * <note>: the validation critieria is that keyset must not be empty</note>\n+ *\n+ * 3. validate sets : handleError(prefKeySet, configKeySet);\n+ * |-- 3.1 : if prefKeySet.isValid() && configKeySet.isValid() && !prefKeySet.equals(configKeySet), it will generate a validation error on vr stack passed via external dependency\n+ *\n+ *\n+ * 4. setting identity set\n+ * |-- 4.1 identitySet = prefkeyset(if prefKeySet.isValid())\n+ * |-- 4.2 identitySet = configkeyset(if configKeySet.isValid()) or\n+ * |-- 4.3 (if above 2 doesn't apply) identitySet =IdentitySet.getDefault() = ['Identity','Email']\n+ *\n+ * 5. if (!prefKeySet.isValid() ) loginInfoProvider.saveIdentityKeysForAccount(identitySet) is also called on the newly initialised identitySet\n*/\nvoid loadIdentitySet() {\n-\n+ System.out.println(\"loadIdentitySet===called\");\n// Read from Pref\nIdentitySet prefKeySet = IdentitySet.from(infoProvider.getCachedIdentityKeysForAccount());\n+ System.out.println(\"ConfigurableIdentityRepo|loadIdentitySet : prefKeySet='\"+prefKeySet.toString()+\"'\");\n- config.log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"PrefIdentitySet [\" + prefKeySet + \"]\");\n+ config.log(LOG_TAG_ON_USER_LOGIN, TAG + \"PrefIdentitySet [\" + prefKeySet + \"]\");\n/* ----------------------------------------------------------------\n* For Default Instance - Get Identity Set configured via Manifest\n* For Multi Instance - Get Identity Set configured via the setter\n* ---------------------------------------------------------------- */\n- IdentitySet configKeySet = IdentitySet\n- .from(config.getIdentityKeys());\n+ IdentitySet configKeySet = IdentitySet.from(config.getIdentityKeys());\n- config.log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"ConfigIdentitySet [\" + configKeySet + \"]\");\n+ System.out.println(\"ConfigurableIdentityRepo|loadIdentitySet : configKeySet='\"+configKeySet.toString()+\"'\");\n+ config.log(LOG_TAG_ON_USER_LOGIN, TAG + \"ConfigIdentitySet [\" + configKeySet + \"]\");\n/* ---------------------------------------------------\n* Push error to LC in-case the data available\n@@ -77,16 +113,13 @@ public class ConfigurableIdentityRepo implements IdentityRepo {\n* --------------------------------------------------- */\nif (prefKeySet.isValid()) {\nidentitySet = prefKeySet;\n- config.log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"Identity Set activated from Pref[\" + identitySet + \"]\");\n+ config.log(LOG_TAG_ON_USER_LOGIN, TAG + \"Identity Set activated from Pref[\" + identitySet + \"]\");\n} else if (configKeySet.isValid()) {\nidentitySet = configKeySet;\n- config.log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"Identity Set activated from Config[\" + identitySet + \"]\");\n+ config.log(LOG_TAG_ON_USER_LOGIN, TAG + \"Identity Set activated from Config[\" + identitySet + \"]\");\n} else {\nidentitySet = IdentitySet.getDefault();\n- config.log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"Identity Set activated from Default[\" + identitySet + \"]\");\n+ config.log(LOG_TAG_ON_USER_LOGIN, TAG + \"Identity Set activated from Default[\" + identitySet + \"]\");\n}\nboolean isSavedInPref = prefKeySet.isValid();\nif (!isSavedInPref) {\n@@ -95,8 +128,7 @@ public class ConfigurableIdentityRepo implements IdentityRepo {\n* ------------------------------------------------------------------------ */\nString storedValue = identitySet.toString();\ninfoProvider.saveIdentityKeysForAccount(storedValue);\n- config.log(LOG_TAG_ON_USER_LOGIN,\n- TAG + \"Saving Identity Keys in Pref[\" + storedValue + \"]\");\n+ config.log(LOG_TAG_ON_USER_LOGIN, TAG + \"Saving Identity Keys in Pref[\" + storedValue + \"]\");\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/IdentitySet.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/IdentitySet.java",
"diff": "@@ -5,6 +5,7 @@ import androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.Utils;\n+import java.util.Arrays;\nimport java.util.HashSet;\nimport java.util.Iterator;\n@@ -93,6 +94,7 @@ public class IdentitySet {\n* @param keysArrays - String array containing identities.\n*/\nprivate void init(final String[] keysArrays) {\n+ System.out.println(\"IdentitySet:init received keys='\"+ Arrays.toString(keysArrays)+\"'\");\nif (keysArrays != null && keysArrays.length > 0) {\nfor (String key : keysArrays) {\nif (Utils.containsIgnoreCase(Constants.ALL_IDENTITY_KEYS, key)) {\n@@ -100,6 +102,7 @@ public class IdentitySet {\n}\n}\n}\n+ System.out.println(\"IdentitySet:init final identities='\"+ identities+\"'\");\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginInfoProvider.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/login/LoginInfoProvider.java",
"diff": "@@ -147,9 +147,13 @@ public class LoginInfoProvider {\n* @return - Cached Identity Keys for the account\n*/\npublic String getCachedIdentityKeysForAccount() {\n- String cachedKeys = StorageHelper\n- .getStringFromPrefs(context, config, Constants.SP_KEY_PROFILE_IDENTITIES, \"\");\n+ System.out.println(\"LoginInfoProvider:getCachedIdentityKeysForAccount()\");\n+\n+ String cachedKeys = StorageHelper.getStringFromPrefs(context, config, Constants.SP_KEY_PROFILE_IDENTITIES, \"\");\n+\nconfig.log(LoginConstants.LOG_TAG_ON_USER_LOGIN, \"getCachedIdentityKeysForAccount:\" + cachedKeys);\n+ System.out.println(\"LoginInfoProvider:getCachedIdentityKeysForAccount() cached keys = '\"+cachedKeys+\"'\");\n+\nreturn cachedKeys;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/login/ConfigurableIdentityRepoTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/login/ConfigurableIdentityRepoTest.kt",
"diff": "@@ -26,13 +26,18 @@ class ConfigurableIdentityRepoTest:BaseTestCase() {\noverride fun setUp() {\nsuper.setUp()\n// using spy everywhere to easily provide a custom value when <someDependency>.publicGetter() is called\n- coreMetaData = Mockito.spy(CoreMetaData())\n- config = Mockito.spy(CleverTapInstanceConfig.createInstance(appCtx, \"id\", \"token\", \"region\"))\n- deviceInfo = Mockito.spy(DeviceInfo(appCtx,config,\"clevertap_id\",coreMetaData))\n- loginInfoProvider = Mockito.spy(LoginInfoProvider(appCtx,config,deviceInfo))\n- validationStack = Mockito.spy(ValidationResultStack())\n-// configurableIdentityRepo = ConfigurableIdentityRepo(appCtx,config,loginInfoProvider,validationStack)\n+ coreMetaData = Mockito.mock(CoreMetaData::class.java)\n+ config = Mockito.mock(CleverTapInstanceConfig::class.java)\n+ deviceInfo = Mockito.mock(DeviceInfo::class.java)\n+ loginInfoProvider = Mockito.mock(LoginInfoProvider::class.java)\n+ validationStack = Mockito.mock(ValidationResultStack::class.java)\n+ // note: no need to setup configurableIdentityRepo instance here as it makes a crucial function call during initialisation. therefore, we create an instance in tests, wherever required\n+ }\n+ @Test\n+ fun getIdentitySet(){\n+ //note: this function does not have any important cases on its own, so we are testing its creator function , i.e loadIdentitySet() which gets called when constructor is called\n+ Assert.assertEquals(true,true)\n}\n@@ -41,10 +46,14 @@ class ConfigurableIdentityRepoTest:BaseTestCase() {\n*\n* 1. create IdentitySet1 : 'prefKeySet'\n* |-- 1.1. A string is provided by loginInfoProvider.getCachedIdentityKeysForAccount()\n+ * | |-- 1.1.1-5 the above function gets either string or null from storage based on 5 scenarios: whether keyvalue are coming from sp of default/nondefault config, etc\n* |-- 1.2 This string is of format \"__,__,__etc\" and is split by ',' .the new list is filtered for wrong keys and finally used to create 'prefKeySet'\n*\n* 2. create IdentitySet2 : 'configKeySet'\n* |-- 2.1 A string array is provided by config.getIdentityKeys()\n+ * |-- 2.1.0 config is a dependency passed to ConfigurableIdentityRepo . it can be default or non default\n+ * |-- 2.1.1 for default config instance identitiyKeys =manifest.getProfileKeys()\n+ * |-- 2.1.2 for nondefault config instance , identitiyKeys = either null keys array or array of strings that are set post creation via config.setIdentityKeys(Constants.TYPE_EMAIL,Constants.TYPE_PHONE,..etc)\n* |-- 2.2 this array is filtered for wrong keys and finally used to create 'configKeySet'\n*\n* <note>: the validation critieria is that keyset must not be empty</note>\n@@ -62,31 +71,121 @@ class ConfigurableIdentityRepoTest:BaseTestCase() {\n*/\n@Test\n- fun getIdentitySet_when_ABC_should_XYZ(){\n- val keys = arrayOf(Constants.TYPE_IDENTITY)\n- Mockito.`when`(loginInfoProvider.cachedIdentityKeysForAccount).thenReturn(keys.joinToString(\",\"))\n- Mockito.`when`(config.identityKeys).thenReturn(keys)\n+ fun loadIdentitySet_when_KeysInLIPandConfigAreSame_should_SetThoseKeysAsIdentitySet(){\n+ //case 1 : when cachedIdentityKeysForAccount(from loginInfoProvider) and identityKeys\n+ // (from config) are same, then no error is generated and idenity keys are set\n+ // to keys from loginInfoProvider . since lip keys are valid, saveIdentityKeysForAccount(..) will not be called\n+\n+ val commonKeys = arrayOf(Constants.TYPE_IDENTITY)\n+\n+ //assertions\n+ Mockito.`when`(loginInfoProvider.cachedIdentityKeysForAccount).thenReturn(commonKeys.joinToString(\",\"))\n+ Mockito.`when`(config.identityKeys).thenReturn(commonKeys)\n+\n+ //test call\nconfigurableIdentityRepo = ConfigurableIdentityRepo(appCtx,config,loginInfoProvider,validationStack)\n+ val result = configurableIdentityRepo.identitySet\n+\n+ //validations\n+ println(\"final result=== ${result.toString()}\")\n+ Mockito.verify(validationStack,Mockito.never()).pushValidationResult(Mockito.any())\n+ Mockito.verify(loginInfoProvider,Mockito.times(0)).saveIdentityKeysForAccount(Mockito.any())\n+ Assert.assertEquals(true,result.isValid)\n+ commonKeys.forEach { Assert.assertEquals(true,result.contains(it)) }\n+ }\n+\n+ @Test\n+ fun loadIdentitySet_when_KeysInLIPandConfigAreDifferent_should_SetLIPKeysAsIdenititySet(){\n+ //case 2: when cachedIdentityKeysForAccount(from loginInfoProvider) and identityKeys\n+ // (from config) are different, then error is generated and keys are set to that of loginInfoProvider.\n+ // since lip keys are valid, saveIdentityKeysForAccount(..) will not be called\n+\n+\n+ val lipKeys = arrayOf(Constants.TYPE_IDENTITY)\n+ val configKeys = arrayOf(Constants.TYPE_EMAIL)\n+ //assertions\n+ Mockito.`when`(loginInfoProvider.cachedIdentityKeysForAccount).thenReturn(lipKeys.joinToString(\",\"))\n+ Mockito.`when`(config.identityKeys).thenReturn(configKeys)\n+ //test call\n+ configurableIdentityRepo = ConfigurableIdentityRepo(appCtx,config,loginInfoProvider,validationStack)\nval result = configurableIdentityRepo.identitySet\n+\n+ //validations\nprintln(\"final result=== ${result.toString()}\")\n+ Mockito.verify(validationStack,Mockito.times(1)).pushValidationResult(Mockito.any())\n+ Mockito.verify(loginInfoProvider,Mockito.times(0)).saveIdentityKeysForAccount(Mockito.any())\n+\n+\nAssert.assertEquals(true,result.isValid)\n- Assert.assertEquals(true,result.contains(Constants.TYPE_IDENTITY))\n-// Assert.assertEquals(true,result.contains(Constants.TYPE_PHONE))\n+ lipKeys.forEach { Assert.assertEquals(true,result.contains(it)) }\n}\n+\n@Test\n- fun getIdentitySet2_when_ABC_should_XYZ(){\n- configurableIdentityRepo.identitySet\n+ fun loadIdentitySet_when_KeysInLIPandConfigAreDifferentAndLIPKeysAreInvalid_should_SetConfigKeysAsIdenititySet(){\n+ //case 3 : when cachedIdentityKeysForAccount(from loginInfoProvider) are invalid (i.e empty set)\n+ // and identityKeys (from config) are valid, then error is not generated(why??) and idenity keys are set\n+ // to keys from config . since lip keys are invalid, saveIdentityKeysForAccount(..) will be called\n+\n+\n+ val lipKeys = emptyArray<String>()\n+ val configKeys = arrayOf(Constants.TYPE_EMAIL)\n+ //assertions\n+ Mockito.`when`(loginInfoProvider.cachedIdentityKeysForAccount).thenReturn(lipKeys.joinToString(\",\"))\n+ Mockito.`when`(config.identityKeys).thenReturn(configKeys)\n+\n+ //test call\n+ configurableIdentityRepo = ConfigurableIdentityRepo(appCtx,config,loginInfoProvider,validationStack)\n+ val result = configurableIdentityRepo.identitySet\n+\n+ //validations\n+ println(\"final result=== ${result.toString()}\")\n+ Mockito.verify(validationStack,Mockito.times(0)).pushValidationResult(Mockito.any())\n+ Mockito.verify(loginInfoProvider,Mockito.times(1)).saveIdentityKeysForAccount(Mockito.any())\n+\n+ Assert.assertEquals(true,result.isValid)\n+ configKeys.forEach { Assert.assertEquals(true,result.contains(it)) }\n}\n+ @Test\n+ fun loadIdentitySet_when_KeysInLIPandConfigAreBothInvalid_should_SetDefaultKeysAsIdentitySet(){\n+ //case 4 : when cachedIdentityKeysForAccount(from loginInfoProvider) are invalid (i.e empty set)\n+ // and identityKeys (from config) are also invalid, then error is not generated(why??) and idenity keys are set\n+ // to default keys.since lip keys are invalid, saveIdentityKeysForAccount(..) will be called\n+ val lipKeys = emptyArray<String>()\n+ val configKeys = emptyArray<String>()\n+ val defaultKeys = arrayOf(Constants.TYPE_IDENTITY, Constants.TYPE_EMAIL)\n+ //assertions\n+ Mockito.`when`(loginInfoProvider.cachedIdentityKeysForAccount).thenReturn(lipKeys.joinToString(\",\"))\n+ Mockito.`when`(config.identityKeys).thenReturn(configKeys)\n-// @Test\n-// fun hasIdentity_when_ABC_should_XYZ(){\n-// configurableIdentityRepo.hasIdentity(\"key\")\n-// }\n-//\n-// @Test\n-// fun loadIdentitySet_when_ABC_should_XYZ(){\n-// configurableIdentityRepo.loadIdentitySet()\n-// }\n+ //test call\n+ configurableIdentityRepo = ConfigurableIdentityRepo(appCtx,config,loginInfoProvider,validationStack)\n+ val result = configurableIdentityRepo.identitySet\n+\n+ //validations\n+ println(\"final result=== ${result.toString()}\")\n+ Mockito.verify(validationStack,Mockito.times(0)).pushValidationResult(Mockito.any())\n+ Mockito.verify(loginInfoProvider,Mockito.times(1)).saveIdentityKeysForAccount(Mockito.any())\n+\n+ Assert.assertEquals(true,result.isValid)\n+ defaultKeys.forEach { Assert.assertEquals(true,result.contains(it)) }\n+ }\n+\n+\n+ @Test\n+ fun hasIdentity_when_calledWithKey_should_ReturnWhetherTheKeyExistsInSetOrNot(){\n+ val commonKeys = arrayOf(Constants.TYPE_IDENTITY,Constants.TYPE_PHONE)\n+ //assertions\n+ Mockito.`when`(loginInfoProvider.cachedIdentityKeysForAccount).thenReturn(commonKeys.joinToString(\",\"))\n+ Mockito.`when`(config.identityKeys).thenReturn(commonKeys)\n+\n+ //test call\n+ configurableIdentityRepo = ConfigurableIdentityRepo(appCtx,config,loginInfoProvider,validationStack)\n+\n+ //validations\n+ Assert.assertEquals(true,configurableIdentityRepo.hasIdentity(Constants.TYPE_IDENTITY))\n+ Assert.assertEquals(true,configurableIdentityRepo.hasIdentity(Constants.TYPE_PHONE))\n+ Assert.assertEquals(false,configurableIdentityRepo.hasIdentity(Constants.TYPE_EMAIL))\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/LoginInfoProviderTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/login/LoginInfoProviderTest.kt",
"diff": "-package com.clevertap.android.sdk\n+package com.clevertap.android.sdk.login\nimport android.content.Context\n-import com.clevertap.android.sdk.login.LoginInfoProvider\n+import com.clevertap.android.sdk.CleverTapInstanceConfig\n+import com.clevertap.android.sdk.CoreMetaData\n+import com.clevertap.android.sdk.DeviceInfo\nimport com.clevertap.android.shared.test.BaseTestCase\nimport org.json.JSONObject\nimport org.junit.Test\n@@ -23,7 +25,7 @@ class LoginInfoProviderTest: BaseTestCase() {\noverride fun setUp() {\nsuper.setUp()\ncoreMetaData = CoreMetaData()\n- defConfig = CleverTapInstanceConfig.createDefaultInstance(appCtx, \"id\", \"token\", \"region\")\n+ defConfig = CleverTapInstanceConfig.createInstance(appCtx, \"id\", \"token\", \"region\")\ndeviceInfo = Mockito.spy(DeviceInfo(appCtx,defConfig,\"clevertap_id\",coreMetaData))\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2225] ConfigurableIdentityRepo test part 2/2 |
116,616 | 29.09.2022 18:35:55 | -19,080 | 884ddb8330b2149e4cc5c47e48813f0d62e95156 | task(SDK-1970)- Add public listener for push primer CTA's click | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"diff": "@@ -26,6 +26,8 @@ public abstract class BaseCallbackManager {\npublic abstract InAppNotificationButtonListener getInAppNotificationButtonListener();\n+ public abstract PushPrimerButtonListener getPushPrimerButtonListener();\n+\npublic abstract InAppNotificationListener getInAppNotificationListener();\npublic abstract PushPermissionNotificationResponseListener getPushPermissionNotificationResponseListener();\n@@ -60,6 +62,8 @@ public abstract class BaseCallbackManager {\npublic abstract void setInAppNotificationButtonListener(\nInAppNotificationButtonListener inAppNotificationButtonListener);\n+ public abstract void setPushPrimerButtonListener(PushPrimerButtonListener pushPrimerButtonListener);\n+\npublic abstract void setInAppNotificationListener(InAppNotificationListener inAppNotificationListener);\npublic abstract void setPushPermissionNotificationResponseListener(PushPermissionNotificationResponseListener pushPermissionNotificationResponseListener);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"diff": "@@ -25,6 +25,7 @@ public class CallbackManager extends BaseCallbackManager {\nprivate DCDomainCallback dcDomainCallback;\nprivate WeakReference<InAppNotificationButtonListener> inAppNotificationButtonListener;\n+ private WeakReference<PushPrimerButtonListener> pushPrimerButtonListener;\nprivate InAppNotificationListener inAppNotificationListener;\n@@ -122,12 +123,25 @@ public class CallbackManager extends BaseCallbackManager {\nreturn null;\n}\n+ @Override\n+ public PushPrimerButtonListener getPushPrimerButtonListener() {\n+ if (pushPrimerButtonListener != null && pushPrimerButtonListener.get() != null){\n+ return pushPrimerButtonListener.get();\n+ }\n+ return null;\n+ }\n+\n@Override\npublic void setInAppNotificationButtonListener(\nInAppNotificationButtonListener inAppNotificationButtonListener) {\nthis.inAppNotificationButtonListener = new WeakReference<>(inAppNotificationButtonListener);\n}\n+ @Override\n+ public void setPushPrimerButtonListener(PushPrimerButtonListener pushPrimerButtonListener) {\n+ this.pushPrimerButtonListener = new WeakReference<>(pushPrimerButtonListener);\n+ }\n+\n@Override\npublic InAppNotificationListener getInAppNotificationListener() {\nreturn inAppNotificationListener;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -2459,6 +2459,11 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getCallbackManager().setInAppNotificationButtonListener(listener);\n}\n+ @SuppressWarnings(\"unused\")\n+ public void setPushPrimerButtonListener(PushPrimerButtonListener listener) {\n+ coreState.getCallbackManager().setPushPrimerButtonListener(listener);\n+ }\n+\n@SuppressWarnings(\"unused\")\npublic void setInboxMessageButtonListener(InboxMessageButtonListener listener) {\nthis.inboxMessageButtonListener = new WeakReference<>(listener);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -143,8 +143,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n@Override\npublic void inAppNotificationDidClick(CTInAppNotification inAppNotification, Bundle formData,\n- HashMap<String, String> keyValueMap) {\n- didClick(formData, keyValueMap);\n+ HashMap<String, String> keyValueMap, int btnClickIndex) {\n+ didClick(formData, keyValueMap, btnClickIndex);\n}\n@Override\n@@ -171,10 +171,10 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nsuper.setTheme(android.R.style.Theme_Translucent_NoTitleBar);\n}\n- void didClick(Bundle data, HashMap<String, String> keyValueMap) {\n+ void didClick(Bundle data, HashMap<String, String> keyValueMap, int btnClickIndex) {\nInAppListener listener = getListener();\nif (listener != null) {\n- listener.inAppNotificationDidClick(inAppNotification, data, keyValueMap);\n+ listener.inAppNotificationDidClick(inAppNotification, data, keyValueMap,btnClickIndex);\n}\n}\n@@ -352,7 +352,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\ninAppNotification.getCampaignId());\ndata.putString(\"wzrk_c2a\",\ninAppNotification.getButtons().get(0).getText());\n- didClick(data, null);\n+ didClick(data, null,0);\nString actionUrl = inAppNotification.getButtons().get(0)\n.getActionUrl();\nif (actionUrl != null) {\n@@ -378,7 +378,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\ninAppNotification.getCampaignId());\ndata.putString(\"wzrk_c2a\",\ninAppNotification.getButtons().get(1).getText());\n- didClick(data, null);\n+ didClick(data, null,1);\nString actionUrl = inAppNotification.getButtons().get(1).getActionUrl();\nif (actionUrl != null) {\nfireUrlThroughIntent(actionUrl, data);\n@@ -402,7 +402,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\ninAppNotification.getCampaignId());\ndata.putString(\"wzrk_c2a\",\ninAppNotification.getButtons().get(0).getText());\n- didClick(data, null);\n+ didClick(data, null,0);\nString actionUrl = inAppNotification.getButtons().get(0)\n.getActionUrl();\nif (actionUrl != null) {\n@@ -424,7 +424,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\ninAppNotification.getCampaignId());\ndata.putString(\"wzrk_c2a\",\ninAppNotification.getButtons().get(1).getText());\n- didClick(data, null);\n+ didClick(data, null,1);\nString actionUrl = inAppNotification.getButtons().get(1).getActionUrl();\nif (actionUrl != null) {\nfireUrlThroughIntent(actionUrl, data);\n@@ -446,7 +446,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\ndata.putString(Constants.NOTIFICATION_ID_TAG,\ninAppNotification.getCampaignId());\ndata.putString(\"wzrk_c2a\", inAppNotification.getButtons().get(2).getText());\n- didClick(data, null);\n+ didClick(data, null,2);\nString actionUrl = inAppNotification.getButtons().get(2).getActionUrl();\nif (actionUrl != null) {\nfireUrlThroughIntent(actionUrl, data);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushPrimerButtonListener.java",
"diff": "+package com.clevertap.android.sdk;\n+\n+import com.clevertap.android.sdk.inapp.CTInAppNotification;\n+\n+public interface PushPrimerButtonListener {\n+\n+ void onPositiveButtonClick(CTInAppNotification ctInAppNotification);\n+\n+ void onNegativeButtonClick(CTInAppNotification ctInAppNotification);\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFragment.java",
"diff": "@@ -61,10 +61,10 @@ public abstract class CTInAppBaseFragment extends Fragment {\nabstract void cleanup();\n- void didClick(Bundle data, HashMap<String, String> keyValueMap) {\n+ void didClick(int index, Bundle data, HashMap<String, String> keyValueMap) {\nInAppListener listener = getListener();\nif (listener != null) {\n- listener.inAppNotificationDidClick(inAppNotification, data, keyValueMap);\n+ listener.inAppNotificationDidClick(inAppNotification, data, keyValueMap,index);\n}\n}\n@@ -139,13 +139,12 @@ public abstract class CTInAppBaseFragment extends Fragment {\ndata.putString(Constants.NOTIFICATION_ID_TAG, inAppNotification.getCampaignId());\ndata.putString(Constants.KEY_C2A, button.getText());\n- didClick(data, button.getKeyValues());\n-\n-// check API and toolsSDK version, inapp type, whether the btn was meant for PN.\n-// requestPermissions()\n+ didClick(index,data, button.getKeyValues());\nif (index == 0 && inAppNotification.isLocalInApp()) {\n((InAppNotificationActivity) context).prompt();\n+ }else if (index == 1 && inAppNotification.isLocalInApp()){\n+ didDismiss(null);\n}else {\nString actionUrl = button.getActionUrl();\nif (actionUrl != null) {\n@@ -154,6 +153,7 @@ public abstract class CTInAppBaseFragment extends Fragment {\n}\ndidDismiss(data);\n}\n+\n} catch (Throwable t) {\nconfig.getLogger().debug(\"Error handling notification button click: \" + t.getCause());\ndidDismiss(null);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFullHtmlFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFullHtmlFragment.java",
"diff": "@@ -50,7 +50,7 @@ public abstract class CTInAppBaseFullHtmlFragment extends CTInAppBaseFullFragmen\n}\n}\n- didClick(formData, null);\n+ didClick(-1, formData, null);\nLogger.d(\"Executing call to action for in-app: \" + url);\nfireUrlThroughIntent(url, formData);\n} catch (Throwable t) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBasePartialHtmlFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBasePartialHtmlFragment.java",
"diff": "@@ -48,7 +48,7 @@ public abstract class CTInAppBasePartialHtmlFragment extends CTInAppBasePartialF\n}\n}\n- didClick(formData, null);\n+ didClick(-1, formData, null);\nLogger.d(\"Executing call to action for in-app: \" + url);\nfireUrlThroughIntent(url, formData);\n} catch (Throwable t) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -227,8 +227,20 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n@Override\npublic void inAppNotificationDidClick(CTInAppNotification inAppNotification, Bundle formData,\n- HashMap<String, String> keyValueMap) {\n+ HashMap<String, String> keyValueMap, int btnClickIndex) {\nanalyticsManager.pushInAppNotificationStateEvent(true, inAppNotification, formData);\n+ if (inAppNotification.isLocalInApp()){\n+ if (btnClickIndex == 0){\n+ if (callbackManager.getPushPrimerButtonListener() != null) {\n+ callbackManager.getPushPrimerButtonListener().onPositiveButtonClick(inAppNotification);\n+ }\n+ }else if (btnClickIndex == 1){\n+ if (callbackManager.getPushPrimerButtonListener() != null) {\n+ callbackManager.getPushPrimerButtonListener().onNegativeButtonClick(inAppNotification);\n+ }\n+ }\n+ }\n+\nif (keyValueMap != null && !keyValueMap.isEmpty()) {\nif (callbackManager.getInAppNotificationButtonListener() != null) {\ncallbackManager.getInAppNotificationButtonListener().onInAppButtonClick(keyValueMap);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppListener.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppListener.java",
"diff": "@@ -7,7 +7,7 @@ import java.util.HashMap;\npublic interface InAppListener {\nvoid inAppNotificationDidClick(CTInAppNotification inAppNotification, Bundle formData,\n- HashMap<String, String> keyValueMap);\n+ HashMap<String, String> keyValueMap, int btnClickIndex);\nvoid inAppNotificationDidDismiss(Context context, CTInAppNotification inAppNotification, Bundle formData);\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/HomeScreenActivity.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/HomeScreenActivity.kt",
"diff": "@@ -25,11 +25,13 @@ import net.khirr.android.privacypolicy.PrivacyPolicyDialog.OnClickListener\nimport com.clevertap.demo.ui.main.NotificationUtils\nimport org.json.JSONObject\n+import java.util.HashMap\nprivate const val TAG = \"HomeScreenActivity\"\nclass HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitListener, CTProductConfigListener,\n- CTFeatureFlagsListener, SyncListener, InAppNotificationListener, PushPermissionNotificationResponseListener {\n+ CTFeatureFlagsListener, SyncListener, InAppNotificationListener, PushPermissionNotificationResponseListener,\n+ InAppNotificationButtonListener, PushPrimerButtonListener {\nvar cleverTapDefaultInstance: CleverTapAPI? = null\n@@ -145,6 +147,8 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\npushPermissionNotificationResponseListener = this@HomeScreenActivity\n+ setPushPrimerButtonListener(this@HomeScreenActivity)\n+\n}\n//With CleverTap Android SDK v3.2.0 you can create additional instances to send data to multiple CleverTap accounts\n@@ -257,4 +261,16 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\noverride fun response(accepted: Boolean) {\nLog.i(TAG, \"InApp---> response() called $accepted\")\n}\n+\n+ override fun onInAppButtonClick(payload: HashMap<String, String>?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun onPositiveButtonClick(ctInAppNotification: CTInAppNotification?) {\n+ Log.v(TAG, \"onPositiveButtonClick() called\")\n+ }\n+\n+ override fun onNegativeButtonClick(ctInAppNotification: CTInAppNotification?) {\n+ Log.v(TAG, \"onNegativeButtonClick() called\")\n+ }\n}\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1970)- Add public listener for push primer CTA's click |
116,616 | 03.10.2022 13:49:50 | -19,080 | d5ef9a6571213c9886c507d590cc3389dfd14fb2 | chore(SDK-1970)- Refactor CTLocalInAppBuilder and CTInAppNotification | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"diff": "package com.clevertap.android.sdk.inapp;\n+import static com.clevertap.android.sdk.inapp.CTLocalInAppBuilder.IS_LOCAL_INAPP;\nimport android.content.res.Configuration;\nimport android.graphics.Bitmap;\nimport android.os.Bundle;\n@@ -590,7 +591,7 @@ public class CTInAppNotification implements Parcelable {\nthis.campaignId = jsonObject.has(Constants.NOTIFICATION_ID_TAG) ? jsonObject\n.getString(Constants.NOTIFICATION_ID_TAG) : \"\";\nthis.type = jsonObject.getString(Constants.KEY_TYPE);\n- this.isLocalInApp = jsonObject.has(\"isLocalInApp\") && jsonObject.getBoolean(\"isLocalInApp\");\n+ this.isLocalInApp = jsonObject.has(IS_LOCAL_INAPP) && jsonObject.getBoolean(IS_LOCAL_INAPP);\nthis.excludeFromCaps = jsonObject.has(Constants.KEY_EFC) && jsonObject.getInt(Constants.KEY_EFC) == 1;\nthis.totalLifetimeCount = jsonObject.has(Constants.KEY_TLC) ? jsonObject.getInt(Constants.KEY_TLC) : -1;\nthis.totalDailyCount = jsonObject.has(Constants.KEY_TDC) ? jsonObject.getInt(Constants.KEY_TDC) : -1;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTLocalInAppBuilder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTLocalInAppBuilder.java",
"diff": "@@ -12,6 +12,10 @@ import java.util.Objects;\npublic class CTLocalInAppBuilder {\n+ public static final String HALF_INTERSTITIAL_INAPP = \"half-interstitial\";\n+ public static final String ALERT_INAPP = \"alert-template\";\n+ protected static final String IS_LOCAL_INAPP = \"isLocalInApp\";\n+\nprivate final String localInAppType;//Required\nprivate final JSONObject titleObj;// Required\nprivate final JSONObject messageObj;// Required\n@@ -52,7 +56,7 @@ public class CTLocalInAppBuilder {\nprivate Builder1(String inAppType, Context context) throws JSONException {\nthis.jsonObject.put(Constants.KEY_TYPE, inAppType);\n- this.jsonObject.put(\"isLocalInApp\",true);\n+ this.jsonObject.put(IS_LOCAL_INAPP,true);\nthis.jsonObject.put(Constants.KEY_HIDE_CLOSE,true);\nthis.jsonObject.put(Constants.KEY_IS_TABLET,\nDeviceInfo.getDeviceType(context) == DeviceInfo.TABLET);\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "@@ -10,6 +10,8 @@ import com.clevertap.android.sdk.CTInboxStyleConfig\nimport com.clevertap.android.sdk.CleverTapAPI\nimport com.clevertap.android.sdk.Constants\nimport com.clevertap.android.sdk.inapp.CTLocalInAppBuilder\n+import com.clevertap.android.sdk.inapp.CTLocalInAppBuilder.ALERT_INAPP\n+import com.clevertap.android.sdk.inapp.CTLocalInAppBuilder.HALF_INTERSTITIAL_INAPP\nimport java.util.*\nclass HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?, @SuppressLint(\"StaticFieldLeak\")\n@@ -329,7 +331,7 @@ private val activity:FragmentActivity?) : ViewModel() {\n\"100\"-> {\nif (cleverTapAPI?.isNotificationPermissionGranted == false){\nval builder = CTLocalInAppBuilder.builder()\n- .inAppType(\"half-interstitial\",activity)\n+ .inAppType(HALF_INTERSTITIAL_INAPP,activity)\n.titleText(\"Get Notified\")\n.messageText(\"Please enable notifications on your device to use Push Notifications.\")\n.followDeviceOrientation(true)\n@@ -353,7 +355,7 @@ private val activity:FragmentActivity?) : ViewModel() {\n\"101\"->{\nif (cleverTapAPI?.isNotificationPermissionGranted == false) {\nval builder = CTLocalInAppBuilder.builder()\n- .inAppType(\"alert-template\",activity)\n+ .inAppType(ALERT_INAPP,activity)\n.titleText(\"Get Notified\")\n.messageText(\"Enable Notification permission\")\n.followDeviceOrientation(true)\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(SDK-1970)- Refactor CTLocalInAppBuilder and CTInAppNotification |
116,616 | 04.10.2022 14:03:08 | -19,080 | dd2fa5abe3a4e28cffc851d3c4ca8f8434819d69 | chore(SDK-1970)- Refactor hard permission dialog listener,`CTLocalInAppBuilder`,navigation to settings dialog flow, Remove unused code in `CTInAppNotificationButton` and `CTInAppNotificationMedia` | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"diff": "@@ -30,7 +30,7 @@ public abstract class BaseCallbackManager {\npublic abstract InAppNotificationListener getInAppNotificationListener();\n- public abstract PushPermissionNotificationResponseListener getPushPermissionNotificationResponseListener();\n+ public abstract PushPermissionResponseListener getPushPermissionNotificationResponseListener();\npublic abstract CTInboxListener getInboxListener();\n@@ -66,7 +66,7 @@ public abstract class BaseCallbackManager {\npublic abstract void setInAppNotificationListener(InAppNotificationListener inAppNotificationListener);\n- public abstract void setPushPermissionNotificationResponseListener(PushPermissionNotificationResponseListener pushPermissionNotificationResponseListener);\n+ public abstract void setPushPermissionNotificationResponseListener(PushPermissionResponseListener pushPermissionNotificationResponseListener);\npublic abstract void setInboxListener(CTInboxListener inboxListener);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"diff": "@@ -29,7 +29,7 @@ public class CallbackManager extends BaseCallbackManager {\nprivate InAppNotificationListener inAppNotificationListener;\n- private PushPermissionNotificationResponseListener pushPermissionNotificationResponseListener;\n+ private PushPermissionResponseListener pushPermissionNotificationResponseListener;\nprivate CTInboxListener inboxListener;\n@@ -148,7 +148,7 @@ public class CallbackManager extends BaseCallbackManager {\n}\n@Override\n- public PushPermissionNotificationResponseListener getPushPermissionNotificationResponseListener() {\n+ public PushPermissionResponseListener getPushPermissionNotificationResponseListener() {\nreturn pushPermissionNotificationResponseListener;\n}\n@@ -158,7 +158,7 @@ public class CallbackManager extends BaseCallbackManager {\n}\n@Override\n- public void setPushPermissionNotificationResponseListener(PushPermissionNotificationResponseListener pushPermissionNotificationResponseListener) {\n+ public void setPushPermissionNotificationResponseListener(PushPermissionResponseListener pushPermissionNotificationResponseListener) {\nthis.pushPermissionNotificationResponseListener = pushPermissionNotificationResponseListener;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1631,21 +1631,23 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n/**\n* Returns the PushPermissionNotificationResponseListener object\n*\n- * @return An {@link PushPermissionNotificationResponseListener} object\n+ * @return An {@link PushPermissionResponseListener} object\n*/\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\n- public PushPermissionNotificationResponseListener getPushPermissionNotificationResponseListener() {\n+ public PushPermissionResponseListener getPushPermissionNotificationResponseListener() {\nreturn coreState.getCallbackManager().getPushPermissionNotificationResponseListener();\n}\n/**\n* This method sets the PushPermissionNotificationResponseListener\n*\n- * @param pushPermissionNotificationResponseListener An {@link PushPermissionNotificationResponseListener} object\n+ * @param pushPermissionResponseListener An {@link PushPermissionResponseListener} object\n*/\n@SuppressWarnings({\"unused\"})\n- public void setPushPermissionNotificationResponseListener(PushPermissionNotificationResponseListener pushPermissionNotificationResponseListener) {\n- coreState.getCallbackManager().setPushPermissionNotificationResponseListener(pushPermissionNotificationResponseListener);\n+ public void setPushPermissionNotificationResponseListener(PushPermissionResponseListener\n+ pushPermissionResponseListener) {\n+ coreState.getCallbackManager().\n+ setPushPermissionNotificationResponseListener(pushPermissionResponseListener);\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -34,7 +34,6 @@ import com.clevertap.android.sdk.inapp.CTInAppNativeInterstitialImageFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppNotification;\nimport com.clevertap.android.sdk.inapp.CTInAppType;\nimport com.clevertap.android.sdk.inapp.InAppListener;\n-import com.clevertap.android.sdk.inapp.NavigateToAndroidSettingsForNotifications;\nimport java.lang.ref.WeakReference;\nimport java.util.HashMap;\n@@ -216,7 +215,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nAlertDialogPromptForSettings.INSTANCE.show(this, new AlertDialogPromptForSettings.Callback() {\n@Override\npublic void onAccept() {\n- NavigateToAndroidSettingsForNotifications.INSTANCE.show(getBaseContext());\n+ Utils.navigateToAndroidSettingsForNotifications(InAppNotificationActivity.this);\ndidDismiss(null);\n}\n@@ -227,17 +226,6 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n});\n}\n- public static void startPrompt(Activity activity, CleverTapInstanceConfig config){\n- if (!activity.getClass().equals(InAppNotificationActivity.class)) {\n- Intent intent = new Intent(activity, InAppNotificationActivity.class);\n- Bundle configBundle = new Bundle();\n- configBundle.putParcelable(\"config\", config);\n- intent.putExtra(\"configBundle\", configBundle);\n- intent.putExtra(\"displayHardPermissionDialog\", true);\n- activity.startActivity(intent);\n- }\n- }\n-\n@RequiresApi(api = 33)\npublic static int isNotificationPermissionGranted(Activity activity){\nreturn ContextCompat.checkSelfPermission(\n"
},
{
"change_type": "RENAME",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushPermissionNotificationResponseListener.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushPermissionResponseListener.java",
"diff": "@@ -3,7 +3,7 @@ package com.clevertap.android.sdk;\n/**\n* A listener for notification permission.\n*/\n-public interface PushPermissionNotificationResponseListener {\n+public interface PushPermissionResponseListener {\n/**\n* This is called when user either grants allow/dismiss permission for notifications for Android 13+\n@@ -11,5 +11,5 @@ public interface PushPermissionNotificationResponseListener {\n* @param accepted This boolean will return true if notification permission is granted and will retrun\n* false if permission is denied.\n*/\n- void response(boolean accepted);//Change method name here, sounds ambiguous\n+ void onPushPermissionResponse(boolean accepted);//Change method name here, sounds ambiguous\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "@@ -21,12 +21,14 @@ import android.graphics.drawable.BitmapDrawable;\nimport android.graphics.drawable.Drawable;\nimport android.net.ConnectivityManager;\nimport android.net.NetworkInfo;\n+import android.net.Uri;\nimport android.os.Build;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.os.Looper;\nimport android.os.Process;\nimport android.os.SystemClock;\n+import android.provider.Settings;\nimport android.telephony.TelephonyManager;\nimport android.text.TextUtils;\nimport androidx.annotation.NonNull;\n@@ -668,6 +670,24 @@ public final class Utils {\nreturn Build.VERSION.SDK_INT > 32 && getTargetSdkVersion(context) > 32;\n}\n+ public static void navigateToAndroidSettingsForNotifications(Context context){\n+ Intent intent = new Intent();\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {\n+ intent.setAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS);\n+ intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.getPackageName());\n+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);\n+ } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP){\n+ intent.setAction(\"android.settings.APP_NOTIFICATION_SETTINGS\");\n+ intent.putExtra(\"app_package\", context.getPackageName());\n+ intent.putExtra(\"app_uid\", context.getApplicationInfo().uid);\n+ } else {\n+ intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);\n+ intent.addCategory(Intent.CATEGORY_DEFAULT);\n+ intent.setData(Uri.parse(\"package:\" + context.getPackageName()));\n+ }\n+ context.startActivity(intent);\n+ }\n+\npublic static int getTargetSdkVersion(Context context) {\nString packageName = context.getPackageName();\nPackageManager packageManager = context.getPackageManager();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationButton.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationButton.java",
"diff": "@@ -215,20 +215,20 @@ public class CTInAppNotificationButton implements Parcelable {\nreturn this;\n}\n- CTInAppNotificationButton initWithLocalData(String btnText, String btnBackgroundColor,\n- String btnTextColor, String btnBorderColor,\n- String btnBorderRadius) {\n-\n- this.text = btnText != null ? btnText : \"\";\n- this.backgroundColor = btnBackgroundColor != null ? btnBackgroundColor\n- : Constants.BLUE;\n-\n- this.textColor = btnTextColor != null ? btnTextColor : Constants.BLUE;\n- this.borderColor = btnBorderColor !=null ? btnBorderColor : Constants.WHITE;\n- this.borderRadius = btnBorderRadius != null ? btnBorderRadius : \"2\";//Adding default value as 2 instead of an empty value.\n- // If the value is empty then action btn defaults to standard btn without any customizations\n- return this;\n- }\n+// CTInAppNotificationButton initWithLocalData(String btnText, String btnBackgroundColor,\n+// String btnTextColor, String btnBorderColor,\n+// String btnBorderRadius) {\n+//\n+// this.text = btnText != null ? btnText : \"\";\n+// this.backgroundColor = btnBackgroundColor != null ? btnBackgroundColor\n+// : Constants.BLUE;\n+//\n+// this.textColor = btnTextColor != null ? btnTextColor : Constants.BLUE;\n+// this.borderColor = btnBorderColor !=null ? btnBorderColor : Constants.WHITE;\n+// this.borderRadius = btnBorderRadius != null ? btnBorderRadius : \"2\";//Adding default value as 2 instead of an empty value.\n+// // If the value is empty then action btn defaults to standard btn without any customizations\n+// return this;\n+// }\n/**\n* Checks if custom Key Value pair is present or not\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationMedia.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationMedia.java",
"diff": "@@ -102,19 +102,19 @@ public class CTInAppNotificationMedia implements Parcelable {\n}\n}\n- CTInAppNotificationMedia initWithLocalData(String imgURI, int orientation) {\n- this.orientation = orientation;\n- this.contentType = \"image\";\n- if (!imgURI.isEmpty()) {\n- this.mediaUrl = imgURI;\n- this.cacheKey = UUID.randomUUID().toString();\n- }\n- if (contentType.isEmpty()) {\n- return null;\n- } else {\n- return this;\n- }\n- }\n+// CTInAppNotificationMedia initWithLocalData(String imgURI, int orientation) {\n+// this.orientation = orientation;\n+// this.contentType = \"image\";\n+// if (!imgURI.isEmpty()) {\n+// this.mediaUrl = imgURI;\n+// this.cacheKey = UUID.randomUUID().toString();\n+// }\n+// if (contentType.isEmpty()) {\n+// return null;\n+// } else {\n+// return this;\n+// }\n+// }\nboolean isAudio() {\nString contentType = this.getContentType();\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTLocalInAppBuilder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTLocalInAppBuilder.java",
"diff": "@@ -172,51 +172,42 @@ public class CTLocalInAppBuilder {\n}\npublic Builder6 btnTextColor(String btnTextColor) throws JSONException {\n- this.builder.positiveButtonObject.put(Constants.KEY_COLOR, btnTextColor);\n- this.builder.negativeButtonObject.put(Constants.KEY_COLOR, btnTextColor);\n-\n- this.builder.buttonArray.put(0, this.builder.positiveButtonObject);\n- this.builder.buttonArray.put(1, this.builder.negativeButtonObject);\n-\n- this.builder.jsonObject.put(Constants.KEY_BUTTONS, this.builder.buttonArray);\n+ this.builder.jsonObject.put(Constants.KEY_BUTTONS,\n+ getActionButtonJSONArray(Constants.KEY_COLOR, btnTextColor));\nreturn this;\n}\npublic Builder6 btnBackgroundColor(String btnBackgroundColor) throws JSONException {\n- this.builder.positiveButtonObject.put(Constants.KEY_BG, btnBackgroundColor);\n- this.builder.negativeButtonObject.put(Constants.KEY_BG, btnBackgroundColor);\n-\n- this.builder.buttonArray.put(0, this.builder.positiveButtonObject);\n- this.builder.buttonArray.put(1, this.builder.negativeButtonObject);\n-\n- this.builder.jsonObject.put(Constants.KEY_BUTTONS, this.builder.buttonArray);\n+ this.builder.jsonObject.put(Constants.KEY_BUTTONS,\n+ getActionButtonJSONArray(Constants.KEY_BG, btnBackgroundColor));\nreturn this;\n}\npublic Builder6 btnBorderColor(String btnBorderColor) throws JSONException {\n- this.builder.positiveButtonObject.put(Constants.KEY_BORDER, btnBorderColor);\n- this.builder.negativeButtonObject.put(Constants.KEY_BORDER, btnBorderColor);\n-\n- this.builder.buttonArray.put(0, this.builder.positiveButtonObject);\n- this.builder.buttonArray.put(1, this.builder.negativeButtonObject);\n-\n- this.builder.jsonObject.put(Constants.KEY_BUTTONS, this.builder.buttonArray);\n+ this.builder.jsonObject.put(Constants.KEY_BUTTONS,\n+ getActionButtonJSONArray(Constants.KEY_BORDER, btnBorderColor));\nreturn this;\n}\npublic Builder6 btnBorderRadius(String btnBorderRadius) throws JSONException {\nthis.builder.btnBorderRadius = btnBorderRadius;\n- this.builder.positiveButtonObject.put(Constants.KEY_RADIUS, btnBorderRadius);\n- this.builder.negativeButtonObject.put(Constants.KEY_RADIUS, btnBorderRadius);\n+ this.builder.jsonObject.put(Constants.KEY_BUTTONS,\n+ getActionButtonJSONArray(Constants.KEY_RADIUS, btnBorderRadius));\n+ return this;\n+ }\n+ public JSONObject build() {\n+ return this.builder.jsonObject;\n+ }\n+\n+\n+ private JSONArray getActionButtonJSONArray(String key, String value) throws JSONException{\n+ this.builder.positiveButtonObject.put(key, value);\n+ this.builder.negativeButtonObject.put(key, value);\nthis.builder.buttonArray.put(0, this.builder.positiveButtonObject);\nthis.builder.buttonArray.put(1, this.builder.negativeButtonObject);\n- this.builder.jsonObject.put(Constants.KEY_BUTTONS, this.builder.buttonArray);\n- return this;\n- }\n- public JSONObject build() throws JSONException {\n- return this.builder.jsonObject;\n+ return this.builder.buttonArray;\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -22,7 +22,7 @@ import com.clevertap.android.sdk.InAppNotificationActivity;\nimport com.clevertap.android.sdk.InAppNotificationListener;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.ManifestInfo;\n-import com.clevertap.android.sdk.PushPermissionNotificationResponseListener;\n+import com.clevertap.android.sdk.PushPermissionResponseListener;\nimport com.clevertap.android.sdk.StorageHelper;\nimport com.clevertap.android.sdk.Utils;\nimport com.clevertap.android.sdk.task.CTExecutorFactory;\n@@ -178,10 +178,21 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\npublic void promptPermission(){\n- InAppNotificationActivity.startPrompt(Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n+ startPrompt(Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\nconfig);\n}\n+ public void startPrompt(Activity activity, CleverTapInstanceConfig config){\n+ if (!activity.getClass().equals(InAppNotificationActivity.class)) {\n+ Intent intent = new Intent(activity, InAppNotificationActivity.class);\n+ Bundle configBundle = new Bundle();\n+ configBundle.putParcelable(\"config\", config);\n+ intent.putExtra(\"configBundle\", configBundle);\n+ intent.putExtra(\"displayHardPermissionDialog\", true);\n+ activity.startActivity(intent);\n+ }\n+ }\n+\n@RequiresApi(api = 33)\npublic boolean isNotificationPermissionGranted(){\nint permissionStatus = InAppNotificationActivity.isNotificationPermissionGranted(\n@@ -304,17 +315,17 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n@Override\npublic void onAccept() {\n- final PushPermissionNotificationResponseListener listener = callbackManager.getPushPermissionNotificationResponseListener();\n+ final PushPermissionResponseListener listener = callbackManager.getPushPermissionNotificationResponseListener();\nif (listener != null){\n- listener.response(true);\n+ listener.onPushPermissionResponse(true);\n}\n}\n@Override\npublic void onReject() {\n- final PushPermissionNotificationResponseListener listener = callbackManager.getPushPermissionNotificationResponseListener();\n+ final PushPermissionResponseListener listener = callbackManager.getPushPermissionNotificationResponseListener();\nif (listener != null){\n- listener.response(false);\n+ listener.onPushPermissionResponse(false);\n}\n}\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/NavigateToAndroidSettingsForNotifications.kt",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.inapp\n-\n-import android.content.Context\n-import android.content.Intent\n-\n-object NavigateToAndroidSettingsForNotifications {\n- fun show(context: Context) {\n- val intent = Intent()\n- intent.action = \"android.settings.APP_NOTIFICATION_SETTINGS\"\n- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)\n-\n- //for Android 5-7\n- intent.putExtra(\"app_package\", context.getPackageName())\n- intent.putExtra(\"app_uid\", context.getApplicationInfo().uid)\n-\n- // for Android 8 and above\n- intent.putExtra(\"android.provider.extra.APP_PACKAGE\", context.getPackageName())\n- context.startActivity(intent)\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/HomeScreenActivity.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/HomeScreenActivity.kt",
"diff": "@@ -30,7 +30,8 @@ import java.util.HashMap\nprivate const val TAG = \"HomeScreenActivity\"\nclass HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitListener, CTProductConfigListener,\n- CTFeatureFlagsListener, SyncListener, InAppNotificationListener, PushPermissionNotificationResponseListener,\n+ CTFeatureFlagsListener, SyncListener, InAppNotificationListener,\n+ PushPermissionResponseListener,\nInAppNotificationButtonListener, PushPrimerButtonListener {\nvar cleverTapDefaultInstance: CleverTapAPI? = null\n@@ -258,7 +259,7 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\nLog.i(TAG, \"InApp---> onDismissed() called\")\n}\n- override fun response(accepted: Boolean) {\n+ override fun onPushPermissionResponse(accepted: Boolean) {\nLog.i(TAG, \"InApp---> response() called $accepted\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "@@ -386,7 +386,11 @@ private val activity:FragmentActivity?) : ViewModel() {\n}\n\"102\"->{\n- cleverTapAPI?.promptForNotificationPermission()\n+ if (cleverTapAPI?.isNotificationPermissionGranted == false) {\n+ cleverTapAPI.promptForNotificationPermission()\n+ }else{\n+ Log.v(\"HomeScreenViewModel\",\"Notification permission is already granted.\")\n+ }\n}\n//\"60\" -> webViewClickListener?.onWebViewClick()\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | chore(SDK-1970)- Refactor hard permission dialog listener,`CTLocalInAppBuilder`,navigation to settings dialog flow, Remove unused code in `CTInAppNotificationButton` and `CTInAppNotificationMedia` |
116,620 | 04.10.2022 17:46:42 | -19,080 | 4306a6b7c3bb2c97ef599bbeaaa6bfd28ca7efda | SSL Pinning and release 4.6.4 | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -26,7 +26,7 @@ We publish the SDK to `mavenCentral` as an `AAR` file. Just declare it as depend\n```groovy\ndependencies {\n- implementation \"com.clevertap.android:clevertap-android-sdk:4.6.3\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.6.4\"\n}\n```\n@@ -34,7 +34,7 @@ Alternatively, you can download and add the AAR file included in this repo in yo\n```groovy\ndependencies {\n- implementation (name: \"clevertap-android-sdk-4.6.3\", ext: 'aar')\n+ implementation (name: \"clevertap-android-sdk-4.6.4\", ext: 'aar')\n}\n```\n@@ -46,7 +46,7 @@ Add the Firebase Messaging library and Android Support Library v4 as dependencie\n```groovy\ndependencies {\n- implementation \"com.clevertap.android:clevertap-android-sdk:4.6.3\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.6.4\"\nimplementation \"androidx.core:core:1.3.0\"\nimplementation \"com.google.firebase:firebase-messaging:21.0.0\"\nimplementation \"com.google.android.gms:play-services-ads:19.4.0\" // Required only if you enable Google ADID collection in the SDK (turned off by default).\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTCORECHANGELOG.md",
"new_path": "docs/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.6.4 (October 11, 2022)\n+* Improvement : Updated SSL Pinning Certificates\n+\n### Version 4.6.3 (September 20, 2022)\n* Fix crash in App inbox when No additional tabs are used .\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTGEOFENCE.md",
"new_path": "docs/CTGEOFENCE.md",
"diff": "@@ -17,7 +17,7 @@ Add the following dependencies to the `build.gradle`\n```Groovy\nimplementation \"com.clevertap.android:clevertap-geofence-sdk:1.1.0\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.6.3\" // 3.9.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.6.4\" // 3.9.0 and above\nimplementation \"com.google.android.gms:play-services-location:18.0.0\"\nimplementation \"androidx.work:work-runtime:2.7.0\" // required for FETCH_LAST_LOCATION_PERIODIC\nimplementation \"androidx.concurrent:concurrent-futures:1.1.0\" // required for FETCH_LAST_LOCATION_PERIODIC\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTPUSHTEMPLATES.md",
"new_path": "docs/CTPUSHTEMPLATES.md",
"diff": "@@ -21,7 +21,7 @@ CleverTap Push Templates SDK helps you engage with your users using fancy push n\n```groovy\nimplementation \"com.clevertap.android:push-templates:1.0.5\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.6.3\" // 4.4.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.6.4\" // 4.4.0 and above\n```\n2. Add the following line to your Application class before the `onCreate()`\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTCORECHANGELOG.md",
"new_path": "templates/CTCORECHANGELOG.md",
"diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.6.4 (October 11, 2022)\n+* Improvement : Updated SSL Pinning Certificates\n+\n### Version 4.6.3 (September 20, 2022)\n* Fix crash in App inbox when No additional tabs are used .\n"
},
{
"change_type": "MODIFY",
"old_path": "versions.properties",
"new_path": "versions.properties",
"diff": "@@ -321,7 +321,7 @@ version.com.android.installreferrer..installreferrer=2.2\nversion.com.android.tools.lint..lint-api=27.0.1\nversion.com.android.tools.lint..lint-checks=27.0.1\n-version.com.clevertap.android..clevertap-android-sdk=4.6.3\n+version.com.clevertap.android..clevertap-android-sdk=4.6.4\nversion.com.clevertap.android..clevertap-geofence-sdk=1.1.0\nversion.com.clevertap.android..clevertap-hms-sdk=1.3.1\nversion.com.clevertap.android..clevertap-xiaomi-sdk=1.5.0\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2240] SSL Pinning and release 4.6.4 |
116,620 | 04.10.2022 17:55:16 | -19,080 | e6411ca652e99fb635069f5ad5ba492815c51e67 | renaming certifcate as it was not getting picked as change by github diff | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/SSLContextBuilder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/SSLContextBuilder.java",
"diff": "@@ -20,10 +20,9 @@ final class SSLContextBuilder {\nkeyStore.load(null, null);//Use null inputstream & password to create empty key store\n//noinspection ConstantConditions\n- InputStream inputStream3 = new BufferedInputStream(getClass().getClassLoader().getResourceAsStream(\"com/clevertap/android/sdk/certificates/AmazonRootCA1.cer\"));\n+ InputStream inputStream3 = new BufferedInputStream(getClass().getClassLoader().getResourceAsStream(\"com/clevertap/android/sdk/certificates/AmazonRootCA.cer\"));\nX509Certificate x509Certificate3 = (X509Certificate) certificateFactory.generateCertificate(inputStream3);\n- keyStore.setCertificateEntry(\"AmazonRootCA1\", x509Certificate3);\n-\n+ keyStore.setCertificateEntry(\"AmazonRootCA\", x509Certificate3);\ntrustManagerFactory.init(keyStore);\nSSLContext sslContext = SSLContext.getInstance(\"TLS\");\nsslContext.init(null, trustManagerFactory.getTrustManagers(), null);\n"
},
{
"change_type": "RENAME",
"old_path": "clevertap-core/src/main/resources/com/clevertap/android/sdk/certificates/AmazonRootCA1.cer",
"new_path": "clevertap-core/src/main/resources/com/clevertap/android/sdk/certificates/AmazonRootCA.cer",
"diff": ""
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2240] renaming certifcate as it was not getting picked as change by github diff |
116,620 | 04.10.2022 18:22:55 | -19,080 | 3137410d3a285fabeefc8ce7122886383abc351a | support for multi instance | [
{
"change_type": "MODIFY",
"old_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiSdkHandler.java",
"new_path": "clevertap-xps/src/main/java/com/clevertap/android/xps/XiaomiSdkHandler.java",
"diff": "@@ -92,7 +92,7 @@ class XiaomiSdkHandler implements IMiSdkHandler {\nLogger.v(\"XiaomiSDKHandler: register | called with appid = \"+appId + \", appkey=\"+appKey);\ntry {\n- String region = manifestInfo.getAccountRegion();\n+ String region = mConfig.getAccountRegion();\nregion = (region==null || region.isEmpty())? Constants.REGION_EUROPE : region;\nLogger.v(\"XiaomiSDKHandler: register | final region from manifest = \"+region);\n@@ -104,14 +104,10 @@ class XiaomiSdkHandler implements IMiSdkHandler {\nMiPushClient.setRegion(xiaomiRegion);\nMiPushClient.registerPush(context, appId, appKey);\nisRegistered = true;\n- mConfig\n- .log(LOG_TAG, XIAOMI_LOG_TAG + \"Xiaomi Registeration success for appId-\" + appId + \" and appKey-\"\n- + appKey);\n+ mConfig.log(LOG_TAG, XIAOMI_LOG_TAG + \"Xiaomi Registeration success for appId-\" + appId + \" and appKey-\" + appKey);\n} catch (Throwable throwable) {\nisRegistered = false;\n- mConfig\n- .log(LOG_TAG,\n- XIAOMI_LOG_TAG + \"Xiaomi Registration failed for appId-\" + appId + \" appKey-\" + appKey);\n+ mConfig.log(LOG_TAG, XIAOMI_LOG_TAG + \"Xiaomi Registration failed for appId-\" + appId + \" appKey-\" + appKey);\nthrow new RegistrationException(\"Registration failed for appId \" + appId + \" and appKey \" + appKey);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/CTXIAOMIPUSHCHANGELOG.md",
"new_path": "docs/CTXIAOMIPUSHCHANGELOG.md",
"diff": "## CleverTap Xiaomi Push SDK CHANGE LOG\n+### Version 1.5.1 (October 11, 2022)\n+* Support for providing region to MiPushClient via MultiInstance too\n+\n### Version 1.5.0 (September 6, 2022)\n* Supporting Xiaomi Regions\n* This Release makes the CT XPS SDK compatible with the latest [Xiaomi Privacy Upgrades](https://dev.mi.com/console/doc/detail?pId=2761)\n"
},
{
"change_type": "MODIFY",
"old_path": "templates/CTXIAOMIPUSHCHANGELOG.md",
"new_path": "templates/CTXIAOMIPUSHCHANGELOG.md",
"diff": "## CleverTap Xiaomi Push SDK CHANGE LOG\n+### Version 1.5.1 (October 11, 2022)\n+* Support for providing region to MiPushClient via MultiInstance too\n+\n### Version 1.5.0 (September 6, 2022)\n* Supporting Xiaomi Regions\n* This Release makes the CT XPS SDK compatible with the latest [Xiaomi Privacy Upgrades](https://dev.mi.com/console/doc/detail?pId=2761)\n"
},
{
"change_type": "MODIFY",
"old_path": "versions.properties",
"new_path": "versions.properties",
"diff": "@@ -324,7 +324,7 @@ version.com.android.tools.lint..lint-checks=27.0.1\nversion.com.clevertap.android..clevertap-android-sdk=4.6.3\nversion.com.clevertap.android..clevertap-geofence-sdk=1.1.0\nversion.com.clevertap.android..clevertap-hms-sdk=1.3.1\n-version.com.clevertap.android..clevertap-xiaomi-sdk=1.5.0\n+version.com.clevertap.android..clevertap-xiaomi-sdk=1.5.1\nversion.com.clevertap.android..push-templates=1.0.5\nversion.com.github.bumptech.glide..glide=4.12.0\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2250] support for multi instance |
116,616 | 06.10.2022 16:08:36 | -19,080 | 098fca8ebb926bd69f39f1c58826fc965b6e9cf6 | task(SDK-2169)- Maintain count when local IAM is called | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -40,6 +40,7 @@ import java.util.concurrent.Callable;\nimport org.json.JSONObject;\nimport static android.content.Context.USAGE_STATS_SERVICE;\n+import static com.clevertap.android.sdk.inapp.InAppController.LOCAL_INAPP_COUNT;\n@RestrictTo(Scope.LIBRARY)\npublic class DeviceInfo {\n@@ -725,6 +726,10 @@ public class DeviceInfo {\nreturn getDeviceCachedInfo().widthPixels;\n}\n+ public int getLocalInAppCount(){\n+ return StorageHelper.getInt(context,LOCAL_INAPP_COUNT,0);\n+ }\n+\nvoid onInitDeviceInfo(final String cleverTapID) {\nTask<Void> taskDeviceCachedInfo = CTExecutorFactory.executors(config).ioTask();\ntaskDeviceCachedInfo.execute(\"getDeviceCachedInfo\", new Callable<Void>() {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"diff": "@@ -223,9 +223,6 @@ public class CTInAppNotification implements Parcelable {\nprivate boolean isLocalInApp = false;\n- private static final String HALF_INTERSTITIAL_LOCAL_IN_APP = \"half-interstitial\";\n- private static final String ALERT_LOCAL_IN_APP = \"alert-template\";\n-\nCTInAppNotification() {\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -113,6 +113,8 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nprivate final MainLooperHandler mainLooperHandler;\n+ public final static String LOCAL_INAPP_COUNT = \"local_in_app_count\";\n+\npublic InAppController(Context context,\nCleverTapInstanceConfig config,\nMainLooperHandler mainLooperHandler,\n@@ -473,7 +475,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nreturn;\n}\nshowInApp(context, inAppNotification, config, this);\n-\n+ incrementLocalInAppCountInPersistentStore(context, inAppNotification);\n}\n//InApp\n@@ -551,6 +553,14 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\n}\n+ private void incrementLocalInAppCountInPersistentStore(Context context, CTInAppNotification inAppNotification) {\n+ if (inAppNotification.isLocalInApp()){\n+ int localInAppCount = StorageHelper.getInt(context,LOCAL_INAPP_COUNT,0);\n+ ++localInAppCount;\n+ StorageHelper.putInt(context,LOCAL_INAPP_COUNT,localInAppCount);\n+ }\n+ }\n+\n//InApp\nprivate static void showInApp(Context context, final CTInAppNotification inAppNotification,\nCleverTapInstanceConfig config, InAppController inAppController) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/CTJsonConverter.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/utils/CTJsonConverter.java",
"diff": "@@ -127,6 +127,8 @@ public class CTJsonConverter {\nevtData.put(\"Radio\", radio);\n}\n}\n+ //Adds an extra field to send local inApp count in queueData.\n+ evtData.put(\"LIAMC\",deviceInfo.getLocalInAppCount());\n} catch (Throwable t) {\n// Ignore\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-2169)- Maintain count when local IAM is called |
116,620 | 07.10.2022 13:34:34 | -19,080 | 8c502cba9c883d7ca6d3b623df136bf25c2688c3 | undo amazon certificate renaming | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/SSLContextBuilder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/SSLContextBuilder.java",
"diff": "@@ -20,9 +20,9 @@ final class SSLContextBuilder {\nkeyStore.load(null, null);//Use null inputstream & password to create empty key store\n//noinspection ConstantConditions\n- InputStream inputStream3 = new BufferedInputStream(getClass().getClassLoader().getResourceAsStream(\"com/clevertap/android/sdk/certificates/AmazonRootCA.cer\"));\n+ InputStream inputStream3 = new BufferedInputStream(getClass().getClassLoader().getResourceAsStream(\"com/clevertap/android/sdk/certificates/AmazonRootCA1.cer\"));\nX509Certificate x509Certificate3 = (X509Certificate) certificateFactory.generateCertificate(inputStream3);\n- keyStore.setCertificateEntry(\"AmazonRootCA\", x509Certificate3);\n+ keyStore.setCertificateEntry(\"AmazonRootCA1\", x509Certificate3);\ntrustManagerFactory.init(keyStore);\nSSLContext sslContext = SSLContext.getInstance(\"TLS\");\nsslContext.init(null, trustManagerFactory.getTrustManagers(), null);\n"
},
{
"change_type": "RENAME",
"old_path": "clevertap-core/src/main/resources/com/clevertap/android/sdk/certificates/AmazonRootCA.cer",
"new_path": "clevertap-core/src/main/resources/com/clevertap/android/sdk/certificates/AmazonRootCA1.cer",
"diff": ""
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2225] undo amazon certificate renaming |
116,616 | 07.10.2022 17:16:48 | -19,080 | d48a63ce92db590369694e570f3a8269471d0645 | task(SDK-1970)- Allow `fallBackToNotificationSettings` in local inApp, refactor CleverTapAPI.java, AlertDialogPromptForSettings.kt and InAppController.java, Update sample, | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTWebInterface.java",
"diff": "@@ -30,7 +30,7 @@ public class CTWebInterface {\nif (cleverTapAPI == null) {\nLogger.d(\"CleverTap Instance is null.\");\n} else {\n- cleverTapAPI.promptForNotificationPermission();\n+ cleverTapAPI.promptForPushPermission();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -1033,9 +1033,9 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n- public boolean isNotificationPermissionGranted(){\n+ public boolean isPushPermissionGranted(){\nif (isAndroid13(context)) {\n- return coreState.getInAppController().isNotificationPermissionGranted();\n+ return coreState.getInAppController().isPushPermissionGranted();\n}else{\nreturn false;\n}\n@@ -1049,8 +1049,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n- public void promptForNotificationPermission(){\n- if (isAndroid13(context)){//TODO check for multi instance support\n+ public void promptForPushPermission(){\n+ if (isAndroid13(context)){\ncoreState.getInAppController().promptPermission();\n}else{\nLogger.v(\"Ensure your app supports Android 13 to verify permission access for notifications.\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -183,16 +183,26 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\n}\n+ @RequiresApi(api = 33)\npublic void requestPermission() {\n+ int permissionStatus = ContextCompat.checkSelfPermission(this,\n+ Manifest.permission.POST_NOTIFICATIONS);\n+\n+ if (permissionStatus == PackageManager.PERMISSION_DENIED){\nboolean neverAskAgainClicked = !ActivityCompat.shouldShowRequestPermissionRationale(\nInAppNotificationActivity.this, ANDROID_PERMISSION_STRING);\n- if (neverAskAgainClicked) {\n+ if (neverAskAgainClicked && inAppNotification.fallBackToNotificationSettings()) {\n+ showFallbackAlertDialog();\n+ return;\n+ }\n+\nActivityCompat.requestPermissions(this,\nnew String[]{ANDROID_PERMISSION_STRING}, PERMISSION_REQUEST_CODE);\n- }else{\n- permissionCallbackWeakReference.get().onReject();\n- showFallbackAlertDialog();\n+\n+ }else if (permissionStatus == PackageManager.PERMISSION_GRANTED){\n+ permissionCallbackWeakReference.get().onAccept();\n+ didDismiss(null);\n}\n}\n@@ -226,12 +236,6 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n});\n}\n- @RequiresApi(api = 33)\n- public static int isNotificationPermissionGranted(Activity activity){\n- return ContextCompat.checkSelfPermission(\n- activity, Manifest.permission.POST_NOTIFICATIONS);\n- }\n-\nvoid didDismiss(Bundle data) {\nif (isAlertVisible) {\nisAlertVisible = false;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/AlertDialogPromptForSettings.kt",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/AlertDialogPromptForSettings.kt",
"diff": "@@ -19,6 +19,18 @@ object AlertDialogPromptForSettings {\nval message = activity.getString(R.string.permission_not_available_message)\n+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {\n+ AlertDialog.Builder(activity, android.R.style.Theme_Material_Light_Dialog_Alert)\n+ .setTitle(title)\n+ .setMessage(message)\n+ .setPositiveButton(R.string.permission_not_available_open_settings_option) { dialog, which ->\n+ callback.onAccept()\n+ }\n+ .setNegativeButton(android.R.string.no) { dialog, which ->\n+ callback.onDecline()\n+ }\n+ .show()\n+ }else{\nAlertDialog.Builder(activity)\n.setTitle(title)\n.setMessage(message)\n@@ -31,3 +43,4 @@ object AlertDialogPromptForSettings {\n.show()\n}\n}\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFragment.java",
"diff": "@@ -144,7 +144,7 @@ public abstract class CTInAppBaseFragment extends Fragment {\nif (index == 0 && inAppNotification.isLocalInApp()) {\n((InAppNotificationActivity) context).prompt();\n}else if (index == 1 && inAppNotification.isLocalInApp()){\n- didDismiss(null);\n+ didDismiss(data);\n}else {\nString actionUrl = button.getActionUrl();\nif (actionUrl != null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"diff": "package com.clevertap.android.sdk.inapp;\n+import static com.clevertap.android.sdk.inapp.CTLocalInAppBuilder.FALLBACK_TO_NOTIFICATION_SETTINGS;\nimport static com.clevertap.android.sdk.inapp.CTLocalInAppBuilder.IS_LOCAL_INAPP;\nimport android.content.res.Configuration;\nimport android.graphics.Bitmap;\n@@ -223,6 +224,8 @@ public class CTInAppNotification implements Parcelable {\nprivate boolean isLocalInApp = false;\n+ private boolean fallBackToNotificationSettings = false;\n+\nCTInAppNotification() {\n}\n@@ -271,6 +274,7 @@ public class CTInAppNotification implements Parcelable {\nisPortrait = in.readByte() != 0x00;\nisLandscape = in.readByte() != 0x00;\nisLocalInApp = in.readByte() != 0x00;\n+ fallBackToNotificationSettings = in.readByte() != 0x00;\nlandscapeImageUrl = in.readString();\n_landscapeImageCacheKey = in.readString();\ntimeToLive = in.readLong();\n@@ -359,6 +363,7 @@ public class CTInAppNotification implements Parcelable {\ndest.writeByte((byte) (isPortrait ? 0x01 : 0x00));\ndest.writeByte((byte) (isLandscape ? 0x01 : 0x00));\ndest.writeByte((byte) (isLocalInApp ? 0x01 : 0x00));\n+ dest.writeByte((byte) (fallBackToNotificationSettings ? 0x01 : 0x00));\ndest.writeString(landscapeImageUrl);\ndest.writeString(_landscapeImageCacheKey);\ndest.writeLong(timeToLive);\n@@ -400,6 +405,10 @@ public class CTInAppNotification implements Parcelable {\nreturn isLocalInApp;\n}\n+ public boolean fallBackToNotificationSettings() {\n+ return fallBackToNotificationSettings;\n+ }\n+\nbyte[] getGifByteArray(CTInAppNotificationMedia inAppMedia) {\nreturn GifCache.getByteArray(inAppMedia.getCacheKey());\n}\n@@ -589,6 +598,8 @@ public class CTInAppNotification implements Parcelable {\n.getString(Constants.NOTIFICATION_ID_TAG) : \"\";\nthis.type = jsonObject.getString(Constants.KEY_TYPE);\nthis.isLocalInApp = jsonObject.has(IS_LOCAL_INAPP) && jsonObject.getBoolean(IS_LOCAL_INAPP);\n+ this.fallBackToNotificationSettings = jsonObject.has(FALLBACK_TO_NOTIFICATION_SETTINGS) &&\n+ jsonObject.getBoolean(FALLBACK_TO_NOTIFICATION_SETTINGS);\nthis.excludeFromCaps = jsonObject.has(Constants.KEY_EFC) && jsonObject.getInt(Constants.KEY_EFC) == 1;\nthis.totalLifetimeCount = jsonObject.has(Constants.KEY_TLC) ? jsonObject.getInt(Constants.KEY_TLC) : -1;\nthis.totalDailyCount = jsonObject.has(Constants.KEY_TDC) ? jsonObject.getInt(Constants.KEY_TDC) : -1;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTLocalInAppBuilder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTLocalInAppBuilder.java",
"diff": "@@ -15,6 +15,7 @@ public class CTLocalInAppBuilder {\npublic static final String HALF_INTERSTITIAL_INAPP = \"half-interstitial\";\npublic static final String ALERT_INAPP = \"alert-template\";\nprotected static final String IS_LOCAL_INAPP = \"isLocalInApp\";\n+ protected static final String FALLBACK_TO_NOTIFICATION_SETTINGS = \"fallbackToNotificationSettings\";\nprivate final String localInAppType;//Required\nprivate final JSONObject titleObj;// Required\n@@ -141,6 +142,11 @@ public class CTLocalInAppBuilder {\nthis.builder = builder;\n}\n+ public Builder6 fallbackToSettings(boolean fallbackToSettings) throws JSONException {\n+ this.builder.jsonObject.put(FALLBACK_TO_NOTIFICATION_SETTINGS, fallbackToSettings);\n+ return this;\n+ }\n+\npublic Builder6 backgroundColor(String backgroundColor) throws JSONException {\nthis.builder.jsonObject.put(Constants.KEY_BG, backgroundColor);\nreturn this;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "package com.clevertap.android.sdk.inapp;\n+import android.Manifest;\nimport android.app.Activity;\nimport android.content.Context;\nimport android.content.Intent;\n@@ -9,6 +10,7 @@ import android.os.Bundle;\nimport android.os.Looper;\nimport androidx.annotation.RequiresApi;\n+import androidx.core.content.ContextCompat;\nimport androidx.fragment.app.Fragment;\nimport androidx.fragment.app.FragmentActivity;\nimport androidx.fragment.app.FragmentTransaction;\n@@ -196,9 +198,10 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\n@RequiresApi(api = 33)\n- public boolean isNotificationPermissionGranted(){\n- int permissionStatus = InAppNotificationActivity.isNotificationPermissionGranted(\n- Objects.requireNonNull(CoreMetaData.getCurrentActivity()));\n+ public boolean isPushPermissionGranted(){\n+ int permissionStatus = ContextCompat.checkSelfPermission(\n+ Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n+ Manifest.permission.POST_NOTIFICATIONS);\nreturn permissionStatus == PackageManager.PERMISSION_GRANTED;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/HomeScreenActivity.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/HomeScreenActivity.kt",
"diff": "@@ -8,6 +8,7 @@ import android.os.Build\nimport android.os.Bundle\nimport android.util.Log\n+import android.widget.Toast\nimport androidx.appcompat.app.AppCompatActivity\nimport androidx.fragment.app.commitNow\nimport com.clevertap.android.sdk.*\n@@ -261,6 +262,11 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\noverride fun onPushPermissionResponse(accepted: Boolean) {\nLog.i(TAG, \"InApp---> response() called $accepted\")\n+ if(accepted){\n+ Toast.makeText(this, \"Permission granted!\", Toast.LENGTH_SHORT).show()\n+ }else{\n+ Toast.makeText(this, \"Permission denied!\", Toast.LENGTH_SHORT).show()\n+ }\n}\noverride fun onInAppButtonClick(payload: HashMap<String, String>?) {\n@@ -268,10 +274,10 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\n}\noverride fun onPositiveButtonClick(ctInAppNotification: CTInAppNotification?) {\n- Log.v(TAG, \"onPositiveButtonClick() called\")\n+ Log.i(TAG, \"onPositiveButtonClick() called\")\n}\noverride fun onNegativeButtonClick(ctInAppNotification: CTInAppNotification?) {\n- Log.v(TAG, \"onNegativeButtonClick() called\")\n+ Log.i(TAG, \"onNegativeButtonClick() called\")\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenModel.kt",
"diff": "@@ -66,7 +66,11 @@ object HomeScreenModel {\n),\n\"PROMPT LOCAL IN-APP\" to listOf(\n\"Generate Half-Interstitial Local InApp\",\n+ \"Generate Half-Interstitial Local InApp with image URL\",\n+ \"Generate Half-Interstitial Local InApp with fallbackToSettings - true\",\n\"Generate Alert Local InApp\",\n+ \"Generate Alert Local InApp with followDeviceOrientation - false\",\n+ \"Generate Alert Local InApp with fallbackToSettings - true\",\n\"Generate hard permission dialog\"\n)\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "@@ -346,7 +346,6 @@ private val activity:FragmentActivity?) : ViewModel() {\n\"918\"-> cleverTapAPI?.pushEvent(\"Send Input Box Reminder DOC false\")\n\"919\"-> cleverTapAPI?.pushEvent(\"Send Three CTA Notification\")\n\"100\"-> {\n- if (cleverTapAPI?.isNotificationPermissionGranted == false){\nval builder = CTLocalInAppBuilder.builder()\n.inAppType(HALF_INTERSTITIAL_INAPP,activity)\n.titleText(\"Get Notified\")\n@@ -360,17 +359,50 @@ private val activity:FragmentActivity?) : ViewModel() {\n.messageTextColor(Constants.BLACK)\n.btnTextColor(Constants.WHITE)\n.btnBackgroundColor(Constants.BLUE)\n- .imageUrl(\"https://icons.iconarchive.com/icons/treetog/junior/64/camera-icon.png\")\n.build()\n- cleverTapAPI.promptPushPrimer(builder)\n+ cleverTapAPI?.promptPushPrimer(builder)\n+ }\n- }else{\n- Log.v(\"HomeScreenViewModel\",\"Notification permission is already granted.\")\n+ \"101\"->{\n+ val builder = CTLocalInAppBuilder.builder()\n+ .inAppType(HALF_INTERSTITIAL_INAPP,activity)\n+ .titleText(\"Get Notified\")\n+ .messageText(\"Please enable notifications on your device to use Push Notifications.\")\n+ .followDeviceOrientation(true)\n+ .positiveBtnText(\"Allow\")\n+ .negativeBtnText(\"Cancel\")\n+ .backgroundColor(Constants.WHITE)\n+ .btnBorderColor(Constants.BLUE)\n+ .titleTextColor(Constants.BLUE)\n+ .messageTextColor(Constants.BLACK)\n+ .btnTextColor(Constants.WHITE)\n+ .btnBackgroundColor(Constants.BLUE)\n+ .imageUrl(\"https://icons.iconarchive.com/icons/treetog/junior/64/camera-icon.png\")\n+ .build()\n+ cleverTapAPI?.promptPushPrimer(builder)\n}\n+\n+ \"102\"->{\n+ val builder = CTLocalInAppBuilder.builder()\n+ .inAppType(HALF_INTERSTITIAL_INAPP,activity)\n+ .titleText(\"Get Notified\")\n+ .messageText(\"Please enable notifications on your device to use Push Notifications.\")\n+ .followDeviceOrientation(true)\n+ .positiveBtnText(\"Allow\")\n+ .negativeBtnText(\"Cancel\")\n+ .backgroundColor(Constants.WHITE)\n+ .btnBorderColor(Constants.BLUE)\n+ .titleTextColor(Constants.BLUE)\n+ .messageTextColor(Constants.BLACK)\n+ .btnTextColor(Constants.WHITE)\n+ .btnBackgroundColor(Constants.BLUE)\n+ .fallbackToSettings(true)\n+ .build()\n+ cleverTapAPI?.promptPushPrimer(builder)\n+\n}\n- \"101\"->{\n- if (cleverTapAPI?.isNotificationPermissionGranted == false) {\n+ \"103\"->{\nval builder = CTLocalInAppBuilder.builder()\n.inAppType(ALERT_INAPP,activity)\n.titleText(\"Get Notified\")\n@@ -379,15 +411,38 @@ private val activity:FragmentActivity?) : ViewModel() {\n.positiveBtnText(\"Allow\")\n.negativeBtnText(\"Cancel\")\n.build()\n- cleverTapAPI.promptPushPrimer(builder)\n- }else{\n- Log.v(\"HomeScreenViewModel\",\"Notification permission is already granted.\")\n+ cleverTapAPI?.promptPushPrimer(builder)\n}\n+\n+ \"104\"->{\n+ val builder = CTLocalInAppBuilder.builder()\n+ .inAppType(ALERT_INAPP,activity)\n+ .titleText(\"Get Notified\")\n+ .messageText(\"Enable Notification permission\")\n+ .followDeviceOrientation(false)\n+ .positiveBtnText(\"Allow\")\n+ .negativeBtnText(\"Cancel\")\n+ .fallbackToSettings(true)\n+ .build()\n+ cleverTapAPI?.promptPushPrimer(builder)\n}\n- \"102\"->{\n- if (cleverTapAPI?.isNotificationPermissionGranted == false) {\n- cleverTapAPI.promptForNotificationPermission()\n+ \"105\"->{\n+ val builder = CTLocalInAppBuilder.builder()\n+ .inAppType(ALERT_INAPP,activity)\n+ .titleText(\"Get Notified\")\n+ .messageText(\"Enable Notification permission\")\n+ .followDeviceOrientation(false)\n+ .positiveBtnText(\"Allow\")\n+ .negativeBtnText(\"Cancel\")\n+ .fallbackToSettings(true)\n+ .build()\n+ cleverTapAPI?.promptPushPrimer(builder)\n+ }\n+\n+ \"106\"->{\n+ if (cleverTapAPI?.isPushPermissionGranted == false) {\n+ cleverTapAPI.promptForPushPermission()\n}else{\nLog.v(\"HomeScreenViewModel\",\"Notification permission is already granted.\")\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1970)- Allow `fallBackToNotificationSettings` in local inApp, refactor CleverTapAPI.java, AlertDialogPromptForSettings.kt and InAppController.java, Update sample, |
116,618 | 07.10.2022 18:44:17 | -19,080 | 610f8784e6db44cd42ab85bcadbac189107c916f | refactor(SDK-2296): replace directcall name convention with signedcall | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/AnalyticsManager.java",
"diff": "@@ -801,7 +801,7 @@ public class AnalyticsManager extends BaseAnalyticsManager {\n}\n}\n- Future<?> raiseEventForDirectCall(String eventName, JSONObject dcEventProperties) {\n+ Future<?> raiseEventForSignedCall(String eventName, JSONObject dcEventProperties) {\nFuture<?> future = null;\n@@ -812,8 +812,8 @@ public class AnalyticsManager extends BaseAnalyticsManager {\nfuture = baseEventQueueManager.queueEvent(context, event, Constants.RAISED_EVENT);\n} catch (JSONException e) {\n- config.getLogger().debug(config.getAccountId(), Constants.LOG_TAG_DIRECT_CALL +\n- \"JSON Exception when raising Direct Call event \"\n+ config.getLogger().debug(config.getAccountId(), Constants.LOG_TAG_SIGNED_CALL +\n+ \"JSON Exception when raising Signed Call event \"\n+ eventName + \" - \" + e.getLocalizedMessage());\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/BaseCallbackManager.java",
"diff": "@@ -2,7 +2,7 @@ package com.clevertap.android.sdk;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\n-import com.clevertap.android.sdk.interfaces.DCDomainCallback;\n+import com.clevertap.android.sdk.interfaces.SCDomainListener;\nimport com.clevertap.android.sdk.interfaces.NotificationRenderedListener;\nimport com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\n@@ -22,7 +22,7 @@ public abstract class BaseCallbackManager {\npublic abstract GeofenceCallback getGeofenceCallback();\n- public abstract DCDomainCallback getDCDomainCallback();\n+ public abstract SCDomainListener getSCDomainListener();\npublic abstract InAppNotificationButtonListener getInAppNotificationButtonListener();\n@@ -53,7 +53,7 @@ public abstract class BaseCallbackManager {\npublic abstract void setGeofenceCallback(GeofenceCallback geofenceCallback);\n- public abstract void setDCDomainCallback(DCDomainCallback dcDomainCallback);\n+ public abstract void setSCDomainListener(SCDomainListener scDomainListener);\npublic abstract void setInAppNotificationButtonListener(\nInAppNotificationButtonListener inAppNotificationButtonListener);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CallbackManager.java",
"diff": "@@ -6,7 +6,7 @@ import androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener;\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit;\n-import com.clevertap.android.sdk.interfaces.DCDomainCallback;\n+import com.clevertap.android.sdk.interfaces.SCDomainListener;\nimport com.clevertap.android.sdk.interfaces.NotificationRenderedListener;\nimport com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\n@@ -22,7 +22,7 @@ public class CallbackManager extends BaseCallbackManager {\nprivate GeofenceCallback geofenceCallback;\n- private DCDomainCallback dcDomainCallback;\n+ private SCDomainListener scDomainListener;\nprivate WeakReference<InAppNotificationButtonListener> inAppNotificationButtonListener;\n@@ -103,13 +103,13 @@ public class CallbackManager extends BaseCallbackManager {\n}\n@Override\n- public DCDomainCallback getDCDomainCallback() {\n- return dcDomainCallback;\n+ public SCDomainListener getSCDomainListener() {\n+ return scDomainListener;\n}\n@Override\n- public void setDCDomainCallback(DCDomainCallback dcDomainCallback) {\n- this.dcDomainCallback = dcDomainCallback;\n+ public void setSCDomainListener(SCDomainListener scDomainListener) {\n+ this.scDomainListener = scDomainListener;\n}\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "package com.clevertap.android.sdk;\nimport static android.content.Context.NOTIFICATION_SERVICE;\n-import static com.clevertap.android.sdk.Utils.getDCDomain;\n+import static com.clevertap.android.sdk.Utils.getSCDomain;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.FCM_LOG_TAG;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.PushType.FCM;\n@@ -35,7 +35,7 @@ import com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport com.clevertap.android.sdk.inbox.CTInboxActivity;\nimport com.clevertap.android.sdk.inbox.CTInboxMessage;\nimport com.clevertap.android.sdk.inbox.CTMessageDAO;\n-import com.clevertap.android.sdk.interfaces.DCDomainCallback;\n+import com.clevertap.android.sdk.interfaces.SCDomainListener;\nimport com.clevertap.android.sdk.interfaces.NotificationHandler;\nimport com.clevertap.android.sdk.interfaces.NotificationRenderedListener;\nimport com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener;\n@@ -132,7 +132,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nprivate static NotificationHandler sNotificationHandler;\n- private static NotificationHandler sDirectCallNotificationHandler;\n+ private static NotificationHandler sSignedCallNotificationHandler;\nprivate final Context context;\n@@ -1219,31 +1219,22 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n/**\n- * Returns the DCDomainCallback object\n- *\n- * @return The {@link DCDomainCallback} object\n- */\n- @RestrictTo(Scope.LIBRARY_GROUP)\n- public DCDomainCallback getDCDomainCallback() {\n- return coreState.getCallbackManager().getDCDomainCallback();\n- }\n-\n- /**\n- * This method is used to set the DCDomain callback\n+ * This method is used to set the SCDomain callback.\n+ * <p>\n* Register to handle the domain related events from CleverTap\n- * This is to be used only by clevertap-directCall-sdk\n+ * This is to be used only by clevertap-signedcall-sdk\n*\n- * @param dcDomainCallback The {@link DCDomainCallback} instance\n+ * @param scDomainListener - the {@link SCDomainListener} instance\n*/\n@RestrictTo(Scope.LIBRARY_GROUP)\n- public void setDCDomainCallback(DCDomainCallback dcDomainCallback) {\n- coreState.getCallbackManager().setDCDomainCallback(dcDomainCallback);\n+ public void setSCDomainListener(SCDomainListener scDomainListener) {\n+ coreState.getCallbackManager().setSCDomainListener(scDomainListener);\nif(coreState.getNetworkManager() != null) {\nNetworkManager networkManager = (NetworkManager) coreState.getNetworkManager();\nString domain = networkManager.getDomainFromPrefsOrMetadata(EventGroup.REGULAR);\nif(domain != null) {\n- dcDomainCallback.onDCDomainAvailable(getDCDomain(domain));\n+ scDomainListener.onSCDomainAvailable(getSCDomain(domain));\n}\n}\n}\n@@ -2095,16 +2086,16 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n/**\n- * Pushes a Direct Call event to CleverTap with a set of attribute pairs.\n+ * Pushes a Signed Call event to CleverTap with a set of attribute pairs.\n*\n* @param eventName The name of the event\n* @param eventProperties The {@link JSONObject} object that contains the\n- * event properties regarding Direct Call event\n+ * event properties regarding Signed Call event\n*/\n@SuppressWarnings(\"unused\")\n- public Future<?> pushDirectCallEvent(String eventName, JSONObject eventProperties) {\n+ public Future<?> pushSignedCallEvent(String eventName, JSONObject eventProperties) {\nreturn coreState.getAnalyticsManager()\n- .raiseEventForDirectCall(eventName, eventProperties);\n+ .raiseEventForSignedCall(eventName, eventProperties);\n}\n/**\n@@ -2350,8 +2341,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn sNotificationHandler;\n}\n- public static NotificationHandler getDirectCallNotificationHandler() {\n- return sDirectCallNotificationHandler;\n+ public static NotificationHandler getSignedCallNotificationHandler() {\n+ return sSignedCallNotificationHandler;\n}\n/**\n@@ -2856,9 +2847,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nsNotificationHandler = notificationHandler;\n}\n-\n- public static void setDirectCallNotificationHandler(NotificationHandler notificationHandler) {\n- sDirectCallNotificationHandler = notificationHandler;\n+ public static void setSignedCallNotificationHandler(NotificationHandler notificationHandler) {\n+ sSignedCallNotificationHandler = notificationHandler;\n}\npublic static void handleMessage(String pushType) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -254,7 +254,8 @@ public interface Constants {\nString LOG_TAG_PRODUCT_CONFIG = \"Product Config : \";\nint FETCH_TYPE_PC = 0;\nint FETCH_TYPE_FF = 1;\n- String LOG_TAG_DIRECT_CALL = \"DirectCall : \";\n+ String KEY_SIGNED_CALL_SDK_VERSION = \"scv\";\n+ String LOG_TAG_SIGNED_CALL = \"SignedCall : \";\nString LOG_TAG_GEOFENCES = \"Geofences : \";\n// error message codes\nint INVALID_MULTI_VALUE = 1;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"diff": "@@ -39,7 +39,7 @@ public class CoreMetaData extends CleverTapMetaData {\nprivate int geofenceSDKVersion = 0;\n- private int directCallSDKVersion = 0;\n+ private String signedCallSDKVersion = null;\nprivate boolean installReferrerDataSent = false;\n@@ -198,12 +198,13 @@ public class CoreMetaData extends CleverTapMetaData {\nreturn customSdkVersions;\n}\n- public int getDirectCallSDKVersion() {\n- return directCallSDKVersion;\n+ public String getSignedCallSDKVersion() {\n+ return signedCallSDKVersion;\n}\n- public void setDirectCallSDKVersion(int directCallSDKVersion) {\n- this.directCallSDKVersion = directCallSDKVersion;\n+ @RestrictTo(Scope.LIBRARY_GROUP)\n+ public void setSignedCallSDKVersion(String signedCallSDKVersion) {\n+ this.signedCallSDKVersion = signedCallSDKVersion;\n}\nvoid setLastSessionLength(final int lastSessionLength) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -40,6 +40,7 @@ import java.util.concurrent.Callable;\nimport org.json.JSONObject;\nimport static android.content.Context.USAGE_STATS_SERVICE;\n+import static com.clevertap.android.sdk.Constants.KEY_SIGNED_CALL_SDK_VERSION;\n@RestrictTo(Scope.LIBRARY)\npublic class DeviceInfo {\n@@ -541,8 +542,8 @@ public class DeviceInfo {\n}\nJSONObject appLaunchFields = CTJsonConverter.from(this, mCoreMetaData.getLocationFromUser(), enableNetworkInfoReporting,\ndeviceIsMultiUser);\n- if(mCoreMetaData.getDirectCallSDKVersion() != 0) {\n- appLaunchFields.put(\"dcv\", mCoreMetaData.getDirectCallSDKVersion());\n+ if(mCoreMetaData.getSignedCallSDKVersion() != null) {\n+ appLaunchFields.put(KEY_SIGNED_CALL_SDK_VERSION, mCoreMetaData.getSignedCallSDKVersion());\n}\nreturn appLaunchFields;\n} catch (Throwable t) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "@@ -648,7 +648,7 @@ public final class Utils {\n}\n}\n- public static String getDCDomain(String domain) {\n+ public static String getSCDomain(String domain) {\nString[] parts = domain.split(\"\\\\.\", 2);\nreturn parts[0] + \".\" + AUTH + \".\" + parts[1];\n}\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/interfaces/DCDomainCallback.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.interfaces;\n-\n-import androidx.annotation.NonNull;\n-import androidx.annotation.RestrictTo;\n-\n-/**\n- * Notifies about the availability of DC domain\n- */\n-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\n-public interface DCDomainCallback {\n-\n- /**\n- * Callback to hand over the DC-domain once it's available\n- * @param domain the domain to be used by DC SDK\n- */\n- void onDCDomainAvailable(@NonNull String domain);\n-\n- /**\n- * Callback to notify the unavailability of domain\n- */\n- void onDCDomainUnavailable();\n-\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/interfaces/SCDomainListener.java",
"diff": "+package com.clevertap.android.sdk.interfaces;\n+\n+import androidx.annotation.NonNull;\n+import androidx.annotation.RestrictTo;\n+\n+/**\n+ * Notifies about the availability of SC domain\n+ */\n+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\n+public interface SCDomainListener {\n+\n+ /**\n+ * Callback to hand over the SC-domain once it's available\n+ * @param domain the domain to be used by SC SDK\n+ */\n+ void onSCDomainAvailable(@NonNull String domain);\n+\n+ /**\n+ * Callback to notify the unavailability of domain\n+ */\n+ void onSCDomainUnavailable();\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/NetworkManager.java",
"diff": "package com.clevertap.android.sdk.network;\n-import static com.clevertap.android.sdk.Utils.getDCDomain;\n+import static com.clevertap.android.sdk.Utils.getSCDomain;\nimport static com.clevertap.android.sdk.utils.CTJsonConverter.getRenderedTargetList;\nimport android.annotation.SuppressLint;\n@@ -733,11 +733,11 @@ public class NetworkManager extends BaseNetworkManager {\nStorageHelper.putString(context, StorageHelper.storageKeyWithSuffix(config, Constants.KEY_DOMAIN_NAME),\ndomainName);\n- if (callbackManager.getDCDomainCallback() != null) {\n+ if (callbackManager.getSCDomainListener() != null) {\nif (domainName != null) {\n- callbackManager.getDCDomainCallback().onDCDomainAvailable(getDCDomain(domainName));\n+ callbackManager.getSCDomainListener().onSCDomainAvailable(getSCDomain(domainName));\n} else {\n- callbackManager.getDCDomainCallback().onDCDomainUnavailable();\n+ callbackManager.getSCDomainListener().onSCDomainUnavailable();\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushNotificationHandler.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/pushnotification/PushNotificationHandler.java",
"diff": "@@ -32,12 +32,12 @@ public class PushNotificationHandler implements ActionButtonClickHandler {\nreturn !((\"0\").equals(pt_id) || pt_id == null || pt_id.isEmpty());\n}\n- private boolean isForDirectCall(Bundle extras) {\n+ private boolean isForSignedCall(Bundle extras) {\nif (extras == null) {\nreturn false;\n}\nString source = extras.getString(\"source\");\n- return ((\"directcall\").equals(source));\n+ return ((\"signedcall\").equals(source));\n}\nprivate PushNotificationHandler() {\n@@ -63,9 +63,9 @@ public class PushNotificationHandler implements ActionButtonClickHandler {\nif (isForPushTemplates(message) && CleverTapAPI.getNotificationHandler() != null) {\n// render push template\nCleverTapAPI.getNotificationHandler().onMessageReceived(applicationContext, message, pushType);\n- } else if(isForDirectCall(message) && CleverTapAPI.getDirectCallNotificationHandler() != null){\n+ } else if(isForSignedCall(message) && CleverTapAPI.getSignedCallNotificationHandler() != null){\n// handle voip push payload\n- CleverTapAPI.getDirectCallNotificationHandler().onMessageReceived(applicationContext, message, pushType);\n+ CleverTapAPI.getSignedCallNotificationHandler().onMessageReceived(applicationContext, message, pushType);\n} else {\n// render core push\ncleverTapAPI.renderPushNotification(new CoreNotificationRenderer(), applicationContext, message);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | refactor(SDK-2296): replace directcall name convention with signedcall |
116,618 | 07.10.2022 18:49:09 | -19,080 | 50a4d8edd00a7599176d9da63d29e227dedcc158 | refactor(SDK-2296): update system events name, reserved for SignedCall SDK | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -61,9 +61,9 @@ public interface Constants {\nString ICON_BASE_URL = \"http://static.wizrocket.com/android/ico/\";\nString NOTIFICATION_CLICKED_EVENT_NAME = \"Notification Clicked\";\nString NOTIFICATION_VIEWED_EVENT_NAME = \"Notification Viewed\";\n- String DC_OUTGOING_EVENT_NAME = \"DCOutgoing\";\n- String DC_INCOMING_EVENT_NAME = \"DCIncoming\";\n- String DC_END_EVENT_NAME = \"DCEnd\";\n+ String SC_OUTGOING_EVENT_NAME = \"SCOutgoing\";\n+ String SC_INCOMING_EVENT_NAME = \"SCIncoming\";\n+ String SC_END_EVENT_NAME = \"SCEnd\";\nString GEOFENCE_ENTERED_EVENT_NAME = \"Geocluster Entered\";\nString GEOFENCE_EXITED_EVENT_NAME = \"Geocluster Exited\";\nString APP_LAUNCHED_EVENT = \"App Launched\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/validation/Validator.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/validation/Validator.java",
"diff": "@@ -41,8 +41,8 @@ public final class Validator {\nprivate static final String[] restrictedNames = {\"Stayed\", \"Notification Clicked\",\n\"Notification Viewed\", \"UTM Visited\", \"Notification Sent\", \"App Launched\", \"wzrk_d\",\n\"App Uninstalled\", \"Notification Bounced\", Constants.GEOFENCE_ENTERED_EVENT_NAME,\n- Constants.GEOFENCE_EXITED_EVENT_NAME, Constants.DC_OUTGOING_EVENT_NAME,\n- Constants.DC_INCOMING_EVENT_NAME, Constants.DC_END_EVENT_NAME};\n+ Constants.GEOFENCE_EXITED_EVENT_NAME, Constants.SC_OUTGOING_EVENT_NAME,\n+ Constants.SC_INCOMING_EVENT_NAME, Constants.SC_END_EVENT_NAME};\nprivate ArrayList<String> discardedEvents;\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | refactor(SDK-2296): update system events name, reserved for SignedCall SDK |
116,620 | 07.10.2022 23:31:04 | -19,080 | 3138e229508f94f67899ffe5bfe581010dd468f2 | multi upload and independent steps for github actions | [
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/build_code_debug/action.yml",
"new_path": ".github/mini_flows/build_code_debug/action.yml",
"diff": "@@ -2,18 +2,69 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: Generate AAR files\n+ - name: clevertap-core-assembleDebug\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-core:assembleDebug\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-core-assembleDebug.zip\n+ path: clevertap-core/build/outputs/aar\n+\n+###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-geofence-assembleDebug\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-geofence:assembleDebug\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-geofence-assembleDebug.zip\n+ path: clevertap-geofence/build/outputs/aar\n+\n+###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-hms-assembleDebug\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-hms:assembleDebug\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-hms-assembleDebug.zip\n+ path: clevertap-hms/build/outputs/aar\n+\n+###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-pushTemplates-assembleDebug\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-pushtemplates:assembleDebug\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-pushTemplates-assembleDebug.zip\n+ path: clevertap-pushtemplates/build/outputs/aar\n+\n+###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-xps-assembleDebug\nshell: bash\n- run: ./gradlew :clevertap-core:assembleDebug :clevertap-geofence:assembleDebug :clevertap-hms:assembleDebug :clevertap-pushTemplates:assembleDebug :clevertap-xps:assembleDebug\n+ run: ./gradlew :clevertap-xps:assembleDebug\n- name: Upload AAR and apk files\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: aars_and_apks.zip\n- path: |\n- clevertap-core/build/outputs/aar\n- clevertap-hms/build/outputs/aar\n- clevertap-xps/build/outputs/aar\n- clevertap-geofence/build/outputs/aar\n- clevertap-pushtemplates/build/outputs/aar\n+ name: clevertap-xps-assembleDebug.zip\n+ path: clevertap-xps/build/outputs/aar\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/build_code_release/action.yml",
"new_path": ".github/mini_flows/build_code_release/action.yml",
"diff": "@@ -2,18 +2,69 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: Generate AAR files\n+ - name: clevertap-core-assembleRelease\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-core:assembleRelease\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-core-assembleRelease.zip\n+ path: clevertap-core/build/outputs/aar\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-geofence-assembleRelease\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-geofence:assembleRelease\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-geofence-assembleRelease.zip\n+ path: clevertap-geofence/build/outputs/aar\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-hms-assembleRelease\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-hms:assembleRelease\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-hms-assembleRelease.zip\n+ path: clevertap-hms/build/outputs/aar\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-pushTemplates-assembleRelease\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-pushtemplates:assembleRelease\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-pushTemplates-assembleRelease.zip\n+ path: clevertap-pushtemplates/build/outputs/aar\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-xps-assembleRelease\nshell: bash\n- run: ./gradlew :clevertap-core:assembleRelease :clevertap-geofence:assembleRelease :clevertap-hms:assembleRelease :clevertap-pushTemplates:assembleRelease :clevertap-xps:assembleRelease\n+ run: ./gradlew :clevertap-xps:assembleRelease\n- name: Upload AAR and apk files\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: aars_and_apks.zip\n- path: |\n- clevertap-core/build/outputs/aar\n- clevertap-hms/build/outputs/aar\n- clevertap-xps/build/outputs/aar\n- clevertap-geofence/build/outputs/aar\n- clevertap-pushtemplates/build/outputs/aar\n+ name: clevertap-xps-assembleRelease.zip\n+ path: clevertap-xps/build/outputs/aar\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/codechecks_checkstyle/action.yml",
"new_path": ".github/mini_flows/codechecks_checkstyle/action.yml",
"diff": "@@ -2,19 +2,69 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: CodeAnalysis via checkstyle\n+ - name: clevertap-core-checkstyle\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-core:checkstyle\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-core-checkstyle.zip\n+ path: clevertap-core/build/reports/checkstyle\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-geofence-checkstyle\n+ if: always()\nshell: bash\n- run: ./gradlew :clevertap-core:checkstyle :clevertap-geofence:checkstyle :clevertap-hms:checkstyle :clevertap-pushTemplates:checkstyle :clevertap-xps:checkstyle\n+ run: ./gradlew :clevertap-geofence:checkstyle\n- - name: Upload checkstyle results\n+ - name: Upload AAR and apk files\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: checkstyle_results\n- path: |\n- clevertap-core/build/reports/checkstyle\n- clevertap-hms/build/reports/checkstyle\n- clevertap-xps/build/reports/checkstyle\n- clevertap-geofence/build/reports/checkstyle\n- clevertap-pushtemplates/build/reports/checkstyle\n+ name: clevertap-geofence-checkstyle.zip\n+ path: clevertap-geofence/build/reports/checkstyle\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-hms-checkstyle\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-hms:checkstyle\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-hms-checkstyle.zip\n+ path: clevertap-hms/build/reports/checkstyle\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-pushTemplates-checkstyle\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-pushtemplates:checkstyle\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-pushTemplates-checkstyle.zip\n+ path: clevertap-pushtemplates/build/reports/checkstyle\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-xps-checkstyle\n+ shell: bash\n+ run: ./gradlew :clevertap-xps:checkstyle\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-xps-checkstyle.zip\n+ path: clevertap-xps/build/reports/checkstyle\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/codechecks_detekt/action.yml",
"new_path": ".github/mini_flows/codechecks_detekt/action.yml",
"diff": "runs:\nusing: \"composite\"\nsteps:\n- - name: CodeAnalysis via detekt\n+\n+ - name: clevertap-core-detekt\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-core:detekt\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-core-detekt.zip\n+ path: clevertap-core/build/reports/detekt\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-geofence-detekt\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-geofence:detekt\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-geofence-detekt.zip\n+ path: clevertap-geofence/build/reports/detekt\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-hms-detekt\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-hms:detekt\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-hms-detekt.zip\n+ path: clevertap-hms/build/reports/detekt\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-pushTemplates-detekt\n+ if: always()\nshell: bash\n- run: ./gradlew :clevertap-core:detekt :clevertap-geofence:detekt :clevertap-hms:detekt :clevertap-pushTemplates:detekt :clevertap-xps:detekt\n+ run: ./gradlew :clevertap-pushtemplates:detekt\n- - name: Upload detekt results\n+ - name: Upload AAR and apk files\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: detekt_results\n- path: |\n- clevertap-core/build/reports/detekt\n- clevertap-hms/build/reports/detekt\n- clevertap-xps/build/reports/detekt\n- clevertap-geofence/build/reports/detekt\n- clevertap-pushtemplates/build/reports/detekt\n+ name: clevertap-pushTemplates-detekt.zip\n+ path: clevertap-pushtemplates/build/reports/detekt\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-xps-detekt\n+ shell: bash\n+ run: ./gradlew :clevertap-xps:detekt\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-xps-detekt.zip\n+ path: clevertap-xps/build/reports/detekt\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/lint/action.yml",
"new_path": ".github/mini_flows/lint/action.yml",
"diff": "runs:\nusing: \"composite\"\nsteps:\n- - name: Check lint\n+\n+ - name: clevertap-core-lint\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-core:lint\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-core-lint.zip\n+ path: clevertap-core/build/reports/lint-results.html\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-geofence-lint\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-geofence:lint\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-geofence-lint.zip\n+ path: clevertap-geofence/build/reports/lint-results.html\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-hms-lint\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-hms:lint\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-hms-lint.zip\n+ path: clevertap-hms/build/reports/lint-results.html\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-pushTemplates-lint\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-pushtemplates:lint\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-pushTemplates-lint.zip\n+ path: clevertap-pushtemplates/build/reports/lint-results.html\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: clevertap-xps-lint\nshell: bash\n- run: ./gradlew :clevertap-core:lint :clevertap-geofence:lint :clevertap-hms:lint :clevertap-pushTemplates:lint :clevertap-xps:lint\n+ run: ./gradlew :clevertap-xps:lint\n- - name: Upload Lint results\n+ - name: Upload AAR and apk files\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: lint_results\n- path: |\n- clevertap-core/build/reports/lint-results.html\n- clevertap-hms/build/reports/lint-results.html\n- clevertap-xps/build/reports/lint-results.html\n- clevertap-geofence/build/reports/lint-results.html\n- clevertap-pushtemplates/build/reports/lint-results.html\n+ name: clevertap-xps-lint.zip\n+ path: clevertap-xps/build/reports/lint-results.html\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/test_and_coverage_debug/action.yml",
"new_path": ".github/mini_flows/test_and_coverage_debug/action.yml",
"diff": "@@ -2,31 +2,106 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: Run Unit Tests And Code Coverage (DEBUG)\n+ - name: clevertap-core-jacocoTestReportDebug\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-core:jacocoTestReportDebug -Pcoverage='true'\n+\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-core-TestReportDebug\n+ path: clevertap-core/build/reports/tests\n+\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-core-JacocoReportDebug\n+ path: clevertap-core/build/reports/jacoco\n+\n+\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: clevertap-geofence-jacocoTestReportDebug\n+ if: always()\nshell: bash\n- run: ./gradlew :clevertap-core:jacocoTestReportDebug -Pcoverage='true' :clevertap-geofence:jacocoTestReportDebug -Pcoverage='true' :clevertap-hms:jacocoTestReportDebug -Pcoverage='true' :clevertap-pushTemplates:jacocoTestReportDebug -Pcoverage='true' :clevertap-xps:jacocoTestReportDebug -Pcoverage='true'\n+ run: ./gradlew :clevertap-geofence:jacocoTestReportDebug -Pcoverage='true'\n- - name: Upload Unit tests\n+ - name: Upload1\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: code-coverage-results\n- path: |\n- clevertap-core/build/reports/tests\n- clevertap-core/build/reports/jacoco\n+ name: clevertap-geofence-TestReportDebug\n+ path: clevertap-geofence/build/reports/tests\n- clevertap-hms/build/reports/tests\n- clevertap-hms/build/reports/jacoco\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-geofence-JacocoReportDebug\n+ path: clevertap-geofence/build/reports/jacoco\n- clevertap-xps/build/reports/tests\n- clevertap-xps/build/reports/jacoco\n- clevertap-geofence/build/reports/tests\n- clevertap-geofence/build/reports/jacoco\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: clevertap-hms-jacocoTestReportDebug\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-hms:jacocoTestReportDebug -Pcoverage='true'\n- clevertap-pushtemplates/build/reports/tests\n- clevertap-pushtemplates/build/reports/jacoco\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-hms-TestReportDebug\n+ path: clevertap-hms/build/reports/tests\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-hms-JacocoReportDebug\n+ path: clevertap-hms/build/reports/jacoco\n- #todo : set success/failure as output and use slack action to send message . setting success failure: https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#outputs-for-composite-actions\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: clevertap-xps-jacocoTestReportDebug\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-xps:jacocoTestReportDebug -Pcoverage='true'\n+\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-xps-TestReportDebug\n+ path: clevertap-xps/build/reports/tests\n+\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-xps-JacocoReportDebug\n+ path: clevertap-xps/build/reports/jacoco\n+\n+\n+\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: clevertap-pushtemplates-jacocoTestReportDebug\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-pushtemplates:jacocoTestReportDebug -Pcoverage='true'\n+\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-pushtemplates-TestReportDebug\n+ path: clevertap-pushtemplates/build/reports/tests\n+\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-pushtemplates-JacocoReportDebug\n+ path: clevertap-pushtemplates/build/reports/jacoco\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/test_and_coverage_release/action.yml",
"new_path": ".github/mini_flows/test_and_coverage_release/action.yml",
"diff": "@@ -2,31 +2,106 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: Run Unit Tests And Code Coverage (RELEASE)\n+ - name: clevertap-core-jacocoTestReportRelease\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-core:jacocoTestReportRelease -Pcoverage='true'\n+\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-core-TestReportRelease\n+ path: clevertap-core/build/reports/tests\n+\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-core-JacocoReportRelease\n+ path: clevertap-core/build/reports/jacoco\n+\n+\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: clevertap-geofence-jacocoTestReportRelease\n+ if: always()\nshell: bash\n- run: ./gradlew :clevertap-core:jacocoTestReportRelease -Pcoverage='true' :clevertap-geofence:jacocoTestReportRelease -Pcoverage='true' :clevertap-hms:jacocoTestReportRelease -Pcoverage='true' :clevertap-pushTemplates:jacocoTestReportRelease -Pcoverage='true' :clevertap-xps:jacocoTestReportRelease -Pcoverage='true'\n+ run: ./gradlew :clevertap-geofence:jacocoTestReportRelease -Pcoverage='true'\n- - name: Upload Unit tests\n+ - name: Upload1\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: code-coverage-results\n- path: |\n- clevertap-core/build/reports/tests\n- clevertap-core/build/reports/jacoco\n+ name: clevertap-geofence-TestReportRelease\n+ path: clevertap-geofence/build/reports/tests\n- clevertap-hms/build/reports/tests\n- clevertap-hms/build/reports/jacoco\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-geofence-JacocoReportRelease\n+ path: clevertap-geofence/build/reports/jacoco\n- clevertap-xps/build/reports/tests\n- clevertap-xps/build/reports/jacoco\n- clevertap-geofence/build/reports/tests\n- clevertap-geofence/build/reports/jacoco\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: clevertap-hms-jacocoTestReportRelease\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-hms:jacocoTestReportRelease -Pcoverage='true'\n- clevertap-pushtemplates/build/reports/tests\n- clevertap-pushtemplates/build/reports/jacoco\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-hms-TestReportRelease\n+ path: clevertap-hms/build/reports/tests\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-hms-JacocoReportRelease\n+ path: clevertap-hms/build/reports/jacoco\n- #todo : set success/failure as output and use slack action to send message . setting success failure: https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#outputs-for-composite-actions\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: clevertap-xps-jacocoTestReportRelease\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-xps:jacocoTestReportRelease -Pcoverage='true'\n+\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-xps-TestReportRelease\n+ path: clevertap-xps/build/reports/tests\n+\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-xps-JacocoReportRelease\n+ path: clevertap-xps/build/reports/jacoco\n+\n+\n+\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: clevertap-pushtemplates-jacocoTestReportRelease\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-pushtemplates:jacocoTestReportRelease -Pcoverage='true'\n+\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-pushtemplates-TestReportRelease\n+ path: clevertap-pushtemplates/build/reports/tests\n+\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: clevertap-pushtemplates-JacocoReportRelease\n+ path: clevertap-pushtemplates/build/reports/jacoco\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2225] multi upload and independent steps for github actions |
116,620 | 07.10.2022 23:46:25 | -19,080 | 7b8ca767c74b20b0830ce83fe772eead18ef3820 | updated lint step | [
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/lint/action.yml",
"new_path": ".github/mini_flows/lint/action.yml",
"diff": "@@ -12,7 +12,7 @@ runs:\nuses: actions/upload-artifact@v2\nwith:\nname: clevertap-core-lint.zip\n- path: clevertap-core/build/reports/lint-results.html\n+ path: clevertap-core/build/reports/lint-results-debug.html\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -26,7 +26,7 @@ runs:\nuses: actions/upload-artifact@v2\nwith:\nname: clevertap-geofence-lint.zip\n- path: clevertap-geofence/build/reports/lint-results.html\n+ path: clevertap-geofence/build/reports/lint-results-debug.html\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -40,7 +40,7 @@ runs:\nuses: actions/upload-artifact@v2\nwith:\nname: clevertap-hms-lint.zip\n- path: clevertap-hms/build/reports/lint-results.html\n+ path: clevertap-hms/build/reports/lint-results-debug.html\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -54,7 +54,7 @@ runs:\nuses: actions/upload-artifact@v2\nwith:\nname: clevertap-pushTemplates-lint.zip\n- path: clevertap-pushtemplates/build/reports/lint-results.html\n+ path: clevertap-pushtemplates/build/reports/lint-results-debug.html\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -67,4 +67,4 @@ runs:\nuses: actions/upload-artifact@v2\nwith:\nname: clevertap-xps-lint.zip\n- path: clevertap-xps/build/reports/lint-results.html\n\\ No newline at end of file\n+ path: clevertap-xps/build/reports/lint-results-debug.html\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2225] updated lint step |
116,620 | 07.10.2022 23:53:55 | -19,080 | d72327ec8700991371d557f9c53c7f711ed25487 | renaming artifacts | [
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/build_code_debug/action.yml",
"new_path": ".github/mini_flows/build_code_debug/action.yml",
"diff": "@@ -11,7 +11,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-core-assembleDebug.zip\n+ name: clevertap-core-assembleDebug\npath: clevertap-core/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -25,7 +25,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-geofence-assembleDebug.zip\n+ name: clevertap-geofence-assembleDebug\npath: clevertap-geofence/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -39,7 +39,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-hms-assembleDebug.zip\n+ name: clevertap-hms-assembleDebug\npath: clevertap-hms/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -53,7 +53,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-pushTemplates-assembleDebug.zip\n+ name: clevertap-pushTemplates-assembleDebug\npath: clevertap-pushtemplates/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -66,5 +66,5 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-xps-assembleDebug.zip\n+ name: clevertap-xps-assembleDebug\npath: clevertap-xps/build/outputs/aar\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/build_code_release/action.yml",
"new_path": ".github/mini_flows/build_code_release/action.yml",
"diff": "@@ -11,7 +11,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-core-assembleRelease.zip\n+ name: clevertap-core-assembleRelease\npath: clevertap-core/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -25,7 +25,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-geofence-assembleRelease.zip\n+ name: clevertap-geofence-assembleRelease\npath: clevertap-geofence/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -39,7 +39,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-hms-assembleRelease.zip\n+ name: clevertap-hms-assembleRelease\npath: clevertap-hms/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -53,7 +53,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-pushTemplates-assembleRelease.zip\n+ name: clevertap-pushTemplates-assembleRelease\npath: clevertap-pushtemplates/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -66,5 +66,5 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-xps-assembleRelease.zip\n+ name: clevertap-xps-assembleRelease\npath: clevertap-xps/build/outputs/aar\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/codechecks_checkstyle/action.yml",
"new_path": ".github/mini_flows/codechecks_checkstyle/action.yml",
"diff": "@@ -11,7 +11,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-core-checkstyle.zip\n+ name: clevertap-core-checkstyle\npath: clevertap-core/build/reports/checkstyle\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -25,7 +25,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-geofence-checkstyle.zip\n+ name: clevertap-geofence-checkstyle\npath: clevertap-geofence/build/reports/checkstyle\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -39,7 +39,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-hms-checkstyle.zip\n+ name: clevertap-hms-checkstyle\npath: clevertap-hms/build/reports/checkstyle\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -53,7 +53,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-pushTemplates-checkstyle.zip\n+ name: clevertap-pushTemplates-checkstyle\npath: clevertap-pushtemplates/build/reports/checkstyle\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -66,5 +66,5 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-xps-checkstyle.zip\n+ name: clevertap-xps-checkstyle\npath: clevertap-xps/build/reports/checkstyle\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/codechecks_detekt/action.yml",
"new_path": ".github/mini_flows/codechecks_detekt/action.yml",
"diff": "@@ -11,7 +11,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-core-detekt.zip\n+ name: clevertap-core-detekt\npath: clevertap-core/build/reports/detekt\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -25,7 +25,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-geofence-detekt.zip\n+ name: clevertap-geofence-detekt\npath: clevertap-geofence/build/reports/detekt\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -39,7 +39,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-hms-detekt.zip\n+ name: clevertap-hms-detekt\npath: clevertap-hms/build/reports/detekt\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -53,7 +53,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-pushTemplates-detekt.zip\n+ name: clevertap-pushTemplates-detekt\npath: clevertap-pushtemplates/build/reports/detekt\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -66,5 +66,5 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-xps-detekt.zip\n+ name: clevertap-xps-detekt\npath: clevertap-xps/build/reports/detekt\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/lint/action.yml",
"new_path": ".github/mini_flows/lint/action.yml",
"diff": "@@ -11,7 +11,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-core-lint.zip\n+ name: clevertap-core-lint\npath: clevertap-core/build/reports/lint-results-debug.html\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -25,7 +25,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-geofence-lint.zip\n+ name: clevertap-geofence-lint\npath: clevertap-geofence/build/reports/lint-results-debug.html\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -39,7 +39,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-hms-lint.zip\n+ name: clevertap-hms-lint\npath: clevertap-hms/build/reports/lint-results-debug.html\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -53,7 +53,7 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-pushTemplates-lint.zip\n+ name: clevertap-pushTemplates-lint\npath: clevertap-pushtemplates/build/reports/lint-results-debug.html\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n@@ -66,5 +66,5 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-xps-lint.zip\n+ name: clevertap-xps-lint\npath: clevertap-xps/build/reports/lint-results-debug.html\n\\ No newline at end of file\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2225] renaming artifacts |
116,620 | 08.10.2022 00:12:22 | -19,080 | b63bbb0d474deb8052281048ac1bf70f7c737762 | renaming artifacts p2 | [
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/build_code_debug/action.yml",
"new_path": ".github/mini_flows/build_code_debug/action.yml",
"diff": "@@ -2,7 +2,7 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: clevertap-core-assembleDebug\n+ - name: assembleDebug-clevertap-core\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-core:assembleDebug\n@@ -11,12 +11,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-core-assembleDebug\n+ name: assembleDebug-clevertap-core\npath: clevertap-core/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-geofence-assembleDebug\n+ - name: assembleDebug-clevertap-geofence\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-geofence:assembleDebug\n@@ -25,12 +25,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-geofence-assembleDebug\n+ name: assembleDebug-clevertap-geofence\npath: clevertap-geofence/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-hms-assembleDebug\n+ - name: assembleDebug-clevertap-hms\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-hms:assembleDebug\n@@ -39,12 +39,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-hms-assembleDebug\n+ name: assembleDebug-clevertap-hms\npath: clevertap-hms/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-pushTemplates-assembleDebug\n+ - name: assembleDebug-clevertap-pushTemplates\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-pushtemplates:assembleDebug\n@@ -53,12 +53,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-pushTemplates-assembleDebug\n+ name: assembleDebug-clevertap-pushTemplates\npath: clevertap-pushtemplates/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-xps-assembleDebug\n+ - name: assembleDebug-clevertap-xps\nshell: bash\nrun: ./gradlew :clevertap-xps:assembleDebug\n@@ -66,5 +66,5 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-xps-assembleDebug\n+ name: assembleDebug-clevertap-xps\npath: clevertap-xps/build/outputs/aar\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/build_code_release/action.yml",
"new_path": ".github/mini_flows/build_code_release/action.yml",
"diff": "@@ -2,7 +2,7 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: clevertap-core-assembleRelease\n+ - name: assembleRelease-clevertap-core\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-core:assembleRelease\n@@ -11,12 +11,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-core-assembleRelease\n+ name: assembleRelease-clevertap-core\npath: clevertap-core/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-geofence-assembleRelease\n+ - name: assembleRelease-clevertap-geofence\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-geofence:assembleRelease\n@@ -25,12 +25,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-geofence-assembleRelease\n+ name: assembleRelease-clevertap-geofence\npath: clevertap-geofence/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-hms-assembleRelease\n+ - name: assembleRelease-clevertap-hms\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-hms:assembleRelease\n@@ -39,12 +39,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-hms-assembleRelease\n+ name: assembleRelease-clevertap-hms\npath: clevertap-hms/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-pushTemplates-assembleRelease\n+ - name: assembleRelease-clevertap-pushTemplates\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-pushtemplates:assembleRelease\n@@ -53,12 +53,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-pushTemplates-assembleRelease\n+ name: assembleRelease-clevertap-pushTemplates\npath: clevertap-pushtemplates/build/outputs/aar\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-xps-assembleRelease\n+ - name: assembleRelease-clevertap-xps\nshell: bash\nrun: ./gradlew :clevertap-xps:assembleRelease\n@@ -66,5 +66,5 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-xps-assembleRelease\n+ name: assembleRelease-clevertap-xps\npath: clevertap-xps/build/outputs/aar\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/codechecks_checkstyle/action.yml",
"new_path": ".github/mini_flows/codechecks_checkstyle/action.yml",
"diff": "@@ -2,7 +2,7 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: clevertap-core-checkstyle\n+ - name: checkstyle-clevertap-core\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-core:checkstyle\n@@ -11,12 +11,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-core-checkstyle\n+ name: checkstyle-clevertap-core\npath: clevertap-core/build/reports/checkstyle\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-geofence-checkstyle\n+ - name: checkstyle-clevertap-geofence\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-geofence:checkstyle\n@@ -25,12 +25,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-geofence-checkstyle\n+ name: checkstyle-clevertap-geofence\npath: clevertap-geofence/build/reports/checkstyle\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-hms-checkstyle\n+ - name: checkstyle-clevertap-hms\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-hms:checkstyle\n@@ -39,12 +39,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-hms-checkstyle\n+ name: checkstyle-clevertap-hms\npath: clevertap-hms/build/reports/checkstyle\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-pushTemplates-checkstyle\n+ - name: checkstyle-clevertap-pushTemplates\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-pushtemplates:checkstyle\n@@ -53,12 +53,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-pushTemplates-checkstyle\n+ name: checkstyle-clevertap-pushTemplates\npath: clevertap-pushtemplates/build/reports/checkstyle\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-xps-checkstyle\n+ - name: checkstyle-clevertap-xps\nshell: bash\nrun: ./gradlew :clevertap-xps:checkstyle\n@@ -66,5 +66,5 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-xps-checkstyle\n+ name: checkstyle-clevertap-xps\npath: clevertap-xps/build/reports/checkstyle\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/codechecks_detekt/action.yml",
"new_path": ".github/mini_flows/codechecks_detekt/action.yml",
"diff": "@@ -2,7 +2,7 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: clevertap-core-detekt\n+ - name: detekt-clevertap-core\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-core:detekt\n@@ -11,12 +11,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-core-detekt\n+ name: detekt-clevertap-core\npath: clevertap-core/build/reports/detekt\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-geofence-detekt\n+ - name: detekt-clevertap-geofence\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-geofence:detekt\n@@ -25,12 +25,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-geofence-detekt\n+ name: detekt-clevertap-geofence\npath: clevertap-geofence/build/reports/detekt\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-hms-detekt\n+ - name: detekt-clevertap-hms\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-hms:detekt\n@@ -39,12 +39,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-hms-detekt\n+ name: detekt-clevertap-hms\npath: clevertap-hms/build/reports/detekt\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-pushTemplates-detekt\n+ - name: detekt-clevertap-pushTemplates\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-pushtemplates:detekt\n@@ -53,12 +53,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-pushTemplates-detekt\n+ name: detekt-clevertap-pushTemplates\npath: clevertap-pushtemplates/build/reports/detekt\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-xps-detekt\n+ - name: detekt-clevertap-xps\nshell: bash\nrun: ./gradlew :clevertap-xps:detekt\n@@ -66,5 +66,5 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-xps-detekt\n+ name: detekt-clevertap-xps\npath: clevertap-xps/build/reports/detekt\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/lint/action.yml",
"new_path": ".github/mini_flows/lint/action.yml",
"diff": "@@ -2,7 +2,7 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: clevertap-core-lint\n+ - name: lint-clevertap-core\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-core:lint\n@@ -11,12 +11,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-core-lint\n+ name: lint-clevertap-core\npath: clevertap-core/build/reports/lint-results-debug.html\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-geofence-lint\n+ - name: lint-clevertap-geofence\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-geofence:lint\n@@ -25,12 +25,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-geofence-lint\n+ name: lint-clevertap-geofence\npath: clevertap-geofence/build/reports/lint-results-debug.html\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-hms-lint\n+ - name: lint-clevertap-hms\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-hms:lint\n@@ -39,12 +39,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-hms-lint\n+ name: lint-clevertap-hms\npath: clevertap-hms/build/reports/lint-results-debug.html\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-pushTemplates-lint\n+ - name: lint-clevertap-pushTemplates\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-pushtemplates:lint\n@@ -53,12 +53,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-pushTemplates-lint\n+ name: lint-clevertap-pushTemplates\npath: clevertap-pushtemplates/build/reports/lint-results-debug.html\n###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n- - name: clevertap-xps-lint\n+ - name: lint-clevertap-xps\nshell: bash\nrun: ./gradlew :clevertap-xps:lint\n@@ -66,5 +66,5 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-xps-lint\n+ name: lint-clevertap-xps\npath: clevertap-xps/build/reports/lint-results-debug.html\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/test_and_coverage_debug/action.yml",
"new_path": ".github/mini_flows/test_and_coverage_debug/action.yml",
"diff": "@@ -2,7 +2,7 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: clevertap-core-jacocoTestReportDebug\n+ - name: jacocoTestReportDebug-clevertap-core\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-core:jacocoTestReportDebug -Pcoverage='true'\n@@ -11,19 +11,19 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-core-TestReportDebug\n+ name: TestReportDebug-clevertap-core\npath: clevertap-core/build/reports/tests\n- name: Upload2\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-core-JacocoReportDebug\n+ name: JacocoReportDebug-clevertap-core\npath: clevertap-core/build/reports/jacoco\n#-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: clevertap-geofence-jacocoTestReportDebug\n+ - name: jacocoTestReportDebug-clevertap-geofence\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-geofence:jacocoTestReportDebug -Pcoverage='true'\n@@ -32,19 +32,19 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-geofence-TestReportDebug\n+ name: TestReportDebug-clevertap-geofence\npath: clevertap-geofence/build/reports/tests\n- name: Upload2\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-geofence-JacocoReportDebug\n+ name: JacocoReportDebug-clevertap-geofence\npath: clevertap-geofence/build/reports/jacoco\n#-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: clevertap-hms-jacocoTestReportDebug\n+ - name: jacocoTestReportDebug-clevertap-hms\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-hms:jacocoTestReportDebug -Pcoverage='true'\n@@ -53,19 +53,19 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-hms-TestReportDebug\n+ name: TestReportDebug-clevertap-hms\npath: clevertap-hms/build/reports/tests\n- name: Upload2\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-hms-JacocoReportDebug\n+ name: JacocoReportDebug-clevertap-hms\npath: clevertap-hms/build/reports/jacoco\n#-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: clevertap-xps-jacocoTestReportDebug\n+ - name: jacocoTestReportDebug-clevertap-xps\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-xps:jacocoTestReportDebug -Pcoverage='true'\n@@ -74,20 +74,20 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-xps-TestReportDebug\n+ name: TestReportDebug-clevertap-xps\npath: clevertap-xps/build/reports/tests\n- name: Upload2\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-xps-JacocoReportDebug\n+ name: JacocoReportDebug-clevertap-xps\npath: clevertap-xps/build/reports/jacoco\n#-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: clevertap-pushtemplates-jacocoTestReportDebug\n+ - name: jacocoTestReportDebug-clevertap-pushtemplates\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-pushtemplates:jacocoTestReportDebug -Pcoverage='true'\n@@ -96,12 +96,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-pushtemplates-TestReportDebug\n+ name: TestReportDebug-clevertap-pushtemplates\npath: clevertap-pushtemplates/build/reports/tests\n- name: Upload2\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-pushtemplates-JacocoReportDebug\n+ name: JacocoReportDebug-clevertap-pushtemplates\npath: clevertap-pushtemplates/build/reports/jacoco\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/test_and_coverage_release/action.yml",
"new_path": ".github/mini_flows/test_and_coverage_release/action.yml",
"diff": "runs:\nusing: \"composite\"\nsteps:\n-\n- - name: clevertap-core-jacocoTestReportRelease\n+ - name: jacocoTestReportRelease-clevertap-core\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-core:jacocoTestReportRelease -Pcoverage='true'\n@@ -11,19 +10,19 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-core-TestReportRelease\n+ name: TestReportRelease-clevertap-core\npath: clevertap-core/build/reports/tests\n- name: Upload2\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-core-JacocoReportRelease\n+ name: JacocoReportRelease-clevertap-core\npath: clevertap-core/build/reports/jacoco\n#-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: clevertap-geofence-jacocoTestReportRelease\n+ - name: jacocoTestReportRelease-clevertap-geofence\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-geofence:jacocoTestReportRelease -Pcoverage='true'\n@@ -32,19 +31,19 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-geofence-TestReportRelease\n+ name: TestReportRelease-clevertap-geofence\npath: clevertap-geofence/build/reports/tests\n- name: Upload2\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-geofence-JacocoReportRelease\n+ name: JacocoReportRelease-clevertap-geofence\npath: clevertap-geofence/build/reports/jacoco\n#-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: clevertap-hms-jacocoTestReportRelease\n+ - name: jacocoTestReportRelease-clevertap-hms\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-hms:jacocoTestReportRelease -Pcoverage='true'\n@@ -53,19 +52,19 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-hms-TestReportRelease\n+ name: TestReportRelease-clevertap-hms\npath: clevertap-hms/build/reports/tests\n- name: Upload2\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-hms-JacocoReportRelease\n+ name: JacocoReportRelease-clevertap-hms\npath: clevertap-hms/build/reports/jacoco\n#-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: clevertap-xps-jacocoTestReportRelease\n+ - name: jacocoTestReportRelease-clevertap-xps\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-xps:jacocoTestReportRelease -Pcoverage='true'\n@@ -74,20 +73,20 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-xps-TestReportRelease\n+ name: TestReportRelease-clevertap-xps\npath: clevertap-xps/build/reports/tests\n- name: Upload2\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-xps-JacocoReportRelease\n+ name: JacocoReportRelease-clevertap-xps\npath: clevertap-xps/build/reports/jacoco\n#-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: clevertap-pushtemplates-jacocoTestReportRelease\n+ - name: jacocoTestReportRelease-clevertap-pushtemplates\nif: always()\nshell: bash\nrun: ./gradlew :clevertap-pushtemplates:jacocoTestReportRelease -Pcoverage='true'\n@@ -96,12 +95,12 @@ runs:\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-pushtemplates-TestReportRelease\n+ name: TestReportRelease-clevertap-pushtemplates\npath: clevertap-pushtemplates/build/reports/tests\n- name: Upload2\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: clevertap-pushtemplates-JacocoReportRelease\n+ name: JacocoReportRelease-clevertap-pushtemplates\npath: clevertap-pushtemplates/build/reports/jacoco\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2225] renaming artifacts p2 |
116,620 | 08.10.2022 00:19:23 | -19,080 | 568ee692287ead6142ced42333c11e1ffdb8d7af | supporting modification of debug level via instanceConfig | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java",
"diff": "@@ -274,12 +274,15 @@ public class CleverTapInstanceConfig implements Parcelable {\n@SuppressWarnings({\"unused\"})\npublic void setDebugLevel(CleverTapAPI.LogLevel debugLevel) {\n- this.debugLevel = debugLevel.intValue();\n+ setDebugLevel(debugLevel.intValue());\n}\n@SuppressWarnings({\"unused\"})\npublic void setDebugLevel(int debugLevel) {\nthis.debugLevel = debugLevel;\n+ if (logger != null) {\n+ logger.setDebugLevel(debugLevel);\n+ }\n}\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Logger.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Logger.java",
"diff": "@@ -184,6 +184,10 @@ public final class Logger {\nreturn debugLevel;\n}\n+ public void setDebugLevel(int level){\n+ this.debugLevel = level;\n+ }\n+\nprivate static int getStaticDebugLevel() {\nreturn CleverTapAPI.getDebugLevel();\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2225] supporting modification of debug level via instanceConfig |
116,620 | 10.10.2022 11:33:29 | -19,080 | aba03cd2fa4a122ed31989e40c6949b14c683d07 | undo github action changes | [
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/build_code_debug/action.yml",
"new_path": ".github/mini_flows/build_code_debug/action.yml",
"diff": "@@ -2,69 +2,18 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: assembleDebug-clevertap-core\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-core:assembleDebug\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: assembleDebug-clevertap-core\n- path: clevertap-core/build/outputs/aar\n-\n-###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: assembleDebug-clevertap-geofence\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-geofence:assembleDebug\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: assembleDebug-clevertap-geofence\n- path: clevertap-geofence/build/outputs/aar\n-\n-###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: assembleDebug-clevertap-hms\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-hms:assembleDebug\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: assembleDebug-clevertap-hms\n- path: clevertap-hms/build/outputs/aar\n-\n-###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: assembleDebug-clevertap-pushTemplates\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-pushtemplates:assembleDebug\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: assembleDebug-clevertap-pushTemplates\n- path: clevertap-pushtemplates/build/outputs/aar\n-\n-###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: assembleDebug-clevertap-xps\n+ - name: Generate AAR files\nshell: bash\n- run: ./gradlew :clevertap-xps:assembleDebug\n+ run: ./gradlew :clevertap-core:assembleDebug :clevertap-geofence:assembleDebug :clevertap-hms:assembleDebug :clevertap-pushTemplates:assembleDebug :clevertap-xps:assembleDebug\n- name: Upload AAR and apk files\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: assembleDebug-clevertap-xps\n- path: clevertap-xps/build/outputs/aar\n\\ No newline at end of file\n+ name: aars_and_apks.zip\n+ path: |\n+ clevertap-core/build/outputs/aar\n+ clevertap-hms/build/outputs/aar\n+ clevertap-xps/build/outputs/aar\n+ clevertap-geofence/build/outputs/aar\n+ clevertap-pushtemplates/build/outputs/aar\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/build_code_release/action.yml",
"new_path": ".github/mini_flows/build_code_release/action.yml",
"diff": "@@ -2,69 +2,18 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: assembleRelease-clevertap-core\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-core:assembleRelease\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: assembleRelease-clevertap-core\n- path: clevertap-core/build/outputs/aar\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: assembleRelease-clevertap-geofence\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-geofence:assembleRelease\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: assembleRelease-clevertap-geofence\n- path: clevertap-geofence/build/outputs/aar\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: assembleRelease-clevertap-hms\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-hms:assembleRelease\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: assembleRelease-clevertap-hms\n- path: clevertap-hms/build/outputs/aar\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: assembleRelease-clevertap-pushTemplates\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-pushtemplates:assembleRelease\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: assembleRelease-clevertap-pushTemplates\n- path: clevertap-pushtemplates/build/outputs/aar\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: assembleRelease-clevertap-xps\n+ - name: Generate AAR files\nshell: bash\n- run: ./gradlew :clevertap-xps:assembleRelease\n+ run: ./gradlew :clevertap-core:assembleRelease :clevertap-geofence:assembleRelease :clevertap-hms:assembleRelease :clevertap-pushTemplates:assembleRelease :clevertap-xps:assembleRelease\n- name: Upload AAR and apk files\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: assembleRelease-clevertap-xps\n- path: clevertap-xps/build/outputs/aar\n\\ No newline at end of file\n+ name: aars_and_apks.zip\n+ path: |\n+ clevertap-core/build/outputs/aar\n+ clevertap-hms/build/outputs/aar\n+ clevertap-xps/build/outputs/aar\n+ clevertap-geofence/build/outputs/aar\n+ clevertap-pushtemplates/build/outputs/aar\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/codechecks_checkstyle/action.yml",
"new_path": ".github/mini_flows/codechecks_checkstyle/action.yml",
"diff": "@@ -2,69 +2,19 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: checkstyle-clevertap-core\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-core:checkstyle\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: checkstyle-clevertap-core\n- path: clevertap-core/build/reports/checkstyle\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: checkstyle-clevertap-geofence\n- if: always()\n+ - name: CodeAnalysis via checkstyle\nshell: bash\n- run: ./gradlew :clevertap-geofence:checkstyle\n+ run: ./gradlew :clevertap-core:checkstyle :clevertap-geofence:checkstyle :clevertap-hms:checkstyle :clevertap-pushTemplates:checkstyle :clevertap-xps:checkstyle\n- - name: Upload AAR and apk files\n+ - name: Upload checkstyle results\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: checkstyle-clevertap-geofence\n- path: clevertap-geofence/build/reports/checkstyle\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: checkstyle-clevertap-hms\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-hms:checkstyle\n+ name: checkstyle_results\n+ path: |\n+ clevertap-core/build/reports/checkstyle\n+ clevertap-hms/build/reports/checkstyle\n+ clevertap-xps/build/reports/checkstyle\n+ clevertap-geofence/build/reports/checkstyle\n+ clevertap-pushtemplates/build/reports/checkstyle\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: checkstyle-clevertap-hms\n- path: clevertap-hms/build/reports/checkstyle\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: checkstyle-clevertap-pushTemplates\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-pushtemplates:checkstyle\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: checkstyle-clevertap-pushTemplates\n- path: clevertap-pushtemplates/build/reports/checkstyle\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: checkstyle-clevertap-xps\n- shell: bash\n- run: ./gradlew :clevertap-xps:checkstyle\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: checkstyle-clevertap-xps\n- path: clevertap-xps/build/reports/checkstyle\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/codechecks_detekt/action.yml",
"new_path": ".github/mini_flows/codechecks_detekt/action.yml",
"diff": "runs:\nusing: \"composite\"\nsteps:\n-\n- - name: detekt-clevertap-core\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-core:detekt\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: detekt-clevertap-core\n- path: clevertap-core/build/reports/detekt\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: detekt-clevertap-geofence\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-geofence:detekt\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: detekt-clevertap-geofence\n- path: clevertap-geofence/build/reports/detekt\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: detekt-clevertap-hms\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-hms:detekt\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: detekt-clevertap-hms\n- path: clevertap-hms/build/reports/detekt\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: detekt-clevertap-pushTemplates\n- if: always()\n+ - name: CodeAnalysis via detekt\nshell: bash\n- run: ./gradlew :clevertap-pushtemplates:detekt\n+ run: ./gradlew :clevertap-core:detekt :clevertap-geofence:detekt :clevertap-hms:detekt :clevertap-pushTemplates:detekt :clevertap-xps:detekt\n- - name: Upload AAR and apk files\n+ - name: Upload detekt results\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: detekt-clevertap-pushTemplates\n- path: clevertap-pushtemplates/build/reports/detekt\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: detekt-clevertap-xps\n- shell: bash\n- run: ./gradlew :clevertap-xps:detekt\n+ name: detekt_results\n+ path: |\n+ clevertap-core/build/reports/detekt\n+ clevertap-hms/build/reports/detekt\n+ clevertap-xps/build/reports/detekt\n+ clevertap-geofence/build/reports/detekt\n+ clevertap-pushtemplates/build/reports/detekt\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: detekt-clevertap-xps\n- path: clevertap-xps/build/reports/detekt\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/lint/action.yml",
"new_path": ".github/mini_flows/lint/action.yml",
"diff": "runs:\nusing: \"composite\"\nsteps:\n-\n- - name: lint-clevertap-core\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-core:lint\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: lint-clevertap-core\n- path: clevertap-core/build/reports/lint-results-debug.html\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: lint-clevertap-geofence\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-geofence:lint\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: lint-clevertap-geofence\n- path: clevertap-geofence/build/reports/lint-results-debug.html\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: lint-clevertap-hms\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-hms:lint\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: lint-clevertap-hms\n- path: clevertap-hms/build/reports/lint-results-debug.html\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: lint-clevertap-pushTemplates\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-pushtemplates:lint\n-\n- - name: Upload AAR and apk files\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: lint-clevertap-pushTemplates\n- path: clevertap-pushtemplates/build/reports/lint-results-debug.html\n-\n- ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n-\n- - name: lint-clevertap-xps\n+ - name: Check lint\nshell: bash\n- run: ./gradlew :clevertap-xps:lint\n+ run: ./gradlew :clevertap-core:lint :clevertap-geofence:lint :clevertap-hms:lint :clevertap-pushTemplates:lint :clevertap-xps:lint\n- - name: Upload AAR and apk files\n+ - name: Upload Lint results\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: lint-clevertap-xps\n- path: clevertap-xps/build/reports/lint-results-debug.html\n\\ No newline at end of file\n+ name: lint_results\n+ path: |\n+ clevertap-core/build/reports/lint-results.html\n+ clevertap-hms/build/reports/lint-results.html\n+ clevertap-xps/build/reports/lint-results.html\n+ clevertap-geofence/build/reports/lint-results.html\n+ clevertap-pushtemplates/build/reports/lint-results.html\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/test_and_coverage_debug/action.yml",
"new_path": ".github/mini_flows/test_and_coverage_debug/action.yml",
"diff": "@@ -2,106 +2,31 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: jacocoTestReportDebug-clevertap-core\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-core:jacocoTestReportDebug -Pcoverage='true'\n-\n- - name: Upload1\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: TestReportDebug-clevertap-core\n- path: clevertap-core/build/reports/tests\n-\n- - name: Upload2\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: JacocoReportDebug-clevertap-core\n- path: clevertap-core/build/reports/jacoco\n-\n-\n- #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: jacocoTestReportDebug-clevertap-geofence\n- if: always()\n+ - name: Run Unit Tests And Code Coverage (DEBUG)\nshell: bash\n- run: ./gradlew :clevertap-geofence:jacocoTestReportDebug -Pcoverage='true'\n+ run: ./gradlew :clevertap-core:jacocoTestReportDebug -Pcoverage='true' :clevertap-geofence:jacocoTestReportDebug -Pcoverage='true' :clevertap-hms:jacocoTestReportDebug -Pcoverage='true' :clevertap-pushTemplates:jacocoTestReportDebug -Pcoverage='true' :clevertap-xps:jacocoTestReportDebug -Pcoverage='true'\n- - name: Upload1\n+ - name: Upload Unit tests\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: TestReportDebug-clevertap-geofence\n- path: clevertap-geofence/build/reports/tests\n+ name: code-coverage-results\n+ path: |\n+ clevertap-core/build/reports/tests\n+ clevertap-core/build/reports/jacoco\n- - name: Upload2\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: JacocoReportDebug-clevertap-geofence\n- path: clevertap-geofence/build/reports/jacoco\n+ clevertap-hms/build/reports/tests\n+ clevertap-hms/build/reports/jacoco\n+ clevertap-xps/build/reports/tests\n+ clevertap-xps/build/reports/jacoco\n- #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: jacocoTestReportDebug-clevertap-hms\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-hms:jacocoTestReportDebug -Pcoverage='true'\n+ clevertap-geofence/build/reports/tests\n+ clevertap-geofence/build/reports/jacoco\n- - name: Upload1\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: TestReportDebug-clevertap-hms\n- path: clevertap-hms/build/reports/tests\n+ clevertap-pushtemplates/build/reports/tests\n+ clevertap-pushtemplates/build/reports/jacoco\n- - name: Upload2\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: JacocoReportDebug-clevertap-hms\n- path: clevertap-hms/build/reports/jacoco\n- #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: jacocoTestReportDebug-clevertap-xps\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-xps:jacocoTestReportDebug -Pcoverage='true'\n-\n- - name: Upload1\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: TestReportDebug-clevertap-xps\n- path: clevertap-xps/build/reports/tests\n-\n- - name: Upload2\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: JacocoReportDebug-clevertap-xps\n- path: clevertap-xps/build/reports/jacoco\n-\n-\n-\n- #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: jacocoTestReportDebug-clevertap-pushtemplates\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-pushtemplates:jacocoTestReportDebug -Pcoverage='true'\n-\n- - name: Upload1\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: TestReportDebug-clevertap-pushtemplates\n- path: clevertap-pushtemplates/build/reports/tests\n-\n- - name: Upload2\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: JacocoReportDebug-clevertap-pushtemplates\n- path: clevertap-pushtemplates/build/reports/jacoco\n+ #todo : set success/failure as output and use slack action to send message . setting success failure: https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#outputs-for-composite-actions\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/test_and_coverage_release/action.yml",
"new_path": ".github/mini_flows/test_and_coverage_release/action.yml",
"diff": "runs:\nusing: \"composite\"\nsteps:\n- - name: jacocoTestReportRelease-clevertap-core\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-core:jacocoTestReportRelease -Pcoverage='true'\n-\n- - name: Upload1\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: TestReportRelease-clevertap-core\n- path: clevertap-core/build/reports/tests\n-\n- - name: Upload2\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: JacocoReportRelease-clevertap-core\n- path: clevertap-core/build/reports/jacoco\n-\n-\n- #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: jacocoTestReportRelease-clevertap-geofence\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-geofence:jacocoTestReportRelease -Pcoverage='true'\n-\n- - name: Upload1\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: TestReportRelease-clevertap-geofence\n- path: clevertap-geofence/build/reports/tests\n-\n- - name: Upload2\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: JacocoReportRelease-clevertap-geofence\n- path: clevertap-geofence/build/reports/jacoco\n-\n- #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: jacocoTestReportRelease-clevertap-hms\n- if: always()\n+ - name: Run Unit Tests And Code Coverage (RELEASE)\nshell: bash\n- run: ./gradlew :clevertap-hms:jacocoTestReportRelease -Pcoverage='true'\n+ run: ./gradlew :clevertap-core:jacocoTestReportRelease -Pcoverage='true' :clevertap-geofence:jacocoTestReportRelease -Pcoverage='true' :clevertap-hms:jacocoTestReportRelease -Pcoverage='true' :clevertap-pushTemplates:jacocoTestReportRelease -Pcoverage='true' :clevertap-xps:jacocoTestReportRelease -Pcoverage='true'\n- - name: Upload1\n+ - name: Upload Unit tests\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: TestReportRelease-clevertap-hms\n- path: clevertap-hms/build/reports/tests\n+ name: code-coverage-results\n+ path: |\n+ clevertap-core/build/reports/tests\n+ clevertap-core/build/reports/jacoco\n- - name: Upload2\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: JacocoReportRelease-clevertap-hms\n- path: clevertap-hms/build/reports/jacoco\n+ clevertap-hms/build/reports/tests\n+ clevertap-hms/build/reports/jacoco\n+ clevertap-xps/build/reports/tests\n+ clevertap-xps/build/reports/jacoco\n- #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: jacocoTestReportRelease-clevertap-xps\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-xps:jacocoTestReportRelease -Pcoverage='true'\n+ clevertap-geofence/build/reports/tests\n+ clevertap-geofence/build/reports/jacoco\n- - name: Upload1\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: TestReportRelease-clevertap-xps\n- path: clevertap-xps/build/reports/tests\n+ clevertap-pushtemplates/build/reports/tests\n+ clevertap-pushtemplates/build/reports/jacoco\n- - name: Upload2\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: JacocoReportRelease-clevertap-xps\n- path: clevertap-xps/build/reports/jacoco\n-\n- #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n- - name: jacocoTestReportRelease-clevertap-pushtemplates\n- if: always()\n- shell: bash\n- run: ./gradlew :clevertap-pushtemplates:jacocoTestReportRelease -Pcoverage='true'\n-\n- - name: Upload1\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: TestReportRelease-clevertap-pushtemplates\n- path: clevertap-pushtemplates/build/reports/tests\n-\n- - name: Upload2\n- if: always()\n- uses: actions/upload-artifact@v2\n- with:\n- name: JacocoReportRelease-clevertap-pushtemplates\n- path: clevertap-pushtemplates/build/reports/jacoco\n+ #todo : set success/failure as output and use slack action to send message . setting success failure: https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#outputs-for-composite-actions\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2225] undo github action changes |
116,620 | 10.10.2022 12:46:54 | -19,080 | dfc6d83b58d5f6a6401c6e57aa33605e58f99933 | undo ssl changes | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/SSLContextBuilder.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/network/SSLContextBuilder.java",
"diff": "@@ -23,6 +23,7 @@ final class SSLContextBuilder {\nInputStream inputStream3 = new BufferedInputStream(getClass().getClassLoader().getResourceAsStream(\"com/clevertap/android/sdk/certificates/AmazonRootCA1.cer\"));\nX509Certificate x509Certificate3 = (X509Certificate) certificateFactory.generateCertificate(inputStream3);\nkeyStore.setCertificateEntry(\"AmazonRootCA1\", x509Certificate3);\n+\ntrustManagerFactory.init(keyStore);\nSSLContext sslContext = SSLContext.getInstance(\"TLS\");\nsslContext.init(null, trustManagerFactory.getTrustManagers(), null);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2225] undo ssl changes |
116,618 | 10.10.2022 13:22:54 | -19,080 | 87ac35c896a954feb0c0118bd2cfab40e2b27fbe | refactor(SDK-2296): remove dedicated version tracking method for signed call sdk | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -254,7 +254,6 @@ public interface Constants {\nString LOG_TAG_PRODUCT_CONFIG = \"Product Config : \";\nint FETCH_TYPE_PC = 0;\nint FETCH_TYPE_FF = 1;\n- String KEY_SIGNED_CALL_SDK_VERSION = \"scv\";\nString LOG_TAG_SIGNED_CALL = \"SignedCall : \";\nString LOG_TAG_GEOFENCES = \"Geofences : \";\n// error message codes\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CoreMetaData.java",
"diff": "@@ -39,8 +39,6 @@ public class CoreMetaData extends CleverTapMetaData {\nprivate int geofenceSDKVersion = 0;\n- private String signedCallSDKVersion = null;\n-\nprivate boolean installReferrerDataSent = false;\nprivate boolean isBgPing = false;\n@@ -198,15 +196,6 @@ public class CoreMetaData extends CleverTapMetaData {\nreturn customSdkVersions;\n}\n- public String getSignedCallSDKVersion() {\n- return signedCallSDKVersion;\n- }\n-\n- @RestrictTo(Scope.LIBRARY_GROUP)\n- public void setSignedCallSDKVersion(String signedCallSDKVersion) {\n- this.signedCallSDKVersion = signedCallSDKVersion;\n- }\n-\nvoid setLastSessionLength(final int lastSessionLength) {\nthis.lastSessionLength = lastSessionLength;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DeviceInfo.java",
"diff": "@@ -40,7 +40,6 @@ import java.util.concurrent.Callable;\nimport org.json.JSONObject;\nimport static android.content.Context.USAGE_STATS_SERVICE;\n-import static com.clevertap.android.sdk.Constants.KEY_SIGNED_CALL_SDK_VERSION;\n@RestrictTo(Scope.LIBRARY)\npublic class DeviceInfo {\n@@ -540,12 +539,8 @@ public class DeviceInfo {\nif (getGoogleAdID() != null) {\ndeviceIsMultiUser = new LoginInfoProvider(context, config, this).deviceIsMultiUser();\n}\n- JSONObject appLaunchFields = CTJsonConverter.from(this, mCoreMetaData.getLocationFromUser(), enableNetworkInfoReporting,\n+ return CTJsonConverter.from(this, mCoreMetaData.getLocationFromUser(), enableNetworkInfoReporting,\ndeviceIsMultiUser);\n- if(mCoreMetaData.getSignedCallSDKVersion() != null) {\n- appLaunchFields.put(KEY_SIGNED_CALL_SDK_VERSION, mCoreMetaData.getSignedCallSDKVersion());\n- }\n- return appLaunchFields;\n} catch (Throwable t) {\nconfig.getLogger().verbose(config.getAccountId(), \"Failed to construct App Launched event\", t);\nreturn new JSONObject();\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | refactor(SDK-2296): remove dedicated version tracking method for signed call sdk |
116,618 | 10.10.2022 13:29:58 | -19,080 | 12ef1d3bf09085a8f5478314a75c0477bc925aac | refactor(SDK-2296): some cleanup | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "@@ -2851,10 +2851,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nsSignedCallNotificationHandler = notificationHandler;\n}\n- public static void handleMessage(String pushType) {\n-\n- }\n-\n/**\n* Returns a unique identifier by which CleverTap identifies this user, on Main thread Callback.\n*\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | refactor(SDK-2296): some cleanup |
116,612 | 10.10.2022 17:16:34 | -19,080 | bf9e56c34e07469932bbfb38d7ca583be4884f6d | task(SDK-1970) : Add LocalInApp builder written in kotlin | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTLocalInApp.kt",
"diff": "+package com.clevertap.android.sdk.inapp\n+\n+import android.content.Context\n+import com.clevertap.android.sdk.Constants\n+import com.clevertap.android.sdk.DeviceInfo\n+import org.json.JSONArray\n+import org.json.JSONObject\n+\n+class CTLocalInApp private constructor() {\n+\n+ enum class InAppType(val type: String) {\n+ ALERT(CTInAppType.CTInAppTypeAlert.toString()),\n+ HALF_INTERSTITIAL(CTInAppType.CTInAppTypeHalfInterstitial.toString())\n+ }\n+\n+ companion object {\n+\n+ @JvmStatic\n+ fun builder(context: Context): Builder = Builder(context)\n+ const val IS_LOCAL_INAPP = \" isLocalInApp\"\n+ }\n+\n+ class Builder internal constructor(private val context: Context) {\n+\n+ private var jsonObject = JSONObject()\n+\n+ fun setInAppType(inAppType: InAppType) =\n+ jsonObject.run {\n+ put(Constants.KEY_TYPE, inAppType.type)\n+ put(IS_LOCAL_INAPP, true)\n+ put(Constants.KEY_HIDE_CLOSE, true)\n+ put(\n+ Constants.KEY_IS_TABLET,\n+ DeviceInfo.getDeviceType([email protected]) == DeviceInfo.TABLET\n+ )\n+ Builder1(this)\n+ }\n+\n+ class Builder1(private var jsonObject: JSONObject) {\n+\n+ fun setTitleText(titleText: String) =\n+ jsonObject.run {\n+ put(Constants.KEY_TITLE, JSONObject().put(Constants.KEY_TEXT, titleText))\n+ Builder2(this)\n+ }\n+ }\n+\n+ class Builder2(private var jsonObject: JSONObject) {\n+\n+ fun setMessageText(messageText: String) =\n+ jsonObject.run {\n+ put(Constants.KEY_MESSAGE, JSONObject().put(Constants.KEY_TEXT, messageText))\n+ Builder3(this)\n+ }\n+ }\n+\n+ class Builder3(private var jsonObject: JSONObject) {\n+\n+ fun followDeviceOrientation(deviceOrientation: Boolean) =\n+ jsonObject.run {\n+ put(Constants.KEY_PORTRAIT, true)\n+ put(Constants.KEY_LANDSCAPE, deviceOrientation)\n+ Builder4(this)\n+ }\n+ }\n+\n+ class Builder4(private var jsonObject: JSONObject) {\n+\n+ fun setPositiveBtnText(positiveBtnText: String) =\n+ jsonObject.run {\n+ val positiveButtonObject = JSONObject().apply {\n+ put(Constants.KEY_TEXT, positiveBtnText)\n+ put(Constants.KEY_RADIUS, \"2\")\n+ }\n+ put(Constants.KEY_BUTTONS, JSONArray().put(0, positiveButtonObject))\n+ Builder5(this)\n+ }\n+ }\n+\n+ class Builder5(private var jsonObject: JSONObject) {\n+\n+ fun setNegativeBtnText(negativeBtnText: String) =\n+ jsonObject.run {\n+ val negativeButtonObject = JSONObject().apply {\n+ put(Constants.KEY_TEXT, negativeBtnText)\n+ put(Constants.KEY_RADIUS, \"2\")\n+ }\n+ getJSONArray(Constants.KEY_BUTTONS).put(1, negativeButtonObject)\n+ Builder6(this)\n+ }\n+ }\n+\n+ class Builder6(private var jsonObject: JSONObject) {\n+\n+ fun setBackgroundColor(backgroundColor: String) =\n+ apply { jsonObject.put(Constants.KEY_BG, backgroundColor) }\n+\n+ fun setImageUrl(imageUrl: String) =\n+ apply {\n+ val mediaObject = JSONObject().apply {\n+ put(Constants.KEY_URL, imageUrl)\n+ put(Constants.KEY_CONTENT_TYPE, \"image\")\n+ }\n+ jsonObject.apply {\n+ put(Constants.KEY_MEDIA, mediaObject)\n+ if (getBoolean(Constants.KEY_LANDSCAPE)) {\n+ put(Constants.KEY_MEDIA_LANDSCAPE, mediaObject)\n+ }\n+ }\n+ }\n+\n+ fun setTitleTextColor(titleTextColor: String) =\n+ apply { jsonObject.getJSONObject(Constants.KEY_TITLE).put(Constants.KEY_COLOR, titleTextColor) }\n+\n+ fun setMessageTextColor(messageTextColor: String) =\n+ apply { jsonObject.getJSONObject(Constants.KEY_MESSAGE).put(Constants.KEY_COLOR, messageTextColor) }\n+\n+ fun setBtnTextColor(btnTextColor: String) =\n+ apply { updateActionButtonArray(Constants.KEY_COLOR, btnTextColor) }\n+\n+ fun setBtnBackgroundColor(btnBackgroundColor: String) =\n+ apply { updateActionButtonArray(Constants.KEY_BG, btnBackgroundColor) }\n+\n+ fun setBtnBorderColor(btnBorderColor: String) =\n+ apply { updateActionButtonArray(Constants.KEY_BORDER, btnBorderColor) }\n+\n+ fun setBtnBorderRadius(btnBorderRadius: String) =\n+ apply { updateActionButtonArray(Constants.KEY_RADIUS, btnBorderRadius) }\n+\n+ private val updateActionButtonArray: (String, String) -> Unit = { key, value ->\n+ arrayOf(0, 1).forEach {\n+ jsonObject.getJSONArray(Constants.KEY_BUTTONS).getJSONObject(it).put(key, value)\n+ }\n+ }\n+\n+ fun build() = jsonObject\n+ }\n+ }\n+}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1970) : Add LocalInApp builder written in kotlin |
116,620 | 10.10.2022 17:42:46 | -19,080 | da4308599accc13e2f555f2bbae528afb94c90b7 | keep restricting utm visited event | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/validation/Validator.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/validation/Validator.java",
"diff": "@@ -39,7 +39,7 @@ public final class Validator {\nprivate static final String[] objectValueCharsNotAllowed = {\"'\", \"\\\"\", \"\\\\\"};\nprivate static final String[] restrictedNames = {\"Stayed\", \"Notification Clicked\",\n- \"Notification Viewed\", \"Notification Sent\", \"App Launched\", \"wzrk_d\",\n+ \"Notification Viewed\", \"UTM Visited\", \"Notification Sent\", \"App Launched\", \"wzrk_d\",\n\"App Uninstalled\", \"Notification Bounced\", Constants.GEOFENCE_ENTERED_EVENT_NAME,\nConstants.GEOFENCE_EXITED_EVENT_NAME, Constants.DC_OUTGOING_EVENT_NAME,\nConstants.DC_INCOMING_EVENT_NAME, Constants.DC_END_EVENT_NAME};\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/validation/ValidatorTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/validation/ValidatorTest.kt",
"diff": "@@ -425,7 +425,7 @@ class ValidatorTest : BaseTestCase() {\n// when event name is one of the restricted names, should give restricted names error\nval restrictedNames = arrayOf(\"Stayed\", \"Notification Clicked\",\n- \"Notification Viewed\", \"Notification Sent\", \"App Launched\", \"wzrk_d\",\n+ \"Notification Viewed\", \"UTM Visited\", \"Notification Sent\", \"App Launched\", \"wzrk_d\",\n\"App Uninstalled\", \"Notification Bounced\", Constants.GEOFENCE_ENTERED_EVENT_NAME,\nConstants.GEOFENCE_EXITED_EVENT_NAME)\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [SDK-2245] keep restricting utm visited event |
116,619 | 12.10.2022 16:07:26 | -19,080 | 6eb5f13c30dfb5f29702f657eabc167e56e42f6c | [external] updating github actions to support independent steps and independent uploads for better debugging | [
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/build_code_debug/action.yml",
"new_path": ".github/mini_flows/build_code_debug/action.yml",
"diff": "@@ -2,18 +2,69 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: Generate AAR files\n+ - name: assembleDebug-clevertap-core\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-core:assembleDebug\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: assembleDebug-clevertap-core\n+ path: clevertap-core/build/outputs/aar\n+\n+###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: assembleDebug-clevertap-geofence\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-geofence:assembleDebug\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: assembleDebug-clevertap-geofence\n+ path: clevertap-geofence/build/outputs/aar\n+\n+###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: assembleDebug-clevertap-hms\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-hms:assembleDebug\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: assembleDebug-clevertap-hms\n+ path: clevertap-hms/build/outputs/aar\n+\n+###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: assembleDebug-clevertap-pushTemplates\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-pushtemplates:assembleDebug\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: assembleDebug-clevertap-pushTemplates\n+ path: clevertap-pushtemplates/build/outputs/aar\n+\n+###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: assembleDebug-clevertap-xps\nshell: bash\n- run: ./gradlew :clevertap-core:assembleDebug :clevertap-geofence:assembleDebug :clevertap-hms:assembleDebug :clevertap-pushTemplates:assembleDebug :clevertap-xps:assembleDebug\n+ run: ./gradlew :clevertap-xps:assembleDebug\n- name: Upload AAR and apk files\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: aars_and_apks.zip\n- path: |\n- clevertap-core/build/outputs/aar\n- clevertap-hms/build/outputs/aar\n- clevertap-xps/build/outputs/aar\n- clevertap-geofence/build/outputs/aar\n- clevertap-pushtemplates/build/outputs/aar\n+ name: assembleDebug-clevertap-xps\n+ path: clevertap-xps/build/outputs/aar\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/build_code_release/action.yml",
"new_path": ".github/mini_flows/build_code_release/action.yml",
"diff": "@@ -2,18 +2,69 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: Generate AAR files\n+ - name: assembleRelease-clevertap-core\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-core:assembleRelease\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: assembleRelease-clevertap-core\n+ path: clevertap-core/build/outputs/aar\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: assembleRelease-clevertap-geofence\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-geofence:assembleRelease\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: assembleRelease-clevertap-geofence\n+ path: clevertap-geofence/build/outputs/aar\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: assembleRelease-clevertap-hms\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-hms:assembleRelease\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: assembleRelease-clevertap-hms\n+ path: clevertap-hms/build/outputs/aar\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: assembleRelease-clevertap-pushTemplates\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-pushtemplates:assembleRelease\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: assembleRelease-clevertap-pushTemplates\n+ path: clevertap-pushtemplates/build/outputs/aar\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: assembleRelease-clevertap-xps\nshell: bash\n- run: ./gradlew :clevertap-core:assembleRelease :clevertap-geofence:assembleRelease :clevertap-hms:assembleRelease :clevertap-pushTemplates:assembleRelease :clevertap-xps:assembleRelease\n+ run: ./gradlew :clevertap-xps:assembleRelease\n- name: Upload AAR and apk files\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: aars_and_apks.zip\n- path: |\n- clevertap-core/build/outputs/aar\n- clevertap-hms/build/outputs/aar\n- clevertap-xps/build/outputs/aar\n- clevertap-geofence/build/outputs/aar\n- clevertap-pushtemplates/build/outputs/aar\n+ name: assembleRelease-clevertap-xps\n+ path: clevertap-xps/build/outputs/aar\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/codechecks_checkstyle/action.yml",
"new_path": ".github/mini_flows/codechecks_checkstyle/action.yml",
"diff": "@@ -2,19 +2,69 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: CodeAnalysis via checkstyle\n+ - name: checkstyle-clevertap-core\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-core:checkstyle\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: checkstyle-clevertap-core\n+ path: clevertap-core/build/reports/checkstyle\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: checkstyle-clevertap-geofence\n+ if: always()\nshell: bash\n- run: ./gradlew :clevertap-core:checkstyle :clevertap-geofence:checkstyle :clevertap-hms:checkstyle :clevertap-pushTemplates:checkstyle :clevertap-xps:checkstyle\n+ run: ./gradlew :clevertap-geofence:checkstyle\n- - name: Upload checkstyle results\n+ - name: Upload AAR and apk files\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: checkstyle_results\n- path: |\n- clevertap-core/build/reports/checkstyle\n- clevertap-hms/build/reports/checkstyle\n- clevertap-xps/build/reports/checkstyle\n- clevertap-geofence/build/reports/checkstyle\n- clevertap-pushtemplates/build/reports/checkstyle\n+ name: checkstyle-clevertap-geofence\n+ path: clevertap-geofence/build/reports/checkstyle\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: checkstyle-clevertap-hms\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-hms:checkstyle\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: checkstyle-clevertap-hms\n+ path: clevertap-hms/build/reports/checkstyle\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: checkstyle-clevertap-pushTemplates\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-pushtemplates:checkstyle\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: checkstyle-clevertap-pushTemplates\n+ path: clevertap-pushtemplates/build/reports/checkstyle\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: checkstyle-clevertap-xps\n+ shell: bash\n+ run: ./gradlew :clevertap-xps:checkstyle\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: checkstyle-clevertap-xps\n+ path: clevertap-xps/build/reports/checkstyle\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/codechecks_detekt/action.yml",
"new_path": ".github/mini_flows/codechecks_detekt/action.yml",
"diff": "runs:\nusing: \"composite\"\nsteps:\n- - name: CodeAnalysis via detekt\n+\n+ - name: detekt-clevertap-core\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-core:detekt\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: detekt-clevertap-core\n+ path: clevertap-core/build/reports/detekt\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: detekt-clevertap-geofence\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-geofence:detekt\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: detekt-clevertap-geofence\n+ path: clevertap-geofence/build/reports/detekt\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: detekt-clevertap-hms\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-hms:detekt\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: detekt-clevertap-hms\n+ path: clevertap-hms/build/reports/detekt\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: detekt-clevertap-pushTemplates\n+ if: always()\nshell: bash\n- run: ./gradlew :clevertap-core:detekt :clevertap-geofence:detekt :clevertap-hms:detekt :clevertap-pushTemplates:detekt :clevertap-xps:detekt\n+ run: ./gradlew :clevertap-pushtemplates:detekt\n- - name: Upload detekt results\n+ - name: Upload AAR and apk files\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: detekt_results\n- path: |\n- clevertap-core/build/reports/detekt\n- clevertap-hms/build/reports/detekt\n- clevertap-xps/build/reports/detekt\n- clevertap-geofence/build/reports/detekt\n- clevertap-pushtemplates/build/reports/detekt\n+ name: detekt-clevertap-pushTemplates\n+ path: clevertap-pushtemplates/build/reports/detekt\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: detekt-clevertap-xps\n+ shell: bash\n+ run: ./gradlew :clevertap-xps:detekt\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: detekt-clevertap-xps\n+ path: clevertap-xps/build/reports/detekt\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/lint/action.yml",
"new_path": ".github/mini_flows/lint/action.yml",
"diff": "runs:\nusing: \"composite\"\nsteps:\n- - name: Check lint\n+\n+ - name: lint-clevertap-core\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-core:lint\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: lint-clevertap-core\n+ path: clevertap-core/build/reports/lint-results-debug.html\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: lint-clevertap-geofence\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-geofence:lint\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: lint-clevertap-geofence\n+ path: clevertap-geofence/build/reports/lint-results-debug.html\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: lint-clevertap-hms\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-hms:lint\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: lint-clevertap-hms\n+ path: clevertap-hms/build/reports/lint-results-debug.html\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: lint-clevertap-pushTemplates\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-pushtemplates:lint\n+\n+ - name: Upload AAR and apk files\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: lint-clevertap-pushTemplates\n+ path: clevertap-pushtemplates/build/reports/lint-results-debug.html\n+\n+ ###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------###------##----------\n+\n+ - name: lint-clevertap-xps\nshell: bash\n- run: ./gradlew :clevertap-core:lint :clevertap-geofence:lint :clevertap-hms:lint :clevertap-pushTemplates:lint :clevertap-xps:lint\n+ run: ./gradlew :clevertap-xps:lint\n- - name: Upload Lint results\n+ - name: Upload AAR and apk files\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: lint_results\n- path: |\n- clevertap-core/build/reports/lint-results.html\n- clevertap-hms/build/reports/lint-results.html\n- clevertap-xps/build/reports/lint-results.html\n- clevertap-geofence/build/reports/lint-results.html\n- clevertap-pushtemplates/build/reports/lint-results.html\n+ name: lint-clevertap-xps\n+ path: clevertap-xps/build/reports/lint-results-debug.html\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/test_and_coverage_debug/action.yml",
"new_path": ".github/mini_flows/test_and_coverage_debug/action.yml",
"diff": "@@ -2,31 +2,106 @@ runs:\nusing: \"composite\"\nsteps:\n- - name: Run Unit Tests And Code Coverage (DEBUG)\n+ - name: jacocoTestReportDebug-clevertap-core\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-core:jacocoTestReportDebug -Pcoverage='true'\n+\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: TestReportDebug-clevertap-core\n+ path: clevertap-core/build/reports/tests\n+\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: JacocoReportDebug-clevertap-core\n+ path: clevertap-core/build/reports/jacoco\n+\n+\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: jacocoTestReportDebug-clevertap-geofence\n+ if: always()\nshell: bash\n- run: ./gradlew :clevertap-core:jacocoTestReportDebug -Pcoverage='true' :clevertap-geofence:jacocoTestReportDebug -Pcoverage='true' :clevertap-hms:jacocoTestReportDebug -Pcoverage='true' :clevertap-pushTemplates:jacocoTestReportDebug -Pcoverage='true' :clevertap-xps:jacocoTestReportDebug -Pcoverage='true'\n+ run: ./gradlew :clevertap-geofence:jacocoTestReportDebug -Pcoverage='true'\n- - name: Upload Unit tests\n+ - name: Upload1\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: code-coverage-results\n- path: |\n- clevertap-core/build/reports/tests\n- clevertap-core/build/reports/jacoco\n+ name: TestReportDebug-clevertap-geofence\n+ path: clevertap-geofence/build/reports/tests\n- clevertap-hms/build/reports/tests\n- clevertap-hms/build/reports/jacoco\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: JacocoReportDebug-clevertap-geofence\n+ path: clevertap-geofence/build/reports/jacoco\n- clevertap-xps/build/reports/tests\n- clevertap-xps/build/reports/jacoco\n- clevertap-geofence/build/reports/tests\n- clevertap-geofence/build/reports/jacoco\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: jacocoTestReportDebug-clevertap-hms\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-hms:jacocoTestReportDebug -Pcoverage='true'\n- clevertap-pushtemplates/build/reports/tests\n- clevertap-pushtemplates/build/reports/jacoco\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: TestReportDebug-clevertap-hms\n+ path: clevertap-hms/build/reports/tests\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: JacocoReportDebug-clevertap-hms\n+ path: clevertap-hms/build/reports/jacoco\n- #todo : set success/failure as output and use slack action to send message . setting success failure: https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#outputs-for-composite-actions\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: jacocoTestReportDebug-clevertap-xps\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-xps:jacocoTestReportDebug -Pcoverage='true'\n+\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: TestReportDebug-clevertap-xps\n+ path: clevertap-xps/build/reports/tests\n+\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: JacocoReportDebug-clevertap-xps\n+ path: clevertap-xps/build/reports/jacoco\n+\n+\n+\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: jacocoTestReportDebug-clevertap-pushtemplates\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-pushtemplates:jacocoTestReportDebug -Pcoverage='true'\n+\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: TestReportDebug-clevertap-pushtemplates\n+ path: clevertap-pushtemplates/build/reports/tests\n+\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: JacocoReportDebug-clevertap-pushtemplates\n+ path: clevertap-pushtemplates/build/reports/jacoco\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/test_and_coverage_release/action.yml",
"new_path": ".github/mini_flows/test_and_coverage_release/action.yml",
"diff": "runs:\nusing: \"composite\"\nsteps:\n+ - name: jacocoTestReportRelease-clevertap-core\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-core:jacocoTestReportRelease -Pcoverage='true'\n+\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: TestReportRelease-clevertap-core\n+ path: clevertap-core/build/reports/tests\n+\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: JacocoReportRelease-clevertap-core\n+ path: clevertap-core/build/reports/jacoco\n+\n+\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: jacocoTestReportRelease-clevertap-geofence\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-geofence:jacocoTestReportRelease -Pcoverage='true'\n+\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: TestReportRelease-clevertap-geofence\n+ path: clevertap-geofence/build/reports/tests\n+\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: JacocoReportRelease-clevertap-geofence\n+ path: clevertap-geofence/build/reports/jacoco\n+\n- - name: Run Unit Tests And Code Coverage (RELEASE)\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: jacocoTestReportRelease-clevertap-hms\n+ if: always()\nshell: bash\n- run: ./gradlew :clevertap-core:jacocoTestReportRelease -Pcoverage='true' :clevertap-geofence:jacocoTestReportRelease -Pcoverage='true' :clevertap-hms:jacocoTestReportRelease -Pcoverage='true' :clevertap-pushTemplates:jacocoTestReportRelease -Pcoverage='true' :clevertap-xps:jacocoTestReportRelease -Pcoverage='true'\n+ run: ./gradlew :clevertap-hms:jacocoTestReportRelease -Pcoverage='true'\n- - name: Upload Unit tests\n+ - name: Upload1\nif: always()\nuses: actions/upload-artifact@v2\nwith:\n- name: code-coverage-results\n- path: |\n- clevertap-core/build/reports/tests\n- clevertap-core/build/reports/jacoco\n+ name: TestReportRelease-clevertap-hms\n+ path: clevertap-hms/build/reports/tests\n- clevertap-hms/build/reports/tests\n- clevertap-hms/build/reports/jacoco\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: JacocoReportRelease-clevertap-hms\n+ path: clevertap-hms/build/reports/jacoco\n- clevertap-xps/build/reports/tests\n- clevertap-xps/build/reports/jacoco\n- clevertap-geofence/build/reports/tests\n- clevertap-geofence/build/reports/jacoco\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: jacocoTestReportRelease-clevertap-xps\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-xps:jacocoTestReportRelease -Pcoverage='true'\n- clevertap-pushtemplates/build/reports/tests\n- clevertap-pushtemplates/build/reports/jacoco\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: TestReportRelease-clevertap-xps\n+ path: clevertap-xps/build/reports/tests\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: JacocoReportRelease-clevertap-xps\n+ path: clevertap-xps/build/reports/jacoco\n- #todo : set success/failure as output and use slack action to send message . setting success failure: https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#outputs-for-composite-actions\n+\n+ #-----#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#----------#-----\n+ - name: jacocoTestReportRelease-clevertap-pushtemplates\n+ if: always()\n+ shell: bash\n+ run: ./gradlew :clevertap-pushtemplates:jacocoTestReportRelease -Pcoverage='true'\n+\n+ - name: Upload1\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: TestReportRelease-clevertap-pushtemplates\n+ path: clevertap-pushtemplates/build/reports/tests\n+\n+ - name: Upload2\n+ if: always()\n+ uses: actions/upload-artifact@v2\n+ with:\n+ name: JacocoReportRelease-clevertap-pushtemplates\n+ path: clevertap-pushtemplates/build/reports/jacoco\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [external] updating github actions to support independent steps and independent uploads for better debugging |
116,616 | 12.10.2022 16:45:15 | -19,080 | 8e653c3994ff87e3598fbfcd7cc55ff562ff468f | task(SDK-1970) - Add `fallbackToNotificationSettings` in CTLocalInApp.kt, refactor hard permission flow if permission is denied | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "package com.clevertap.android.sdk;\nimport static com.clevertap.android.sdk.Utils.isAndroid13;\n+import static com.clevertap.android.sdk.inapp.InAppController.IS_FIRST_TIME_PERMISSION_REQUEST;\nimport android.Manifest;\nimport android.app.Activity;\n@@ -52,7 +53,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nprivate static final int PERMISSION_REQUEST_CODE = 2;\n- private static final String ANDROID_PERMISSION_STRING = \"android.permission.POST_NOTIFICATIONS\";\n+ public static final String ANDROID_PERMISSION_STRING = \"android.permission.POST_NOTIFICATIONS\";\npublic interface PermissionCallback {\nvoid onAccept();\n@@ -71,7 +72,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nthrow new IllegalArgumentException();\n}\ninAppNotification = notif.getParcelable(\"inApp\");\n- boolean displayHardNotificationDialog = notif.getBoolean(\"displayHardPermissionDialog\",false);\n+ boolean displayHardNotificationDialog = notif.getBoolean(\"displayHardPermissionDialog\",\n+ false); // Using this boolean for a directly showing hard permission dialog flow\nBundle configBundle = notif.getBundle(\"configBundle\");\nif (configBundle != null) {\nconfig = configBundle.getParcelable(\"config\");\n@@ -185,30 +187,28 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n@RequiresApi(api = 33)\npublic void requestPermission() {\n- int permissionStatus = ContextCompat.checkSelfPermission(this,\n+ int permissionStatus = ContextCompat.checkSelfPermission(InAppNotificationActivity.this,\nManifest.permission.POST_NOTIFICATIONS);\nif (permissionStatus == PackageManager.PERMISSION_DENIED){\n- boolean neverAskAgainClicked = !ActivityCompat.shouldShowRequestPermissionRationale(\n+ if (!StorageHelper.getBoolean(InAppNotificationActivity.this,\n+ IS_FIRST_TIME_PERMISSION_REQUEST,true)) {\n+ boolean neverAskAgainClicked = ActivityCompat.shouldShowRequestPermissionRationale(\nInAppNotificationActivity.this, ANDROID_PERMISSION_STRING);\n-\nif (neverAskAgainClicked && inAppNotification.fallBackToNotificationSettings()) {\nshowFallbackAlertDialog();\n- return;\n}\n-\n- ActivityCompat.requestPermissions(this,\n+ }else{\n+ ActivityCompat.requestPermissions(InAppNotificationActivity.this,\nnew String[]{ANDROID_PERMISSION_STRING}, PERMISSION_REQUEST_CODE);\n-\n- }else if (permissionStatus == PackageManager.PERMISSION_GRANTED){\n- permissionCallbackWeakReference.get().onAccept();\n- didDismiss(null);\n+ }\n}\n}\n@Override\npublic void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {\nsuper.onRequestPermissionsResult(requestCode, permissions, grantResults);\n+ StorageHelper.putBoolean(InAppNotificationActivity.this,IS_FIRST_TIME_PERMISSION_REQUEST,false);\nif (requestCode == PERMISSION_REQUEST_CODE) {\nboolean granted = grantResults.length > 0 && grantResults[0] ==\nPackageManager.PERMISSION_GRANTED;\n@@ -222,7 +222,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\npublic void showFallbackAlertDialog() {\n- AlertDialogPromptForSettings.INSTANCE.show(this, new AlertDialogPromptForSettings.Callback() {\n+ AlertDialogPromptForSettings.INSTANCE.show(InAppNotificationActivity.this, new AlertDialogPromptForSettings.Callback() {\n@Override\npublic void onAccept() {\nUtils.navigateToAndroidSettingsForNotifications(InAppNotificationActivity.this);\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/StorageHelper.java",
"diff": "@@ -95,7 +95,7 @@ public final class StorageHelper {\n}\n@SuppressWarnings(\"SameParameterValue\")\n- static boolean getBoolean(Context context, String key, boolean defaultValue) {\n+ public static boolean getBoolean(Context context, String key, boolean defaultValue) {\nreturn getPreferences(context).getBoolean(key, defaultValue);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNativeHalfInterstitialFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNativeHalfInterstitialFragment.java",
"diff": "package com.clevertap.android.sdk.inapp;\nimport android.annotation.SuppressLint;\n+import android.content.Context;\nimport android.content.res.Configuration;\nimport android.graphics.Color;\nimport android.graphics.drawable.ColorDrawable;\n@@ -19,6 +20,8 @@ import android.widget.RelativeLayout;\nimport android.widget.TextView;\nimport androidx.annotation.NonNull;\nimport androidx.annotation.Nullable;\n+\n+import com.clevertap.android.sdk.DeviceInfo;\nimport com.clevertap.android.sdk.R;\nimport com.clevertap.android.sdk.customviews.CloseImageView;\nimport java.util.ArrayList;\n@@ -34,7 +37,8 @@ public class CTInAppNativeHalfInterstitialFragment extends CTInAppBaseFullNative\nArrayList<Button> inAppButtons = new ArrayList<>();\nView inAppView;\n- if (inAppNotification.isTablet() && isTablet()) {\n+ if (inAppNotification.isTablet() && isTablet() || inAppNotification.isLocalInApp()\n+ && isTabletFromDeviceType(inflater.getContext())) {\ninAppView = inflater.inflate(R.layout.tab_inapp_half_interstitial, container, false);\n} else {\ninAppView = inflater.inflate(R.layout.inapp_half_interstitial, container, false);\n@@ -55,7 +59,9 @@ public class CTInAppNativeHalfInterstitialFragment extends CTInAppBaseFullNative\npublic void onGlobalLayout() {\nFrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) relativeLayout\n.getLayoutParams();\n- if (inAppNotification.isTablet() && isTablet()) {\n+ if (inAppNotification.isTablet() && isTablet()\n+ || inAppNotification.isLocalInApp() &&\n+ isTabletFromDeviceType(inflater.getContext())) {\nredrawHalfInterstitialInApp(relativeLayout, layoutParams, closeImageView);\n} else {\nif (isTablet()) {\n@@ -195,4 +201,8 @@ public class CTInAppNativeHalfInterstitialFragment extends CTInAppBaseFullNative\nreturn inAppView;\n}\n+\n+ boolean isTabletFromDeviceType(Context context){\n+ return DeviceInfo.getDeviceType(context) == DeviceInfo.TABLET;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotification.java",
"diff": "package com.clevertap.android.sdk.inapp;\n-import static com.clevertap.android.sdk.inapp.CTLocalInAppBuilder.FALLBACK_TO_NOTIFICATION_SETTINGS;\n-import static com.clevertap.android.sdk.inapp.CTLocalInAppBuilder.IS_LOCAL_INAPP;\n+import static com.clevertap.android.sdk.inapp.CTLocalInApp.FALLBACK_TO_NOTIFICATION_SETTINGS;\n+import static com.clevertap.android.sdk.inapp.CTLocalInApp.IS_LOCAL_INAPP;\nimport android.content.res.Configuration;\nimport android.graphics.Bitmap;\nimport android.os.Bundle;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationButton.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationButton.java",
"diff": "@@ -215,21 +215,6 @@ public class CTInAppNotificationButton implements Parcelable {\nreturn this;\n}\n-// CTInAppNotificationButton initWithLocalData(String btnText, String btnBackgroundColor,\n-// String btnTextColor, String btnBorderColor,\n-// String btnBorderRadius) {\n-//\n-// this.text = btnText != null ? btnText : \"\";\n-// this.backgroundColor = btnBackgroundColor != null ? btnBackgroundColor\n-// : Constants.BLUE;\n-//\n-// this.textColor = btnTextColor != null ? btnTextColor : Constants.BLUE;\n-// this.borderColor = btnBorderColor !=null ? btnBorderColor : Constants.WHITE;\n-// this.borderRadius = btnBorderRadius != null ? btnBorderRadius : \"2\";//Adding default value as 2 instead of an empty value.\n-// // If the value is empty then action btn defaults to standard btn without any customizations\n-// return this;\n-// }\n-\n/**\n* Checks if custom Key Value pair is present or not\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTLocalInApp.kt",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTLocalInApp.kt",
"diff": "@@ -16,11 +16,12 @@ class CTLocalInApp private constructor() {\ncompanion object {\n@JvmStatic\n- fun builder(context: Context): Builder = Builder(context)\n+ fun builder(): Builder = Builder()\nconst val IS_LOCAL_INAPP = \"isLocalInApp\"\n+ const val FALLBACK_TO_NOTIFICATION_SETTINGS = \"fallbackToNotificationSettings\"\n}\n- class Builder internal constructor(private val context: Context) {\n+ class Builder internal constructor() {\nprivate var jsonObject = JSONObject()\n@@ -29,10 +30,6 @@ class CTLocalInApp private constructor() {\nput(Constants.KEY_TYPE, inAppType.type)\nput(IS_LOCAL_INAPP, true)\nput(Constants.KEY_HIDE_CLOSE, true)\n- put(\n- Constants.KEY_IS_TABLET,\n- DeviceInfo.getDeviceType([email protected]) == DeviceInfo.TABLET\n- )\nBuilder1(this)\n}\n@@ -92,6 +89,9 @@ class CTLocalInApp private constructor() {\nclass Builder6(private var jsonObject: JSONObject) {\n+ fun setFallbackToSettings(fallbackToSettings: Boolean) =\n+ apply { jsonObject.put(FALLBACK_TO_NOTIFICATION_SETTINGS, fallbackToSettings) }\n+\nfun setBackgroundColor(backgroundColor: String) =\napply { jsonObject.put(Constants.KEY_BG, backgroundColor) }\n"
},
{
"change_type": "DELETE",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTLocalInAppBuilder.java",
"new_path": null,
"diff": "-package com.clevertap.android.sdk.inapp;\n-\n-\n-import android.content.Context;\n-import com.clevertap.android.sdk.Constants;\n-import com.clevertap.android.sdk.DeviceInfo;\n-import org.json.JSONArray;\n-import org.json.JSONException;\n-import org.json.JSONObject;\n-\n-import java.util.Objects;\n-\n-public class CTLocalInAppBuilder {\n-\n- public static final String HALF_INTERSTITIAL_INAPP = \"half-interstitial\";\n- public static final String ALERT_INAPP = \"alert-template\";\n- protected static final String IS_LOCAL_INAPP = \"isLocalInApp\";\n- protected static final String FALLBACK_TO_NOTIFICATION_SETTINGS = \"fallbackToNotificationSettings\";\n-\n- private final String localInAppType;//Required\n- private final JSONObject titleObj;// Required\n- private final JSONObject messageObj;// Required\n- private final boolean followDeviceOrientation;// Required\n- private final String positiveBtnText;// Required\n- private final String negativeBtnText;// Required\n-\n- CTLocalInAppBuilder(Builder.Builder1 builder) throws JSONException {\n- this.localInAppType = builder.jsonObject.getString(Constants.KEY_TYPE);\n- this.titleObj = builder.titleObject;\n- this.messageObj = builder.msgObject;\n- this.followDeviceOrientation = builder.jsonObject.getBoolean(Constants.KEY_LANDSCAPE);\n- this.positiveBtnText = builder.buttonArray.get(0).toString();\n- this.negativeBtnText = builder.buttonArray.get(1).toString();\n- }\n-\n- public static Builder builder() {\n- return new Builder();\n- }\n-\n- public static final class Builder {\n-\n- public Builder1 inAppType(String inAppType, Context context) throws JSONException {\n- return new Builder1(inAppType, context);\n- }\n-\n- public static final class Builder1 {\n-\n- JSONObject jsonObject = new JSONObject();\n- JSONObject titleObject = new JSONObject();\n- JSONObject msgObject = new JSONObject();\n- JSONObject media = new JSONObject();\n- JSONArray buttonArray = new JSONArray();\n- JSONObject positiveButtonObject = new JSONObject();\n- JSONObject negativeButtonObject = new JSONObject();\n-\n- String btnBorderRadius;\n-\n- private Builder1(String inAppType, Context context) throws JSONException {\n- this.jsonObject.put(Constants.KEY_TYPE, inAppType);\n- this.jsonObject.put(IS_LOCAL_INAPP,true);\n- this.jsonObject.put(Constants.KEY_HIDE_CLOSE,true);\n- this.jsonObject.put(Constants.KEY_IS_TABLET,\n- DeviceInfo.getDeviceType(context) == DeviceInfo.TABLET);\n-\n- }\n-\n- public Builder2 titleText(String titleText) throws JSONException {\n- this.titleObject.put(Constants.KEY_TEXT, titleText);\n- this.jsonObject.put(Constants.KEY_TITLE, titleObject);\n- return new Builder2(Builder1.this);\n- }\n- }\n-\n- public static final class Builder2 {\n- final Builder1 builder;\n-\n- private Builder2(Builder1 builder) {\n- this.builder = builder;\n- }\n-\n- public Builder3 messageText(String messageText) throws JSONException {\n- this.builder.msgObject.put(Constants.KEY_TEXT, messageText);\n- this.builder.jsonObject.put(Constants.KEY_MESSAGE, this.builder.msgObject);\n- return new Builder3(this.builder);\n- }\n- }\n-\n- public static final class Builder3 {\n- final Builder1 builder;\n-\n- private Builder3(Builder1 builder) {\n- this.builder = builder;\n- }\n-\n- public Builder4 followDeviceOrientation(boolean followDeviceOrientation) throws JSONException {\n- this.builder.jsonObject.put(Constants.KEY_PORTRAIT, true);\n- this.builder.jsonObject.put(Constants.KEY_LANDSCAPE, followDeviceOrientation);\n- return new Builder4(this.builder);\n- }\n- }\n-\n- public static final class Builder4 {\n- final Builder1 builder;\n-\n- private Builder4(Builder1 builder) {\n- this.builder = builder;\n- }\n-\n- public Builder5 positiveBtnText(String positiveBtnText) throws JSONException {\n- this.builder.positiveButtonObject.put(Constants.KEY_TEXT, positiveBtnText);\n- if (this.builder.btnBorderRadius == null || this.builder.btnBorderRadius.isEmpty()){\n- this.builder.positiveButtonObject.put(Constants.KEY_RADIUS, \"2\");\n- }\n- this.builder.buttonArray.put(0, this.builder.positiveButtonObject);\n- this.builder.jsonObject.put(Constants.KEY_BUTTONS, this.builder.buttonArray);\n- return new Builder5(this.builder);\n- }\n- }\n-\n- public static final class Builder5 {\n- final Builder1 builder;\n-\n- private Builder5(Builder1 builder) {\n- this.builder = builder;\n- }\n-\n- public Builder6 negativeBtnText(String negativeBtnText) throws JSONException {\n- this.builder.negativeButtonObject.put(Constants.KEY_TEXT, negativeBtnText);\n- if (this.builder.btnBorderRadius == null || this.builder.btnBorderRadius.isEmpty()){\n- this.builder.negativeButtonObject.put(Constants.KEY_RADIUS, \"2\");\n- }\n- this.builder.buttonArray.put(1, this.builder.negativeButtonObject);\n- this.builder.jsonObject.put(Constants.KEY_BUTTONS, this.builder.buttonArray);\n- return new Builder6(this.builder);\n- }\n- }\n-\n- public static final class Builder6 {\n- final Builder1 builder;\n-\n- private Builder6(Builder1 builder) {\n- this.builder = builder;\n- }\n-\n- public Builder6 fallbackToSettings(boolean fallbackToSettings) throws JSONException {\n- this.builder.jsonObject.put(FALLBACK_TO_NOTIFICATION_SETTINGS, fallbackToSettings);\n- return this;\n- }\n-\n- public Builder6 backgroundColor(String backgroundColor) throws JSONException {\n- this.builder.jsonObject.put(Constants.KEY_BG, backgroundColor);\n- return this;\n- }\n-\n- public Builder6 imageUrl(String imageUrl) throws JSONException {\n- this.builder.media.put(Constants.KEY_URL, imageUrl);\n- this.builder.media.put(Constants.KEY_CONTENT_TYPE, \"image\");\n- this.builder.jsonObject.put(Constants.KEY_MEDIA, this.builder.media);\n-\n- if (builder.jsonObject.getBoolean(Constants.KEY_LANDSCAPE)) {\n- this.builder.media.put(Constants.KEY_URL, imageUrl);\n- this.builder.media.put(Constants.KEY_CONTENT_TYPE, \"image\");\n- this.builder.jsonObject.put(Constants.KEY_MEDIA_LANDSCAPE, this.builder.media);\n- }\n- return this;\n- }\n-\n- public Builder6 titleTextColor(String titleTextColor) throws JSONException {\n- this.builder.titleObject.put(Constants.KEY_COLOR, titleTextColor);\n- this.builder.jsonObject.put(Constants.KEY_TITLE, this.builder.titleObject);\n- return this;\n- }\n-\n- public Builder6 messageTextColor(String messageTextColor) throws JSONException {\n- this.builder.msgObject.put(Constants.KEY_COLOR, messageTextColor);\n- this.builder.jsonObject.put(Constants.KEY_MESSAGE, this.builder.msgObject);\n- return this;\n- }\n-\n- public Builder6 btnTextColor(String btnTextColor) throws JSONException {\n- this.builder.jsonObject.put(Constants.KEY_BUTTONS,\n- getActionButtonJSONArray(Constants.KEY_COLOR, btnTextColor));\n- return this;\n- }\n-\n- public Builder6 btnBackgroundColor(String btnBackgroundColor) throws JSONException {\n- this.builder.jsonObject.put(Constants.KEY_BUTTONS,\n- getActionButtonJSONArray(Constants.KEY_BG, btnBackgroundColor));\n- return this;\n- }\n-\n- public Builder6 btnBorderColor(String btnBorderColor) throws JSONException {\n- this.builder.jsonObject.put(Constants.KEY_BUTTONS,\n- getActionButtonJSONArray(Constants.KEY_BORDER, btnBorderColor));\n- return this;\n- }\n-\n- public Builder6 btnBorderRadius(String btnBorderRadius) throws JSONException {\n- this.builder.btnBorderRadius = btnBorderRadius;\n- this.builder.jsonObject.put(Constants.KEY_BUTTONS,\n- getActionButtonJSONArray(Constants.KEY_RADIUS, btnBorderRadius));\n- return this;\n- }\n- public JSONObject build() {\n- return this.builder.jsonObject;\n- }\n-\n-\n- private JSONArray getActionButtonJSONArray(String key, String value) throws JSONException{\n- this.builder.positiveButtonObject.put(key, value);\n- this.builder.negativeButtonObject.put(key, value);\n-\n- this.builder.buttonArray.put(0, this.builder.positiveButtonObject);\n- this.builder.buttonArray.put(1, this.builder.negativeButtonObject);\n-\n- return this.builder.buttonArray;\n- }\n- }\n- }\n-\n- @Override\n- public boolean equals(Object o) {\n- if (this == o) return true;\n- if (o == null || getClass() != o.getClass()) return false;\n- CTLocalInAppBuilder that = (CTLocalInAppBuilder) o;\n- return followDeviceOrientation == that.followDeviceOrientation &&\n- Objects.equals(localInAppType, that.localInAppType) &&\n- Objects.equals(titleObj, that.titleObj) && Objects.equals(messageObj, that.messageObj)\n- && Objects.equals(positiveBtnText, that.positiveBtnText)\n- && Objects.equals(negativeBtnText, that.negativeBtnText);\n- }\n-\n- @Override\n- public int hashCode() {\n- return Objects.hash(localInAppType, titleObj, messageObj, followDeviceOrientation,\n- positiveBtnText, negativeBtnText);\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "package com.clevertap.android.sdk.inapp;\n+import static com.clevertap.android.sdk.InAppNotificationActivity.ANDROID_PERMISSION_STRING;\n+import static com.clevertap.android.sdk.inapp.CTLocalInApp.FALLBACK_TO_NOTIFICATION_SETTINGS;\nimport android.Manifest;\nimport android.app.Activity;\nimport android.content.Context;\n@@ -10,6 +12,7 @@ import android.os.Bundle;\nimport android.os.Looper;\nimport androidx.annotation.RequiresApi;\n+import androidx.core.app.ActivityCompat;\nimport androidx.core.content.ContextCompat;\nimport androidx.fragment.app.Fragment;\nimport androidx.fragment.app.FragmentActivity;\n@@ -117,6 +120,8 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\npublic final static String LOCAL_INAPP_COUNT = \"local_in_app_count\";\n+ public final static String IS_FIRST_TIME_PERMISSION_REQUEST = \"firstTimeRequest\";\n+\npublic InAppController(Context context,\nCleverTapInstanceConfig config,\nMainLooperHandler mainLooperHandler,\n@@ -177,13 +182,51 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\n}\n+ @RequiresApi(api = 33)\npublic void promptPushPrimer(JSONObject jsonObject){\n+ int permissionStatus = ContextCompat.checkSelfPermission(context,\n+ Manifest.permission.POST_NOTIFICATIONS);\n+\n+ if (permissionStatus == PackageManager.PERMISSION_DENIED){\n+ //Checks whether permission request is asked for the first time.\n+ boolean isFirstTimeRequest = StorageHelper.getBoolean(context,IS_FIRST_TIME_PERMISSION_REQUEST,true);\n+ if (!isFirstTimeRequest) {\n+ //If permission is already denied and FALLBACK_TO_NOTIFICATION_SETTINGS is false\n+ if (ActivityCompat.shouldShowRequestPermissionRationale(\n+ Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n+ ANDROID_PERMISSION_STRING) && !jsonObject.has(FALLBACK_TO_NOTIFICATION_SETTINGS)) {\n+ Logger.v(\"Notification permission is denied. Please grant notification permission access\" +\n+ \" in your app's settings to send notifications\");\n+ return;\n+ }\n+ }\nprepareNotificationForDisplay(jsonObject);\n+ }else{\n+ Logger.v(\"Notification permission is granted.\");\n+ }\n}\n+ @RequiresApi(api = 33)\npublic void promptPermission(){\n+ int permissionStatus = ContextCompat.checkSelfPermission(context,\n+ Manifest.permission.POST_NOTIFICATIONS);\n+\n+ if (permissionStatus == PackageManager.PERMISSION_DENIED) {\n+ boolean isFirstTimeRequest = StorageHelper.getBoolean(context,IS_FIRST_TIME_PERMISSION_REQUEST,true);\n+ if (!isFirstTimeRequest) {\n+ if (ActivityCompat.shouldShowRequestPermissionRationale(\n+ Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n+ ANDROID_PERMISSION_STRING)){\n+ Logger.v(\"Notification permission is denied. Please grant notification permission access\" +\n+ \" in your app's settings to send notifications\");\n+ return;\n+ }\n+ }\nstartPrompt(Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\nconfig);\n+ }else{\n+ Logger.v(\"Notification permission is granted.\");\n+ }\n}\npublic void startPrompt(Activity activity, CleverTapInstanceConfig config){\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ViewModelFactory.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ViewModelFactory.kt",
"diff": "package com.clevertap.demo\n-import androidx.fragment.app.FragmentActivity\nimport androidx.lifecycle.ViewModel\nimport androidx.lifecycle.ViewModelProvider\nimport com.clevertap.android.sdk.CleverTapAPI\n@@ -8,14 +7,13 @@ import com.clevertap.demo.ui.main.HomeScreenViewModel\nclass ViewModelFactory(\nprivate val cleverTapAPI: CleverTapAPI?,\n- private val activity: FragmentActivity?\n) : ViewModelProvider.NewInstanceFactory() {\noverride fun <T : ViewModel> create(modelClass: Class<T>) =\nwith(modelClass) {\nwhen {\nisAssignableFrom(HomeScreenViewModel::class.java) ->\n- HomeScreenViewModel(cleverTapAPI,activity)\n+ HomeScreenViewModel(cleverTapAPI)\nelse ->\nthrow IllegalArgumentException(\"Unknown ViewModel class: ${modelClass.name}\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenFragment.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenFragment.kt",
"diff": "@@ -40,7 +40,7 @@ private const val PERMISSIONS_REQUEST_CODE = 34\nclass HomeScreenFragment : Fragment() {\nprivate val viewModel by viewModels<HomeScreenViewModel> {\n- ViewModelFactory((activity as? HomeScreenActivity)?.cleverTapDefaultInstance, activity)\n+ ViewModelFactory((activity as? HomeScreenActivity)?.cleverTapDefaultInstance)\n}\ncompanion object {\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenViewModel.kt",
"diff": "package com.clevertap.demo.ui.main\n-import android.annotation.SuppressLint\nimport android.os.Looper\nimport android.util.Log\n-import androidx.fragment.app.FragmentActivity\nimport androidx.lifecycle.MutableLiveData\nimport androidx.lifecycle.ViewModel\nimport com.clevertap.android.sdk.CTInboxStyleConfig\nimport com.clevertap.android.sdk.CleverTapAPI\nimport com.clevertap.android.sdk.Constants\n-import com.clevertap.android.sdk.inapp.CTLocalInAppBuilder\n-import com.clevertap.android.sdk.inapp.CTLocalInAppBuilder.ALERT_INAPP\n-import com.clevertap.android.sdk.inapp.CTLocalInAppBuilder.HALF_INTERSTITIAL_INAPP\n+import com.clevertap.android.sdk.inapp.CTLocalInApp\nimport java.util.*\n-class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?, @SuppressLint(\"StaticFieldLeak\")\n-private val activity:FragmentActivity?) : ViewModel() {\n+class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel() {\nval clickCommand: MutableLiveData<String> by lazy {\nMutableLiveData<String>()\n@@ -346,96 +341,95 @@ private val activity:FragmentActivity?) : ViewModel() {\n\"918\"-> cleverTapAPI?.pushEvent(\"Send Input Box Reminder DOC false\")\n\"919\"-> cleverTapAPI?.pushEvent(\"Send Three CTA Notification\")\n\"100\"-> {\n- val builder = CTLocalInAppBuilder.builder()\n- .inAppType(HALF_INTERSTITIAL_INAPP,activity)\n- .titleText(\"Get Notified\")\n- .messageText(\"Please enable notifications on your device to use Push Notifications.\")\n+ val builder = CTLocalInApp.builder()\n+ .setInAppType(CTLocalInApp.InAppType.HALF_INTERSTITIAL)\n+ .setTitleText(\"Get Notified\")\n+ .setMessageText(\"Please enable notifications on your device to use Push Notifications.\")\n.followDeviceOrientation(true)\n- .positiveBtnText(\"Allow\")\n- .negativeBtnText(\"Cancel\")\n- .backgroundColor(Constants.WHITE)\n- .btnBorderColor(Constants.BLUE)\n- .titleTextColor(Constants.BLUE)\n- .messageTextColor(Constants.BLACK)\n- .btnTextColor(Constants.WHITE)\n- .btnBackgroundColor(Constants.BLUE)\n+ .setPositiveBtnText(\"Allow\")\n+ .setNegativeBtnText(\"Cancel\")\n+ .setBackgroundColor(Constants.WHITE)\n+ .setBtnBorderColor(Constants.BLUE)\n+ .setTitleTextColor(Constants.BLUE)\n+ .setMessageTextColor(Constants.BLACK)\n+ .setBtnTextColor(Constants.WHITE)\n+ .setBtnBackgroundColor(Constants.BLUE)\n.build()\ncleverTapAPI?.promptPushPrimer(builder)\n}\n\"101\"->{\n- val builder = CTLocalInAppBuilder.builder()\n- .inAppType(HALF_INTERSTITIAL_INAPP,activity)\n- .titleText(\"Get Notified\")\n- .messageText(\"Please enable notifications on your device to use Push Notifications.\")\n+ val builder = CTLocalInApp.builder()\n+ .setInAppType(CTLocalInApp.InAppType.HALF_INTERSTITIAL)\n+ .setTitleText(\"Get Notified\")\n+ .setMessageText(\"Please enable notifications on your device to use Push Notifications.\")\n.followDeviceOrientation(true)\n- .positiveBtnText(\"Allow\")\n- .negativeBtnText(\"Cancel\")\n- .backgroundColor(Constants.WHITE)\n- .btnBorderColor(Constants.BLUE)\n- .titleTextColor(Constants.BLUE)\n- .messageTextColor(Constants.BLACK)\n- .btnTextColor(Constants.WHITE)\n- .btnBackgroundColor(Constants.BLUE)\n- .imageUrl(\"https://icons.iconarchive.com/icons/treetog/junior/64/camera-icon.png\")\n+ .setPositiveBtnText(\"Allow\")\n+ .setNegativeBtnText(\"Cancel\")\n+ .setBackgroundColor(Constants.WHITE)\n+ .setBtnBorderColor(Constants.BLUE)\n+ .setTitleTextColor(Constants.BLUE)\n+ .setMessageTextColor(Constants.BLACK)\n+ .setBtnTextColor(Constants.WHITE)\n+ .setImageUrl(\"https://icons.iconarchive.com/icons/treetog/junior/64/camera-icon.png\")\n+ .setBtnBackgroundColor(Constants.BLUE)\n.build()\ncleverTapAPI?.promptPushPrimer(builder)\n}\n\"102\"->{\n- val builder = CTLocalInAppBuilder.builder()\n- .inAppType(HALF_INTERSTITIAL_INAPP,activity)\n- .titleText(\"Get Notified\")\n- .messageText(\"Please enable notifications on your device to use Push Notifications.\")\n+ val builder = CTLocalInApp.builder()\n+ .setInAppType(CTLocalInApp.InAppType.HALF_INTERSTITIAL)\n+ .setTitleText(\"Get Notified\")\n+ .setMessageText(\"Please enable notifications on your device to use Push Notifications.\")\n.followDeviceOrientation(true)\n- .positiveBtnText(\"Allow\")\n- .negativeBtnText(\"Cancel\")\n- .backgroundColor(Constants.WHITE)\n- .btnBorderColor(Constants.BLUE)\n- .titleTextColor(Constants.BLUE)\n- .messageTextColor(Constants.BLACK)\n- .btnTextColor(Constants.WHITE)\n- .btnBackgroundColor(Constants.BLUE)\n- .fallbackToSettings(true)\n+ .setPositiveBtnText(\"Allow\")\n+ .setNegativeBtnText(\"Cancel\")\n+ .setBackgroundColor(Constants.WHITE)\n+ .setBtnBorderColor(Constants.BLUE)\n+ .setTitleTextColor(Constants.BLUE)\n+ .setMessageTextColor(Constants.BLACK)\n+ .setBtnTextColor(Constants.WHITE)\n+ .setBtnBackgroundColor(Constants.BLUE)\n+ .setFallbackToSettings(true)\n.build()\ncleverTapAPI?.promptPushPrimer(builder)\n}\n\"103\"->{\n- val builder = CTLocalInAppBuilder.builder()\n- .inAppType(ALERT_INAPP,activity)\n- .titleText(\"Get Notified\")\n- .messageText(\"Enable Notification permission\")\n+ val builder = CTLocalInApp.builder()\n+ .setInAppType(CTLocalInApp.InAppType.ALERT)\n+ .setTitleText(\"Get Notified\")\n+ .setMessageText(\"Enable Notification permission\")\n.followDeviceOrientation(true)\n- .positiveBtnText(\"Allow\")\n- .negativeBtnText(\"Cancel\")\n+ .setPositiveBtnText(\"Allow\")\n+ .setNegativeBtnText(\"Cancel\")\n.build()\ncleverTapAPI?.promptPushPrimer(builder)\n}\n\"104\"->{\n- val builder = CTLocalInAppBuilder.builder()\n- .inAppType(ALERT_INAPP,activity)\n- .titleText(\"Get Notified\")\n- .messageText(\"Enable Notification permission\")\n+ val builder = CTLocalInApp.builder()\n+ .setInAppType(CTLocalInApp.InAppType.ALERT)\n+ .setTitleText(\"Get Notified\")\n+ .setMessageText(\"Enable Notification permission\")\n.followDeviceOrientation(false)\n- .positiveBtnText(\"Allow\")\n- .negativeBtnText(\"Cancel\")\n- .fallbackToSettings(true)\n+ .setPositiveBtnText(\"Allow\")\n+ .setNegativeBtnText(\"Cancel\")\n.build()\ncleverTapAPI?.promptPushPrimer(builder)\n}\n\"105\"->{\n- val builder = CTLocalInAppBuilder.builder()\n- .inAppType(ALERT_INAPP,activity)\n- .titleText(\"Get Notified\")\n- .messageText(\"Enable Notification permission\")\n- .followDeviceOrientation(false)\n- .positiveBtnText(\"Allow\")\n- .negativeBtnText(\"Cancel\")\n- .fallbackToSettings(true)\n+ val builder = CTLocalInApp.builder()\n+ .setInAppType(CTLocalInApp.InAppType.ALERT)\n+ .setTitleText(\"Get Notified\")\n+ .setMessageText(\"Enable Notification permission\")\n+ .followDeviceOrientation(true)\n+ .setPositiveBtnText(\"Allow\")\n+ .setNegativeBtnText(\"Cancel\")\n+ .setFallbackToSettings(true)\n.build()\ncleverTapAPI?.promptPushPrimer(builder)\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1970) - Add `fallbackToNotificationSettings` in CTLocalInApp.kt, refactor hard permission flow if permission is denied |
116,619 | 12.10.2022 17:09:37 | -19,080 | 2dc129e58ff5c78b8c9521e67eba74ac592e355d | [external] update v2 to v3 to remove node deprecation warning and support node16 | [
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/build_code_debug/action.yml",
"new_path": ".github/mini_flows/build_code_debug/action.yml",
"diff": "@@ -9,7 +9,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: assembleDebug-clevertap-core\npath: clevertap-core/build/outputs/aar\n@@ -23,7 +23,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: assembleDebug-clevertap-geofence\npath: clevertap-geofence/build/outputs/aar\n@@ -37,7 +37,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: assembleDebug-clevertap-hms\npath: clevertap-hms/build/outputs/aar\n@@ -51,7 +51,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: assembleDebug-clevertap-pushTemplates\npath: clevertap-pushtemplates/build/outputs/aar\n@@ -64,7 +64,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: assembleDebug-clevertap-xps\npath: clevertap-xps/build/outputs/aar\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/build_code_release/action.yml",
"new_path": ".github/mini_flows/build_code_release/action.yml",
"diff": "@@ -9,7 +9,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: assembleRelease-clevertap-core\npath: clevertap-core/build/outputs/aar\n@@ -23,7 +23,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: assembleRelease-clevertap-geofence\npath: clevertap-geofence/build/outputs/aar\n@@ -37,7 +37,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: assembleRelease-clevertap-hms\npath: clevertap-hms/build/outputs/aar\n@@ -51,7 +51,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: assembleRelease-clevertap-pushTemplates\npath: clevertap-pushtemplates/build/outputs/aar\n@@ -64,7 +64,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: assembleRelease-clevertap-xps\npath: clevertap-xps/build/outputs/aar\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/codechecks_checkstyle/action.yml",
"new_path": ".github/mini_flows/codechecks_checkstyle/action.yml",
"diff": "@@ -9,7 +9,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: checkstyle-clevertap-core\npath: clevertap-core/build/reports/checkstyle\n@@ -23,7 +23,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: checkstyle-clevertap-geofence\npath: clevertap-geofence/build/reports/checkstyle\n@@ -37,7 +37,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: checkstyle-clevertap-hms\npath: clevertap-hms/build/reports/checkstyle\n@@ -51,7 +51,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: checkstyle-clevertap-pushTemplates\npath: clevertap-pushtemplates/build/reports/checkstyle\n@@ -64,7 +64,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: checkstyle-clevertap-xps\npath: clevertap-xps/build/reports/checkstyle\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/codechecks_detekt/action.yml",
"new_path": ".github/mini_flows/codechecks_detekt/action.yml",
"diff": "@@ -9,7 +9,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: detekt-clevertap-core\npath: clevertap-core/build/reports/detekt\n@@ -23,7 +23,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: detekt-clevertap-geofence\npath: clevertap-geofence/build/reports/detekt\n@@ -37,7 +37,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: detekt-clevertap-hms\npath: clevertap-hms/build/reports/detekt\n@@ -51,7 +51,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: detekt-clevertap-pushTemplates\npath: clevertap-pushtemplates/build/reports/detekt\n@@ -64,7 +64,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: detekt-clevertap-xps\npath: clevertap-xps/build/reports/detekt\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/lint/action.yml",
"new_path": ".github/mini_flows/lint/action.yml",
"diff": "@@ -9,7 +9,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: lint-clevertap-core\npath: clevertap-core/build/reports/lint-results-debug.html\n@@ -23,7 +23,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: lint-clevertap-geofence\npath: clevertap-geofence/build/reports/lint-results-debug.html\n@@ -37,7 +37,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: lint-clevertap-hms\npath: clevertap-hms/build/reports/lint-results-debug.html\n@@ -51,7 +51,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: lint-clevertap-pushTemplates\npath: clevertap-pushtemplates/build/reports/lint-results-debug.html\n@@ -64,7 +64,7 @@ runs:\n- name: Upload AAR and apk files\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: lint-clevertap-xps\npath: clevertap-xps/build/reports/lint-results-debug.html\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/setup_jdk/action.yml",
"new_path": ".github/mini_flows/setup_jdk/action.yml",
"diff": "@@ -2,7 +2,7 @@ runs:\nusing: \"composite\"\nsteps:\n- name: Setup JDK 11\n- uses: actions/setup-java@v2\n+ uses: actions/setup-java@v3\nwith:\njava-version: '11'\ndistribution: 'temurin'\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/test_and_coverage_debug/action.yml",
"new_path": ".github/mini_flows/test_and_coverage_debug/action.yml",
"diff": "@@ -9,14 +9,14 @@ runs:\n- name: Upload1\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: TestReportDebug-clevertap-core\npath: clevertap-core/build/reports/tests\n- name: Upload2\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: JacocoReportDebug-clevertap-core\npath: clevertap-core/build/reports/jacoco\n@@ -30,14 +30,14 @@ runs:\n- name: Upload1\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: TestReportDebug-clevertap-geofence\npath: clevertap-geofence/build/reports/tests\n- name: Upload2\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: JacocoReportDebug-clevertap-geofence\npath: clevertap-geofence/build/reports/jacoco\n@@ -51,14 +51,14 @@ runs:\n- name: Upload1\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: TestReportDebug-clevertap-hms\npath: clevertap-hms/build/reports/tests\n- name: Upload2\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: JacocoReportDebug-clevertap-hms\npath: clevertap-hms/build/reports/jacoco\n@@ -72,14 +72,14 @@ runs:\n- name: Upload1\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: TestReportDebug-clevertap-xps\npath: clevertap-xps/build/reports/tests\n- name: Upload2\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: JacocoReportDebug-clevertap-xps\npath: clevertap-xps/build/reports/jacoco\n@@ -94,14 +94,14 @@ runs:\n- name: Upload1\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: TestReportDebug-clevertap-pushtemplates\npath: clevertap-pushtemplates/build/reports/tests\n- name: Upload2\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: JacocoReportDebug-clevertap-pushtemplates\npath: clevertap-pushtemplates/build/reports/jacoco\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/test_and_coverage_release/action.yml",
"new_path": ".github/mini_flows/test_and_coverage_release/action.yml",
"diff": "@@ -8,14 +8,14 @@ runs:\n- name: Upload1\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: TestReportRelease-clevertap-core\npath: clevertap-core/build/reports/tests\n- name: Upload2\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: JacocoReportRelease-clevertap-core\npath: clevertap-core/build/reports/jacoco\n@@ -29,14 +29,14 @@ runs:\n- name: Upload1\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: TestReportRelease-clevertap-geofence\npath: clevertap-geofence/build/reports/tests\n- name: Upload2\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: JacocoReportRelease-clevertap-geofence\npath: clevertap-geofence/build/reports/jacoco\n@@ -50,14 +50,14 @@ runs:\n- name: Upload1\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: TestReportRelease-clevertap-hms\npath: clevertap-hms/build/reports/tests\n- name: Upload2\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: JacocoReportRelease-clevertap-hms\npath: clevertap-hms/build/reports/jacoco\n@@ -71,14 +71,14 @@ runs:\n- name: Upload1\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: TestReportRelease-clevertap-xps\npath: clevertap-xps/build/reports/tests\n- name: Upload2\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: JacocoReportRelease-clevertap-xps\npath: clevertap-xps/build/reports/jacoco\n@@ -93,14 +93,14 @@ runs:\n- name: Upload1\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: TestReportRelease-clevertap-pushtemplates\npath: clevertap-pushtemplates/build/reports/tests\n- name: Upload2\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: JacocoReportRelease-clevertap-pushtemplates\npath: clevertap-pushtemplates/build/reports/jacoco\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/test_debug/action.yml",
"new_path": ".github/mini_flows/test_debug/action.yml",
"diff": "@@ -12,7 +12,7 @@ runs:\n- name: Upload Unit tests\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: unit-tests-results\npath: |\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/mini_flows/test_release/action.yml",
"new_path": ".github/mini_flows/test_release/action.yml",
"diff": "@@ -12,7 +12,7 @@ runs:\n- name: Upload Unit tests\nif: always()\n- uses: actions/upload-artifact@v2\n+ uses: actions/upload-artifact@v3\nwith:\nname: unit-tests-results\npath: |\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/workflows/manually_validate.yml",
"new_path": ".github/workflows/manually_validate.yml",
"diff": "@@ -72,7 +72,7 @@ jobs:\nsteps:\n- name: Checkout the code from Repo\n- uses: actions/checkout@v2\n+ uses: actions/checkout@v3\n- name: Mandatory File Changes\nif: ${{ github.event.inputs.check_mandatory }}\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/workflows/on_pr_from_develop_to_master.yml",
"new_path": ".github/workflows/on_pr_from_develop_to_master.yml",
"diff": "@@ -13,7 +13,7 @@ jobs:\nsteps:\n- name: Checkout the code from Repo\n- uses: actions/checkout@v2\n+ uses: actions/checkout@v3\n- name: Setup JDK 11.\nuses: ./.github/mini_flows/setup_jdk\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/workflows/on_pr_from_task_to_develop.yml",
"new_path": ".github/workflows/on_pr_from_task_to_develop.yml",
"diff": "@@ -13,7 +13,7 @@ jobs:\nsteps:\n- name: Checkout the code from Repo\n- uses: actions/checkout@v2\n+ uses: actions/checkout@v3\n- name: Setup JDK 11.\nuses: ./.github/mini_flows/setup_jdk\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/workflows/on_pr_merged_in_master.yml",
"new_path": ".github/workflows/on_pr_merged_in_master.yml",
"diff": "@@ -16,7 +16,7 @@ jobs:\nsteps:\n- name: Checkout the code from Repo\n- uses: actions/checkout@v2\n+ uses: actions/checkout@v3\n- name: Setup JDK 11.\nuses: ./.github/mini_flows/setup_jdk\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | [external] update v2 to v3 to remove node deprecation warning and support node16 |
116,612 | 12.10.2022 17:13:59 | -19,080 | aef990a59d79c0b86930a2aa961c946465d982e0 | task(SDK-1970) : Convert AlertDialogPromptForSettings to kotlin | prefix string resource keys with ct | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTStringResources.kt",
"diff": "+package com.clevertap.android.sdk\n+\n+import android.app.Activity\n+\n+class CTStringResources(private val context: Activity, vararg sRID: Int) {\n+\n+ private var sArray: Array<String>\n+\n+ init {\n+ sArray = Array(sRID.size) { context.getString(sRID[it]) }\n+ }\n+\n+ operator fun component1(): String? = sArray.getOrNull(0)\n+ operator fun component2(): String? = sArray.getOrNull(1)\n+ operator fun component3(): String? = sArray.getOrNull(2)\n+ operator fun component4(): String? = sArray.getOrNull(3)\n+ operator fun component5(): String? = sArray.getOrNull(4)\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -3,7 +3,6 @@ package com.clevertap.android.sdk;\nimport static com.clevertap.android.sdk.Utils.isAndroid13;\nimport android.Manifest;\n-import android.app.Activity;\nimport android.app.AlertDialog;\nimport android.content.Context;\nimport android.content.DialogInterface;\n@@ -13,13 +12,11 @@ import android.content.res.Configuration;\nimport android.net.Uri;\nimport android.os.Bundle;\nimport android.view.WindowManager;\n-\nimport androidx.annotation.NonNull;\nimport androidx.annotation.RequiresApi;\nimport androidx.core.app.ActivityCompat;\nimport androidx.core.content.ContextCompat;\nimport androidx.fragment.app.FragmentActivity;\n-\nimport com.clevertap.android.sdk.inapp.AlertDialogPromptForSettings;\nimport com.clevertap.android.sdk.inapp.CTInAppBaseFullFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppHtmlCoverFragment;\n@@ -34,9 +31,9 @@ import com.clevertap.android.sdk.inapp.CTInAppNativeInterstitialImageFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppNotification;\nimport com.clevertap.android.sdk.inapp.CTInAppType;\nimport com.clevertap.android.sdk.inapp.InAppListener;\n-\nimport java.lang.ref.WeakReference;\nimport java.util.HashMap;\n+import kotlin.Unit;\npublic final class InAppNotificationActivity extends FragmentActivity implements InAppListener {\n@@ -55,7 +52,9 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nprivate static final String ANDROID_PERMISSION_STRING = \"android.permission.POST_NOTIFICATIONS\";\npublic interface PermissionCallback {\n+\nvoid onAccept();\n+\nvoid onReject();\n}\n@@ -207,7 +206,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\n@Override\n- public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {\n+ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,\n+ @NonNull int[] grantResults) {\nsuper.onRequestPermissionsResult(requestCode, permissions, grantResults);\nif (requestCode == PERMISSION_REQUEST_CODE) {\nboolean granted = grantResults.length > 0 && grantResults[0] ==\n@@ -222,17 +222,13 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\npublic void showFallbackAlertDialog() {\n- AlertDialogPromptForSettings.INSTANCE.show(this, new AlertDialogPromptForSettings.Callback() {\n- @Override\n- public void onAccept() {\n+ AlertDialogPromptForSettings.show(this, () -> {\nUtils.navigateToAndroidSettingsForNotifications(InAppNotificationActivity.this);\ndidDismiss(null);\n- }\n-\n- @Override\n- public void onDecline() {\n+ return Unit.INSTANCE;\n+ }, () -> {\ndidDismiss(null);\n- }\n+ return Unit.INSTANCE;\n});\n}\n@@ -454,7 +450,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nisAlertVisible = true;\ndidShow(null);\n} else {\n- config.getLogger().debug(\"InAppNotificationActivity: Alert Dialog is null, not showing Alert InApp\");\n+ config.getLogger()\n+ .debug(\"InAppNotificationActivity: Alert Dialog is null, not showing Alert InApp\");\n}\nbreak;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/AlertDialogPromptForSettings.kt",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/AlertDialogPromptForSettings.kt",
"diff": "@@ -2,43 +2,39 @@ package com.clevertap.android.sdk.inapp\nimport android.app.Activity\nimport android.app.AlertDialog\n+import android.os.Build.VERSION.SDK_INT\n+import android.os.Build.VERSION_CODES.LOLLIPOP\n+import com.clevertap.android.sdk.CTStringResources\nimport com.clevertap.android.sdk.R\n-object AlertDialogPromptForSettings {\n+class AlertDialogPromptForSettings private constructor() {\n- interface Callback {\n- fun onAccept()\n- fun onDecline()\n- }\n+ companion object {\n+ @JvmStatic\nfun show(\n- activity: Activity,\n- callback: Callback,\n+ activity: Activity, onAccept: () -> Unit, onDecline: () -> Unit\n) {\n- val title = activity.getString(R.string.permission_not_available_title)\n+ val (title, message, positiveButtonText, negativeButtonText) = CTStringResources(\n+ activity,\n+ R.string.ct_permission_not_available_title,\n+ R.string.ct_permission_not_available_message,\n+ R.string.ct_permission_not_available_open_settings_option,\n+ R.string.ct_txt_cancel\n+ )\n- val message = activity.getString(R.string.permission_not_available_message)\n+ val builder = if (SDK_INT >= LOLLIPOP) AlertDialog.Builder(\n+ activity,\n+ android.R.style.Theme_Material_Light_Dialog_Alert\n+ ) else AlertDialog.Builder(activity)\n- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {\n- AlertDialog.Builder(activity, android.R.style.Theme_Material_Light_Dialog_Alert)\n- .setTitle(title)\n- .setMessage(message)\n- .setPositiveButton(R.string.permission_not_available_open_settings_option) { dialog, which ->\n- callback.onAccept()\n- }\n- .setNegativeButton(android.R.string.no) { dialog, which ->\n- callback.onDecline()\n- }\n- .show()\n- }else{\n- AlertDialog.Builder(activity)\n- .setTitle(title)\n+ builder.setTitle(title)\n.setMessage(message)\n- .setPositiveButton(R.string.permission_not_available_open_settings_option) { dialog, which ->\n- callback.onAccept()\n+ .setPositiveButton(positiveButtonText) { dialog, which ->\n+ onAccept()\n}\n- .setNegativeButton(android.R.string.no) { dialog, which ->\n- callback.onDecline()\n+ .setNegativeButton(negativeButtonText) { dialog, which ->\n+ onDecline()\n}\n.show()\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/res/values/strings.xml",
"new_path": "clevertap-core/src/main/res/values/strings.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<resources>\n- <string name=\"permission_not_available_title\">Permission Not Available</string>\n- <string name=\"permission_not_available_message\">You have previously denied notification permission. Please go to settings to enable notifications.</string>\n- <string name=\"permission_not_available_open_settings_option\">Settings</string>\n+ <string name=\"ct_permission_not_available_title\">Permission Not Available</string>\n+ <string name=\"ct_permission_not_available_message\">You have previously denied notification permission. Please go to settings to enable notifications.</string>\n+ <string name=\"ct_permission_not_available_open_settings_option\">Settings</string>\n+ <string name=\"ct_txt_cancel\">Cancel</string>\n<string name=\"notification_permission_name_for_title\">Notifications</string>\n<string name=\"notification_permission_settings_message\">Notifications</string>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "sample/src/main/java/com/clevertap/demo/JavaToKtInterOp.java",
"diff": "+package com.clevertap.demo;\n+\n+import android.content.Context;\n+import com.clevertap.android.sdk.inapp.CTLocalInApp;\n+import com.clevertap.android.sdk.inapp.CTLocalInApp.InAppType;\n+import org.json.JSONObject;\n+\n+/**\n+ * Class to test java=>Kotlin inter-op\n+ */\n+public class JavaToKtInterOp {\n+\n+ public JSONObject test(Context context) {\n+\n+ //AlertDialogPromptForSettings.show(context,AlertDialogPromptForSettings.);\n+ return CTLocalInApp.builder(context)\n+ .setInAppType(InAppType.HALF_INTERSTITIAL)\n+ .setTitleText(\"TitleText\").setMessageText(\"mtext\").followDeviceOrientation(true)\n+ .setPositiveBtnText(\"PosbtnText\").setNegativeBtnText(\"NEgBtnTxt\").setBtnTextColor(\"btntxtclr\")\n+ .setBtnBorderColor(\"btnbordercolor\").setBtnBorderRadius(\"BtnBorderRadius\")\n+ .setBtnBackgroundColor(\"BtnBgColor\")\n+ .setBackgroundColor(\"bgColor\").setImageUrl(\"imgUrl\").setMessageTextColor(\"MsgTxtColor\")\n+ .setTitleTextColor(\"TitleTxtColor\")\n+ .build();\n+ }\n+}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1970) : Convert AlertDialogPromptForSettings to kotlin | prefix string resource keys with ct |
116,616 | 13.10.2022 02:50:44 | -19,080 | 702e74867a56720a281ba7cb675a8e3fa089957f | task(SDK-2170) - Add request for hard per mission flow from CTInAppNotificationButton | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Constants.java",
"diff": "@@ -172,6 +172,7 @@ public interface Constants {\nString KEY_TDC = \"tdc\";\nString KEY_KV = \"kv\";\nString KEY_TYPE = \"type\";\n+ String KEY_FALLBACK_NOTIFICATION_SETTINGS = \"fbSettings\";\nString KEY_IS_TABLET = \"tablet\";\nString KEY_BG = \"bg\";\nString KEY_TITLE = \"title\";\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "@@ -30,6 +30,7 @@ import com.clevertap.android.sdk.inapp.CTInAppNativeHalfInterstitialImageFragmen\nimport com.clevertap.android.sdk.inapp.CTInAppNativeInterstitialFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppNativeInterstitialImageFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppNotification;\n+import com.clevertap.android.sdk.inapp.CTInAppNotificationButton;\nimport com.clevertap.android.sdk.inapp.CTInAppType;\nimport com.clevertap.android.sdk.inapp.InAppListener;\nimport java.lang.ref.WeakReference;\n@@ -52,6 +53,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\npublic static final String ANDROID_PERMISSION_STRING = \"android.permission.POST_NOTIFICATIONS\";\n+ private boolean isFbSettings;\n+\npublic interface PermissionCallback {\nvoid onAccept();\n@@ -184,30 +187,48 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\n}\n+ public void promptPermission(CTInAppNotificationButton ctInAppNotificationButton){\n+ if (isAndroid13(InAppNotificationActivity.this)) {\n+ isFbSettings = ctInAppNotificationButton.isFallbackToSettings();\n+ requestPermission();\n+ }\n+ }\n+\n@RequiresApi(api = 33)\npublic void requestPermission() {\nint permissionStatus = ContextCompat.checkSelfPermission(InAppNotificationActivity.this,\nManifest.permission.POST_NOTIFICATIONS);\nif (permissionStatus == PackageManager.PERMISSION_DENIED){\n- if (!StorageHelper.getBoolean(InAppNotificationActivity.this,\n- IS_FIRST_TIME_PERMISSION_REQUEST,true)) {\n+ boolean isFirstTimeRequest = StorageHelper.getBoolean(InAppNotificationActivity.this,\n+ IS_FIRST_TIME_PERMISSION_REQUEST,true);\n+ if (!isFirstTimeRequest) {\nboolean neverAskAgainClicked = ActivityCompat.shouldShowRequestPermissionRationale(\nInAppNotificationActivity.this, ANDROID_PERMISSION_STRING);\n- if (neverAskAgainClicked && inAppNotification.fallBackToNotificationSettings()) {\n+ if (neverAskAgainClicked && inAppNotification.fallBackToNotificationSettings()\n+ || isFbSettings) {\nshowFallbackAlertDialog();\n+ return;\n}\n- }else{\n+\n+ permissionCallbackWeakReference.get().onReject();\n+ didDismiss(null);\n+ return;\n+ }\n+\nActivityCompat.requestPermissions(InAppNotificationActivity.this,\nnew String[]{ANDROID_PERMISSION_STRING}, PERMISSION_REQUEST_CODE);\n- }\n+ }else{\n+ permissionCallbackWeakReference.get().onAccept();\n+ didDismiss(null);\n}\n}\n@Override\npublic void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {\nsuper.onRequestPermissionsResult(requestCode, permissions, grantResults);\n- StorageHelper.putBoolean(InAppNotificationActivity.this,IS_FIRST_TIME_PERMISSION_REQUEST,false);\n+ StorageHelper.putBoolean(InAppNotificationActivity.this,IS_FIRST_TIME_PERMISSION_REQUEST,\n+ false);\nif (requestCode == PERMISSION_REQUEST_CODE) {\nboolean granted = grantResults.length > 0 && grantResults[0] ==\nPackageManager.PERMISSION_GRANTED;\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFragment.java",
"diff": "@@ -143,8 +143,14 @@ public abstract class CTInAppBaseFragment extends Fragment {\nif (index == 0 && inAppNotification.isLocalInApp()) {\n((InAppNotificationActivity) context).prompt();\n+ return;\n}else if (index == 1 && inAppNotification.isLocalInApp()){\ndidDismiss(data);\n+ return;\n+ }\n+\n+ if (button.getType().equalsIgnoreCase(\"rfp\")){\n+ ((InAppNotificationActivity) context).promptPermission(button);\n}else {\nString actionUrl = button.getActionUrl();\nif (actionUrl != null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationButton.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationButton.java",
"diff": "@@ -46,6 +46,9 @@ public class CTInAppNotificationButton implements Parcelable {\nprivate String textColor;\n+ private String type;\n+ private boolean fallbackToSettings;\n+\nCTInAppNotificationButton() {\n}\n@@ -57,7 +60,8 @@ public class CTInAppNotificationButton implements Parcelable {\nactionUrl = in.readString();\nborderColor = in.readString();\nborderRadius = in.readString();\n-\n+ type = in.readString();\n+ fallbackToSettings = in.readByte() != 0x00;\ntry {\njsonDescription = in.readByte() == 0x00 ? null : new JSONObject(in.readString());\n} catch (JSONException e) {\n@@ -84,7 +88,8 @@ public class CTInAppNotificationButton implements Parcelable {\ndest.writeString(actionUrl);\ndest.writeString(borderColor);\ndest.writeString(borderRadius);\n-\n+ dest.writeString(type);\n+ dest.writeByte((byte) (fallbackToSettings ? 0x01 : 0x00));\nif (jsonDescription == null) {\ndest.writeByte((byte) (0x00));\n} else {\n@@ -160,6 +165,14 @@ public class CTInAppNotificationButton implements Parcelable {\nreturn textColor;\n}\n+ public String getType() {\n+ return type;\n+ }\n+\n+ public boolean isFallbackToSettings() {\n+ return fallbackToSettings;\n+ }\n+\n@SuppressWarnings({\"unused\"})\nvoid setTextColor(String textColor) {\nthis.textColor = textColor;\n@@ -181,10 +194,19 @@ public class CTInAppNotificationButton implements Parcelable {\nJSONObject actions = jsonObject.has(Constants.KEY_ACTIONS) ? jsonObject\n.getJSONObject(Constants.KEY_ACTIONS) : null;\nif (actions != null) {\n+\n+ //TODO REMOVE THIS AFTER TESTING AND BACKEND CHANGE IS INCLUDED\n+ actions.put(Constants.KEY_TYPE,\"rfp\");\n+ actions.put(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS,false);\n+ ////\n+\nString action = actions.has(Constants.KEY_ANDROID) ? actions.getString(Constants.KEY_ANDROID) : \"\";\nif (!action.isEmpty()) {\nthis.actionUrl = action;\n}\n+\n+ type = actions.getString(Constants.KEY_TYPE);\n+ fallbackToSettings = actions.getBoolean(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS);\n}\n//Custom Key Value pairs\n@@ -208,7 +230,6 @@ public class CTInAppNotificationButton implements Parcelable {\n}\n}\n- //check if action is request for permission(rfp) and innit variable here.\n} catch (JSONException e) {\nthis.error = \"Invalid JSON\";\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/AndroidManifest.xml",
"new_path": "sample/src/main/AndroidManifest.xml",
"diff": "<!-- Add meta data for CleverTap Account Id and Account Token -->\n<meta-data\nandroid:name=\"CLEVERTAP_ACCOUNT_ID\"\n- android:value=\"TEST-449-68K-8Z6Z\" />\n+ android:value=\"YOUR ACCT ID\" />\n<meta-data\nandroid:name=\"CLEVERTAP_TOKEN\"\n- android:value=\"TEST-3b6-c44\" />\n+ android:value=\"YOUR ACCT TOKEN\" />\n+ <meta-data\n+ android:name=\"CLEVERTAP_REGION\"\n+ android:value=\"eu1\"/>\n<!-- Xiaomi Push -->\n<meta-data\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/JavaToKtInterOp.java",
"new_path": "sample/src/main/java/com/clevertap/demo/JavaToKtInterOp.java",
"diff": "package com.clevertap.demo;\n-import android.content.Context;\nimport com.clevertap.android.sdk.inapp.CTLocalInApp;\nimport com.clevertap.android.sdk.inapp.CTLocalInApp.InAppType;\nimport org.json.JSONObject;\n@@ -10,10 +9,10 @@ import org.json.JSONObject;\n*/\npublic class JavaToKtInterOp {\n- public JSONObject test(Context context) {\n+ public JSONObject test() {\n//AlertDialogPromptForSettings.show(context,AlertDialogPromptForSettings.);\n- return CTLocalInApp.builder(context)\n+ return CTLocalInApp.builder()\n.setInAppType(InAppType.HALF_INTERSTITIAL)\n.setTitleText(\"TitleText\").setMessageText(\"mtext\").followDeviceOrientation(true)\n.setPositiveBtnText(\"PosbtnText\").setNegativeBtnText(\"NEgBtnTxt\").setBtnTextColor(\"btntxtclr\")\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-2170) - Add request for hard per mission flow from CTInAppNotificationButton |
116,612 | 13.10.2022 14:39:42 | -19,080 | e6bac44e4226be20c4bad9ab1fb49c5c694f6aae | task(SDK-1970) : Convert isAndroid13 util method to kotlin and add suppress lint for Android 13 | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTXtensions.kt",
"diff": "+@file:JvmName(\"CTXtensions\")\n+\n+package com.clevertap.android.sdk\n+\n+import android.content.Context\n+import android.os.Build.VERSION\n+\n+fun Context.isPackageAndOsTargetsAbove(apiLevel: Int) =\n+ VERSION.SDK_INT > apiLevel && targetSdkVersion > apiLevel\n+\n+val Context.targetSdkVersion\n+ get() = applicationContext.applicationInfo.targetSdkVersion\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapAPI.java",
"diff": "package com.clevertap.android.sdk;\nimport static android.content.Context.NOTIFICATION_SERVICE;\n+import static com.clevertap.android.sdk.CTXtensions.isPackageAndOsTargetsAbove;\nimport static com.clevertap.android.sdk.Utils.getSCDomain;\n-import static com.clevertap.android.sdk.Utils.isAndroid13;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.FCM_LOG_TAG;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.LOG_TAG;\nimport static com.clevertap.android.sdk.pushnotification.PushConstants.PushType.FCM;\n+import android.annotation.SuppressLint;\nimport android.app.Activity;\nimport android.app.NotificationChannel;\nimport android.app.NotificationChannelGroup;\n@@ -21,7 +22,6 @@ import android.net.Uri;\nimport android.os.Build;\nimport android.os.Bundle;\nimport android.text.TextUtils;\n-\nimport androidx.annotation.NonNull;\nimport androidx.annotation.Nullable;\nimport androidx.annotation.RequiresApi;\n@@ -36,10 +36,10 @@ import com.clevertap.android.sdk.featureFlags.CTFeatureFlagsController;\nimport com.clevertap.android.sdk.inbox.CTInboxActivity;\nimport com.clevertap.android.sdk.inbox.CTInboxMessage;\nimport com.clevertap.android.sdk.inbox.CTMessageDAO;\n-import com.clevertap.android.sdk.interfaces.SCDomainListener;\nimport com.clevertap.android.sdk.interfaces.NotificationHandler;\nimport com.clevertap.android.sdk.interfaces.NotificationRenderedListener;\nimport com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener;\n+import com.clevertap.android.sdk.interfaces.SCDomainListener;\nimport com.clevertap.android.sdk.network.NetworkManager;\nimport com.clevertap.android.sdk.product_config.CTProductConfigController;\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener;\n@@ -1033,24 +1033,27 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n+ @SuppressLint(\"NewApi\")\npublic boolean isPushPermissionGranted(){\n- if (isAndroid13(context)) {\n+ if (isPackageAndOsTargetsAbove(context, 32)) {\nreturn coreState.getInAppController().isPushPermissionGranted();\n} else {\nreturn false;\n}\n}\n+ @SuppressLint(\"NewApi\")\npublic void promptPushPrimer(JSONObject jsonObject) {\n- if (isAndroid13(context)) {\n+ if (isPackageAndOsTargetsAbove(context, 32)) {\ncoreState.getInAppController().promptPushPrimer(jsonObject);\n} else {\nLogger.v(\"Ensure your app supports Android 13 to verify permission access for notifications.\");\n}\n}\n+ @SuppressLint(\"NewApi\")\npublic void promptForPushPermission(){\n- if (isAndroid13(context)){\n+ if (isPackageAndOsTargetsAbove(context, 32)) {\ncoreState.getInAppController().promptPermission();\n} else {\nLogger.v(\"Ensure your app supports Android 13 to verify permission access for notifications.\");\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "package com.clevertap.android.sdk;\n-import static com.clevertap.android.sdk.Utils.isAndroid13;\n+import static com.clevertap.android.sdk.CTXtensions.isPackageAndOsTargetsAbove;\nimport static com.clevertap.android.sdk.inapp.InAppController.IS_FIRST_TIME_PERMISSION_REQUEST;\nimport android.Manifest;\n+import android.annotation.SuppressLint;\nimport android.app.AlertDialog;\nimport android.content.Context;\nimport android.content.DialogInterface;\n@@ -181,14 +182,16 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\n}\n+ @SuppressLint(\"NewApi\")\npublic void prompt() {\n- if (isAndroid13(InAppNotificationActivity.this)) {\n+ if (isPackageAndOsTargetsAbove(this, 32)) {\nrequestPermission();\n}\n}\n+ @SuppressLint(\"NewApi\")\npublic void promptPermission(CTInAppNotificationButton ctInAppNotificationButton){\n- if (isAndroid13(InAppNotificationActivity.this)) {\n+ if (isPackageAndOsTargetsAbove(this, 32)) {\nisFbSettings = ctInAppNotificationButton.isFallbackToSettings();\nrequestPermission();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/Utils.java",
"diff": "@@ -5,11 +5,8 @@ import static com.clevertap.android.sdk.Constants.AUTH;\nimport android.Manifest;\nimport android.annotation.SuppressLint;\nimport android.app.Activity;\n-import android.app.ActivityManager;\n-import android.app.ActivityManager.RunningAppProcessInfo;\nimport android.content.Context;\nimport android.content.Intent;\n-import android.content.pm.ApplicationInfo;\nimport android.content.pm.PackageInfo;\nimport android.content.pm.PackageManager;\nimport android.content.pm.ResolveInfo;\n@@ -26,8 +23,6 @@ import android.os.Build;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.os.Looper;\n-import android.os.Process;\n-import android.os.SystemClock;\nimport android.provider.Settings;\nimport android.telephony.TelephonyManager;\nimport android.text.TextUtils;\n@@ -36,7 +31,6 @@ import androidx.annotation.RestrictTo;\nimport androidx.core.content.ContextCompat;\nimport com.clevertap.android.sdk.task.CTExecutorFactory;\nimport com.clevertap.android.sdk.task.Task;\n-import com.google.android.gms.common.util.PlatformVersion;\nimport com.google.firebase.messaging.RemoteMessage;\nimport java.io.ByteArrayInputStream;\nimport java.io.ByteArrayOutputStream;\n@@ -666,10 +660,6 @@ public final class Utils {\n}\n- public static boolean isAndroid13(Context context){\n- return Build.VERSION.SDK_INT > 32 && getTargetSdkVersion(context) > 32;\n- }\n-\npublic static void navigateToAndroidSettingsForNotifications(Context context){\nIntent intent = new Intent();\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {\n@@ -688,19 +678,6 @@ public final class Utils {\ncontext.startActivity(intent);\n}\n- public static int getTargetSdkVersion(Context context) {\n- String packageName = context.getPackageName();\n- PackageManager packageManager = context.getPackageManager();\n- try {\n- ApplicationInfo applicationInfo = packageManager.getApplicationInfo(packageName, 0);\n- return applicationInfo.targetSdkVersion;\n- } catch (PackageManager.NameNotFoundException e) {\n- e.printStackTrace();\n- }\n-\n- return Build.VERSION_CODES.JELLY_BEAN;\n- }\n-\nstatic {\nhaveVideoPlayerSupport = checkForExoPlayer();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenFragment.kt",
"new_path": "sample/src/main/java/com/clevertap/demo/ui/main/HomeScreenFragment.kt",
"diff": "@@ -57,9 +57,7 @@ class HomeScreenFragment : Fragment() {\nlistItemBinding = HomeScreenFragmentBinding.inflate(layoutInflater, container, false).apply {\nviewmodel = viewModel\n}\n- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {\nlistItemBinding.expandableListView.isNestedScrollingEnabled = true\n- }\nreturn listItemBinding.root\n}\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1970) : Convert isAndroid13 util method to kotlin and add suppress lint for Android 13 |
116,612 | 17.10.2022 12:59:18 | -19,080 | f3cf53e57228b61b9cb5ac68a7a6857918b2af9b | task(SDK-1970) : Add unit test for CTXtensions.kt | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CTXtensionsTest.kt",
"diff": "+package com.clevertap.android.sdk\n+\n+import android.os.Build.VERSION\n+import com.clevertap.android.shared.test.BaseTestCase\n+import org.junit.*\n+import org.junit.runner.*\n+import org.robolectric.RobolectricTestRunner\n+import org.robolectric.util.ReflectionHelpers\n+import kotlin.test.assertFalse\n+import kotlin.test.assertTrue\n+\n+@RunWith(RobolectricTestRunner::class)\n+class CTXtensionsTest : BaseTestCase() {\n+\n+ @Test\n+ fun test_when_sdkInt_and_targetSdkVersion_is_33_and_input_is_32_should_return_true() {\n+ ReflectionHelpers.setStaticField(VERSION::class.java, \"SDK_INT\", 33)\n+\n+ application.applicationContext.applicationInfo.targetSdkVersion = 33\n+\n+ assertTrue { application.isPackageAndOsTargetsAbove(32) }\n+ }\n+\n+ @Test\n+ fun test_when_sdkInt_is_33_and_targetSdkVersion_is_32_and_input_is_32_should_return_false() {\n+ ReflectionHelpers.setStaticField(VERSION::class.java, \"SDK_INT\", 33)\n+\n+ application.applicationContext.applicationInfo.targetSdkVersion = 32\n+\n+ assertFalse { application.isPackageAndOsTargetsAbove(32) }\n+ }\n+\n+ @Test\n+ fun test_when_sdkInt_is_32_and_targetSdkVersion_is_33_and_input_is_32_should_return_false() {\n+ ReflectionHelpers.setStaticField(VERSION::class.java, \"SDK_INT\", 32)\n+\n+ application.applicationContext.applicationInfo.targetSdkVersion = 33\n+\n+ assertFalse { application.isPackageAndOsTargetsAbove(32) }\n+ }\n+\n+ @Test\n+ fun test_when_sdkInt_is_30_and_targetSdkVersion_is_30_and_input_is_32_should_return_false() {\n+ ReflectionHelpers.setStaticField(VERSION::class.java, \"SDK_INT\", 30)\n+\n+ application.applicationContext.applicationInfo.targetSdkVersion = 30\n+\n+ assertFalse { application.isPackageAndOsTargetsAbove(32) }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CallbackManagerTest.kt",
"new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CallbackManagerTest.kt",
"diff": "@@ -3,18 +3,18 @@ package com.clevertap.android.sdk\nimport android.os.Looper\nimport com.clevertap.android.sdk.displayunits.DisplayUnitListener\nimport com.clevertap.android.sdk.displayunits.model.CleverTapDisplayUnit\n+import com.clevertap.android.sdk.inapp.CTInAppNotification\nimport com.clevertap.android.sdk.interfaces.OnInitCleverTapIDListener\nimport com.clevertap.android.sdk.product_config.CTProductConfigListener\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationListener\nimport com.clevertap.android.sdk.pushnotification.amp.CTPushAmpListener\nimport com.clevertap.android.shared.test.BaseTestCase\nimport org.json.JSONObject\n-import org.junit.Test\n-import org.junit.runner.RunWith\n-import org.mockito.Mockito\n+import org.junit.*\n+import org.junit.runner.*\n+import org.mockito.*\nimport org.robolectric.RobolectricTestRunner\nimport org.robolectric.Shadows\n-import java.util.ArrayList\nimport kotlin.test.assertEquals\n@RunWith(RobolectricTestRunner::class)\n@@ -90,6 +90,10 @@ class CallbackManagerTest : BaseTestCase() {\nreturn true\n}\n+ override fun onShow(ctInAppNotification: CTInAppNotification?) {\n+ TODO(\"Not yet implemented\")\n+ }\n+\noverride fun onDismissed(extras: MutableMap<String, Any>?, actionExtras: MutableMap<String, Any>?) {}\n}\ncallbackManager.inAppNotificationListener = listener\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1970) : Add unit test for CTXtensions.kt |
116,616 | 17.10.2022 14:14:34 | -19,080 | 2831024aefa17ef393b996cad7d747ac2d285407 | task(SDK-2170) - Refactor hard permission dialog flow for Alert type | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java",
"diff": "package com.clevertap.android.sdk;\nimport static com.clevertap.android.sdk.CTXtensions.isPackageAndOsTargetsAbove;\n+import static com.clevertap.android.sdk.inapp.InAppController.CT_INAPP_BUTTON_BUNDLE_KEY;\n+import static com.clevertap.android.sdk.inapp.InAppController.DISPLAY_HARD_PERMISSION_BUNDLE_KEY;\nimport static com.clevertap.android.sdk.inapp.InAppController.IS_FIRST_TIME_PERMISSION_REQUEST;\nimport android.Manifest;\n@@ -74,8 +76,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nif (notif == null) {\nthrow new IllegalArgumentException();\n}\n- inAppNotification = notif.getParcelable(\"inApp\");\n- boolean displayHardNotificationDialog = notif.getBoolean(\"displayHardPermissionDialog\",\n+ inAppNotification = notif.getParcelable(Constants.INAPP_KEY);\n+ boolean showHardNotificationPermission = notif.getBoolean(DISPLAY_HARD_PERMISSION_BUNDLE_KEY,\nfalse); // Using this boolean for a directly showing hard permission dialog flow\nBundle configBundle = notif.getBundle(\"configBundle\");\nif (configBundle != null) {\n@@ -83,9 +85,12 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\nsetListener(CleverTapAPI.instanceWithConfig(this, config).getCoreState().getInAppController());\n- setPermissionCallback(CleverTapAPI.instanceWithConfig(this, config).getCoreState().getInAppController());\n- if (displayHardNotificationDialog) {\n- prompt();\n+ setPermissionCallback(CleverTapAPI.instanceWithConfig(this, config).getCoreState()\n+ .getInAppController());\n+\n+ if (showHardNotificationPermission) {\n+ CTInAppNotificationButton ctInAppNotificationButton = notif.getParcelable(CT_INAPP_BUTTON_BUNDLE_KEY);\n+ promptPermission(ctInAppNotificationButton);\nreturn;\n}\n} catch (Throwable t) {\n@@ -182,17 +187,12 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\n}\n- @SuppressLint(\"NewApi\")\n- public void prompt() {\n- if (isPackageAndOsTargetsAbove(this, 32)) {\n- requestPermission();\n- }\n- }\n-\n@SuppressLint(\"NewApi\")\npublic void promptPermission(CTInAppNotificationButton ctInAppNotificationButton){\nif (isPackageAndOsTargetsAbove(this, 32)) {\n+ if (ctInAppNotificationButton != null) {\nisFbSettings = ctInAppNotificationButton.isFallbackToSettings();\n+ }\nrequestPermission();\n}\n}\n@@ -371,10 +371,18 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nreturn;\n}\nif (inAppNotification.isLocalInApp()) {\n- prompt();\n- } else {\n- didDismiss(data);\n+ promptPermission(inAppNotification.getButtons().get(0));\n+ return;\n}\n+\n+ if (inAppNotification.getButtons().get(0).getType() != null &&\n+ inAppNotification.getButtons().get(0).getType()\n+ .equalsIgnoreCase(\"rfp\")){\n+ promptPermission(inAppNotification.getButtons().get(0));\n+ return;\n+ }\n+\n+ didDismiss(data);\n}\n})\n.create();\n@@ -395,6 +403,14 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nfireUrlThroughIntent(actionUrl, data);\nreturn;\n}\n+\n+ if (inAppNotification.getButtons().get(1).getType() != null &&\n+ inAppNotification.getButtons().get(1).getType()\n+ .equalsIgnoreCase(\"rfp\")){\n+ promptPermission(inAppNotification.getButtons().get(1));\n+ return;\n+ }\n+\ndidDismiss(data);\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFragment.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFragment.java",
"diff": "@@ -142,23 +142,27 @@ public abstract class CTInAppBaseFragment extends Fragment {\ndidClick(index,data, button.getKeyValues());\nif (index == 0 && inAppNotification.isLocalInApp()) {\n- ((InAppNotificationActivity) context).prompt();\n+ ((InAppNotificationActivity) context).promptPermission(button);\nreturn;\n}else if (index == 1 && inAppNotification.isLocalInApp()){\ndidDismiss(data);\nreturn;\n}\n- if (button.getType().equalsIgnoreCase(\"rfp\")){\n+ if (button.getType() != null && button.getType().equalsIgnoreCase(\"rfp\")){\n+ if (context instanceof InAppNotificationActivity) {\n((InAppNotificationActivity) context).promptPermission(button);\n}else{\n+ InAppController.startPrompt(requireActivity(),config, button);\n+ }\n+ return;\n+ }\nString actionUrl = button.getActionUrl();\nif (actionUrl != null) {\nfireUrlThroughIntent(actionUrl, data);\nreturn;\n}\ndidDismiss(data);\n- }\n} catch (Throwable t) {\nconfig.getLogger().debug(\"Error handling notification button click: \" + t.getCause());\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationButton.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppNotificationButton.java",
"diff": "@@ -196,8 +196,10 @@ public class CTInAppNotificationButton implements Parcelable {\nif (actions != null) {\n//TODO REMOVE THIS AFTER TESTING AND BACKEND CHANGE IS INCLUDED\n+ if (jsonObject.has(Constants.KEY_TEXT) && jsonObject.getString(Constants.KEY_TEXT).contains(\"Allow\")) {\nactions.put(Constants.KEY_TYPE, \"rfp\");\nactions.put(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS, false);\n+ }\n////\nString action = actions.has(Constants.KEY_ANDROID) ? actions.getString(Constants.KEY_ANDROID) : \"\";\n@@ -205,9 +207,11 @@ public class CTInAppNotificationButton implements Parcelable {\nthis.actionUrl = action;\n}\n+ if (actions.getString(Constants.KEY_TYPE).equalsIgnoreCase(\"rfp\")) {\ntype = actions.getString(Constants.KEY_TYPE);\nfallbackToSettings = actions.getBoolean(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS);\n}\n+ }\n//Custom Key Value pairs\nif (isKVAction(actions)) {\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java",
"diff": "@@ -121,6 +121,8 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\npublic final static String LOCAL_INAPP_COUNT = \"local_in_app_count\";\npublic final static String IS_FIRST_TIME_PERMISSION_REQUEST = \"firstTimeRequest\";\n+ public final static String DISPLAY_HARD_PERMISSION_BUNDLE_KEY = \"displayHardPermissionDialog\";\n+ public final static String CT_INAPP_BUTTON_BUNDLE_KEY = \"inAppButton\";\npublic InAppController(Context context,\nCleverTapInstanceConfig config,\n@@ -223,19 +225,22 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\n}\nstartPrompt(Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n- config);\n+ config, null);\n}else{\nLogger.v(\"Notification permission is granted.\");\n}\n}\n- public void startPrompt(Activity activity, CleverTapInstanceConfig config){\n+ public static void startPrompt(Activity activity, CleverTapInstanceConfig config,\n+ CTInAppNotificationButton button){\nif (!activity.getClass().equals(InAppNotificationActivity.class)) {\nIntent intent = new Intent(activity, InAppNotificationActivity.class);\nBundle configBundle = new Bundle();\nconfigBundle.putParcelable(\"config\", config);\nintent.putExtra(\"configBundle\", configBundle);\n- intent.putExtra(\"displayHardPermissionDialog\", true);\n+ intent.putExtra(Constants.INAPP_KEY, currentlyDisplayingInApp);\n+ intent.putExtra(DISPLAY_HARD_PERMISSION_BUNDLE_KEY, true);\n+ intent.putExtra(CT_INAPP_BUTTON_BUNDLE_KEY, button);\nactivity.startActivity(intent);\n}\n}\n@@ -647,7 +652,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\ncase CTInAppTypeCoverImageOnly:\nIntent intent = new Intent(context, InAppNotificationActivity.class);\n- intent.putExtra(\"inApp\", inAppNotification);\n+ intent.putExtra(Constants.INAPP_KEY, inAppNotification);\nBundle configBundle = new Bundle();\nconfigBundle.putParcelable(\"config\", config);\nintent.putExtra(\"configBundle\", configBundle);\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-2170) - Refactor hard permission dialog flow for Alert type |
116,612 | 17.10.2022 15:27:33 | -19,080 | ca39624013e1821a519f417efe1b513b9f91fbdd | task(SDK-1970) : Accept Application context instead of activity in CTStringResources.kt | [
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTStringResources.kt",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTStringResources.kt",
"diff": "package com.clevertap.android.sdk\n-import android.app.Activity\n+import android.content.Context\n+import androidx.annotation.RestrictTo\n+import androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP\n-class CTStringResources(private val context: Activity, vararg sRID: Int) {\n+@RestrictTo(LIBRARY_GROUP)\n+class CTStringResources(private val context: Context, vararg sRID: Int) {\nprivate var sArray: Array<String>\n"
},
{
"change_type": "MODIFY",
"old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/AlertDialogPromptForSettings.kt",
"new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/AlertDialogPromptForSettings.kt",
"diff": "@@ -16,7 +16,7 @@ class AlertDialogPromptForSettings private constructor() {\nactivity: Activity, onAccept: () -> Unit, onDecline: () -> Unit\n) {\nval (title, message, positiveButtonText, negativeButtonText) = CTStringResources(\n- activity,\n+ activity.applicationContext,\nR.string.ct_permission_not_available_title,\nR.string.ct_permission_not_available_message,\nR.string.ct_permission_not_available_open_settings_option,\n"
}
] | Java | MIT License | clevertap/clevertap-android-sdk | task(SDK-1970) : Accept Application context instead of activity in CTStringResources.kt |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.