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,612
17.10.2022 16:09:54
-19,080
89435c6f529d87ebf0f97134c929b779baf7af82
task(SDK-1970) : Add unit test for CTStringResources.kt
[ { "change_type": "ADD", "old_path": null, "new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CTStringResourcesTest.kt", "diff": "+package com.clevertap.android.sdk\n+\n+import android.content.res.Resources\n+import com.clevertap.android.shared.test.BaseTestCase\n+import org.junit.Test\n+import org.junit.jupiter.api.*\n+import org.junit.runner.*\n+import org.robolectric.RobolectricTestRunner\n+import kotlin.test.assertEquals\n+import kotlin.test.assertNull\n+\n+@RunWith(RobolectricTestRunner::class)\n+class CTStringResourcesTest : BaseTestCase() {\n+\n+ @Test\n+ fun test_destructuring_declaration_for_CTStringResources_when_passed_1_string_id_should_return_value_and_rest_must_be_null() {\n+ val (s1, s2, s3, s4, s5) = CTStringResources(application, R.string.ct_txt_cancel)\n+ assertEquals(\"Cancel\", s1)\n+ listOf(s2, s3, s4, s5).forEach { assertNull(it) }\n+ }\n+\n+ @Test\n+ fun test_destructuring_declaration_for_CTStringResources_when_passed_2_string_id_should_return_value_and_rest_must_be_null() {\n+ val (s1, s2, s3, s4, s5) = CTStringResources(\n+ application,\n+ R.string.ct_txt_cancel,\n+ R.string.ct_permission_not_available_title\n+ )\n+ assertEquals(\"Cancel\", s1)\n+ assertEquals(\"Permission Not Available\", s2)\n+ listOf(s3, s4, s5).forEach { assertNull(it) }\n+ }\n+\n+ @Test\n+ fun test_destructuring_declaration_for_CTStringResources_when_passed_5_string_id_should_return_value() {\n+ val (s1, s2, s3, s4, s5) = CTStringResources(\n+ application,\n+ R.string.ct_txt_cancel,\n+ R.string.ct_txt_cancel,\n+ R.string.ct_txt_cancel,\n+ R.string.ct_txt_cancel,\n+ R.string.ct_txt_cancel\n+ )\n+\n+ listOf(s1, s2, s3, s4, s5).forEach { assertEquals(\"Cancel\", it) }\n+ }\n+\n+ @Test\n+ fun test_destructuring_declaration_for_CTStringResources_when_passed_0_string_id_should_return_all_value_null() {\n+ val (s1, s2, s3, s4, s5) = CTStringResources(\n+ application\n+ )\n+\n+ listOf(s1, s2, s3, s4, s5).forEach { assertNull(it) }\n+ }\n+\n+ @Test\n+ fun test_destructuring_declaration_for_CTStringResources_when_passed_invalid_string_id_should_throw_exception() {\n+ assertThrows<Resources.NotFoundException> {\n+ val (s1, s2, s3, s4, s5) = CTStringResources(\n+ application, -1, -1, -1, -1, -1\n+ )\n+ }\n+ }\n+}\n\\ No newline at end of file\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) : Add unit test for CTStringResources.kt
116,612
17.10.2022 17:47:04
-19,080
4222da0410e4bac9b79269245d225bc866e848bd
task(SDK-1970) : Add unit test for CTLocalInApp.kt
[ { "change_type": "ADD", "old_path": null, "new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/inapp/CTLocalInAppTest.kt", "diff": "+package com.clevertap.android.sdk.inapp\n+\n+import com.clevertap.android.sdk.inapp.CTLocalInApp.InAppType.ALERT\n+import com.clevertap.android.shared.test.BaseTestCase\n+import org.json.JSONObject\n+import org.junit.*\n+import org.skyscreamer.jsonassert.JSONAssert\n+\n+class CTLocalInAppTest : BaseTestCase() {\n+\n+ @Test\n+ fun test_CTLocalInApp() {\n+ val actualJsonObject =\n+ CTLocalInApp.builder().setInAppType(ALERT).setTitleText(\"titleText\").setMessageText(\"messageText\")\n+ .followDeviceOrientation(true).setPositiveBtnText(\"Agree\").setNegativeBtnText(\"Decline\")\n+ .setBackgroundColor(\"#FF0000\").setBtnBackgroundColor(\"#00FF00\").setBtnBorderColor(\"#000000\")\n+ .setBtnBorderRadius(\"#FFFFFF\").setBtnTextColor(\"#FFFF00\").setFallbackToSettings(true)\n+ .setTitleTextColor(\"#F0F000\").setMessageTextColor(\"#F000F0\").setImageUrl(\"https://abc.com/xyz.jpg\")\n+ .build()\n+\n+ val expectedJsonObject =\n+ JSONObject(\n+ \"{\\\"type\\\":\\\"alert-template\\\",\\\"isLocalInApp\\\":true,\\\"close\\\":true,\\\"title\\\":\" +\n+ \"{\\\"text\\\":\\\"titleText\\\",\\\"color\\\":\\\"#F0F000\\\"},\\\"message\\\":{\\\"text\\\":\\\"messageText\\\",\" +\n+ \"\\\"color\\\":\\\"#F000F0\\\"},\\\"hasPortrait\\\":true,\\\"hasLandscape\\\":true,\\\"buttons\\\":\" +\n+ \"[{\\\"text\\\":\\\"Agree\\\",\\\"radius\\\":\\\"#FFFFFF\\\",\\\"bg\\\":\\\"#00FF00\\\",\\\"border\\\":\\\"#000000\\\",\" +\n+ \"\\\"color\\\":\\\"#FFFF00\\\"},{\\\"text\\\":\\\"Decline\\\",\\\"radius\\\":\\\"#FFFFFF\\\",\\\"bg\\\":\\\"#00FF00\\\",\" +\n+ \"\\\"border\\\":\\\"#000000\\\",\\\"color\\\":\\\"#FFFF00\\\"}],\\\"bg\\\":\\\"#FF0000\\\",\" +\n+ \"\\\"fallbackToNotificationSettings\\\":true,\\\"media\\\":{\\\"url\\\":\\\"https:\\\\/\\\\/abc.com\\\\/xyz.jpg\\\",\" +\n+ \"\\\"content_type\\\":\\\"image\\\"},\\\"mediaLandscape\\\":{\\\"url\\\":\\\"https:\\\\/\\\\/abc.com\\\\/xyz.jpg\\\",\" +\n+ \"\\\"content_type\\\":\\\"image\\\"}}\"\n+ )\n+ JSONAssert.assertEquals(expectedJsonObject, actualJsonObject, true)\n+ }\n+}\n\\ No newline at end of file\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) : Add unit test for CTLocalInApp.kt
116,616
17.10.2022 17:56:32
-19,080
0d8c52cb9e8c90b247ade9395c6e0911f12c6326
task(SDK-2171) - Add hard permission flow for Inbox campaigns
[ { "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": "@@ -162,7 +162,7 @@ public final class StorageHelper {\nreturn getPreferences(context, nameSpace).getString(key, defaultValue);\n}\n- static void putBoolean(Context context, String key, boolean value) {\n+ public static void putBoolean(Context context, String key, boolean value) {\nSharedPreferences prefs = getPreferences(context);\nSharedPreferences.Editor editor = prefs.edit().putBoolean(key, value);\npersist(editor);\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": "@@ -47,6 +47,7 @@ public class CTInAppNotificationButton implements Parcelable {\nprivate String textColor;\nprivate String type;\n+\nprivate boolean fallbackToSettings;\nCTInAppNotificationButton() {\n@@ -207,6 +208,7 @@ public class CTInAppNotificationButton implements Parcelable {\nthis.actionUrl = action;\n}\n+ //TODO REMOVE THIS AFTER TESTING AND BACKEND CHANGE IS INCLUDED\nif (actions.getString(Constants.KEY_TYPE).equalsIgnoreCase(\"rfp\")) {\ntype = actions.getString(Constants.KEY_TYPE);\nfallbackToSettings = actions.getBoolean(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS);\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": "package com.clevertap.android.sdk.inbox;\n+import static com.clevertap.android.sdk.CTXtensions.isPackageAndOsTargetsAbove;\n+import static com.clevertap.android.sdk.inapp.InAppController.IS_FIRST_TIME_PERMISSION_REQUEST;\n+import android.Manifest;\n+import android.annotation.SuppressLint;\nimport android.content.Context;\n+import android.content.pm.PackageManager;\nimport android.graphics.Color;\nimport android.graphics.PorterDuff;\nimport android.graphics.drawable.Drawable;\n@@ -9,9 +14,13 @@ import android.view.View;\nimport android.widget.FrameLayout;\nimport android.widget.LinearLayout;\nimport android.widget.TextView;\n+import androidx.annotation.NonNull;\n+import androidx.annotation.RequiresApi;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport androidx.appcompat.widget.Toolbar;\n+import androidx.core.app.ActivityCompat;\n+import androidx.core.content.ContextCompat;\nimport androidx.core.content.res.ResourcesCompat;\nimport androidx.fragment.app.Fragment;\nimport androidx.fragment.app.FragmentActivity;\n@@ -21,13 +30,18 @@ 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+import com.clevertap.android.sdk.InAppNotificationActivity;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.R;\n+import com.clevertap.android.sdk.StorageHelper;\n+import com.clevertap.android.sdk.Utils;\n+import com.clevertap.android.sdk.inapp.AlertDialogPromptForSettings;\nimport com.google.android.material.tabs.TabLayout;\nimport java.lang.ref.WeakReference;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\n+import kotlin.Unit;\n/**\n* This activity shows the {@link CTInboxMessage} objects as per {@link CTInboxStyleConfig} style parameters\n@@ -59,6 +73,10 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nprivate CleverTapAPI cleverTapAPI;\nprivate CTInboxListener inboxContentUpdatedListener = null;\n+ private WeakReference<InAppNotificationActivity.PermissionCallback> permissionCallbackWeakReference;\n+ private static final int PERMISSION_REQUEST_CODE = 2;\n+ public static final String ANDROID_PERMISSION_STRING = \"android.permission.POST_NOTIFICATIONS\";\n+\npublic void onCreate(Bundle savedInstanceState) {\nsuper.onCreate(savedInstanceState);\ntry {\n@@ -76,6 +94,9 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nsetListener(cleverTapAPI);\ninboxContentUpdatedListener = cleverTapAPI.getCTNotificationInboxListener();\ncleverTapAPI.setCTNotificationInboxListener(this);\n+\n+ setPermissionCallback(CleverTapAPI.instanceWithConfig(this, config).getCoreState()\n+ .getInAppController());\n}\norientation = getResources().getConfiguration().orientation;\n} catch (Throwable t) {\n@@ -198,6 +219,69 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n}\n}\n+ @SuppressLint(\"NewApi\")\n+ public void promptPermission(boolean fbSettings){\n+ if (isPackageAndOsTargetsAbove(this, 32)) {\n+ requestPermission(fbSettings);\n+ }\n+ }\n+\n+ @RequiresApi(api = 33)\n+ public void requestPermission(boolean fbSettings) {\n+ int permissionStatus = ContextCompat.checkSelfPermission(CTInboxActivity.this,\n+ Manifest.permission.POST_NOTIFICATIONS);\n+\n+ if (permissionStatus == PackageManager.PERMISSION_DENIED){\n+ boolean isFirstTimeRequest = StorageHelper.getBoolean(CTInboxActivity.this,\n+ IS_FIRST_TIME_PERMISSION_REQUEST,true);\n+ if (!isFirstTimeRequest) {\n+ boolean neverAskAgainClicked = ActivityCompat.shouldShowRequestPermissionRationale(\n+ CTInboxActivity.this, ANDROID_PERMISSION_STRING);\n+ if (neverAskAgainClicked && fbSettings) {\n+ showFallbackAlertDialog();\n+ return;\n+ }\n+\n+ permissionCallbackWeakReference.get().onReject();\n+ return;\n+ }\n+\n+ ActivityCompat.requestPermissions(CTInboxActivity.this,\n+ new String[]{ANDROID_PERMISSION_STRING}, PERMISSION_REQUEST_CODE);\n+ }else{\n+ permissionCallbackWeakReference.get().onAccept();\n+ }\n+ }\n+\n+ public void showFallbackAlertDialog() {\n+ AlertDialogPromptForSettings.show(this, () -> {\n+ Utils.navigateToAndroidSettingsForNotifications(CTInboxActivity.this);\n+ return Unit.INSTANCE;\n+ }, () -> {\n+ return Unit.INSTANCE;\n+ });\n+ }\n+\n+ @Override\n+ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {\n+ super.onRequestPermissionsResult(requestCode, permissions, grantResults);\n+ StorageHelper.putBoolean(CTInboxActivity.this,IS_FIRST_TIME_PERMISSION_REQUEST,\n+ false);\n+ if (requestCode == PERMISSION_REQUEST_CODE) {\n+ boolean granted = grantResults.length > 0 && grantResults[0] ==\n+ PackageManager.PERMISSION_GRANTED;\n+ if (granted) {\n+ permissionCallbackWeakReference.get().onAccept();\n+ }else {\n+ permissionCallbackWeakReference.get().onReject();\n+ }\n+ }\n+ }\n+\n+ public void setPermissionCallback(InAppNotificationActivity.PermissionCallback callback) {\n+ permissionCallbackWeakReference = new WeakReference<>(callback);\n+ }\n+\n@Override\nprotected void onDestroy() {\nif (styleConfig.isUsingTabs()) {\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": "@@ -287,6 +287,15 @@ public class CTInboxListViewFragment extends Fragment {\ndata.putString(\"wzrk_c2a\", buttonText);\n}\ndidClick(data, position, keyValuePayload,isInboxMessageBodyClick);\n+\n+ String isRequestForPermissionStr = inboxMessages.get(position).getInboxMessageContents().\n+ get(0).getLinktype(jsonObject);\n+ if (isRequestForPermissionStr.equalsIgnoreCase(\"rfp\")){\n+ ((CTInboxActivity) requireActivity()).promptPermission(inboxMessages.get(position).\n+ getInboxMessageContents().get(0).getFbSettings(jsonObject));\n+ return;\n+ }\n+\nboolean isKVButton = keyValuePayload != null && !keyValuePayload.isEmpty();\nif (jsonObject != null) {\nif (isKVButton || inboxMessages.get(position).getInboxMessageContents().get(0).getLinktype(jsonObject)\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessageContent.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessageContent.java", "diff": "@@ -280,6 +280,11 @@ public class CTInboxMessageContent implements Parcelable {\nreturn null;\n}\ntry {\n+ //TODO REMOVE THIS AFTER TESTING AND BACKEND CHANGE IS INCLUDED\n+ if (jsonObject.getString(Constants.KEY_TEXT).contains(\"Allow\")){\n+ jsonObject.put(Constants.KEY_TYPE, \"rfp\");\n+ jsonObject.put(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS, true);\n+ }\nreturn jsonObject.has(Constants.KEY_TYPE) ? jsonObject.getString(Constants.KEY_TYPE) : \"\";\n} catch (JSONException e) {\nLogger.v(\"Unable to get Link Type with JSON - \" + e.getLocalizedMessage());\n@@ -287,6 +292,19 @@ public class CTInboxMessageContent implements Parcelable {\n}\n}\n+ public boolean getFbSettings(JSONObject jsonObject) {\n+ if (jsonObject == null) {\n+ return false;\n+ }\n+ try {\n+ return jsonObject.has(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS) ?\n+ jsonObject.getBoolean(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS) : false;\n+ } catch (JSONException e) {\n+ Logger.v(\"Unable to get Link Type with JSON - \" + e.getLocalizedMessage());\n+ return false;\n+ }\n+ }\n+\n/**\n* Returns the media URL of the inbox message\n*\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-2171) - Add hard permission flow for Inbox campaigns
116,616
18.10.2022 11:35:11
-19,080
06797532db4ea7f7aad68989417769fc5ed4371b
task(SDK-2318) - Update FCM, XPS, HMS dependencies, update version name for core,xps,hms
[ { "change_type": "DELETE", "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 a/clevertap-xps/libs/MiPush_SDK_Client_5_0_6-G_3rd.aar and /dev/null differ\n" }, { "change_type": "ADD", "old_path": "clevertap-xps/libs/MiPush_SDK_Client_5_1_1-G_3rd.aar", "new_path": "clevertap-xps/libs/MiPush_SDK_Client_5_1_1-G_3rd.aar", "diff": "Binary files /dev/null and b/clevertap-xps/libs/MiPush_SDK_Client_5_1_1-G_3rd.aar differ\n" }, { "change_type": "MODIFY", "old_path": "sample/build.gradle", "new_path": "sample/build.gradle", "diff": "@@ -90,7 +90,7 @@ dependencies {\nimplementation 'androidx.work:work-runtime:2.7.0'// Needed for geofence\nimplementation 'androidx.concurrent:concurrent-futures:1.1.0'// Needed for geofence\n- implementation 'com.google.firebase:firebase-messaging:21.0.0' //Needed for FCM\n+ implementation 'com.google.firebase:firebase-messaging:23.0.6' //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\nimplementation 'com.google.android.exoplayer:exoplayer:2.17.1'\n" }, { "change_type": "MODIFY", "old_path": "versions.properties", "new_path": "versions.properties", "diff": "@@ -115,9 +115,9 @@ version.com.google.gms..google-services=4.3.3\n## # available=4.3.9\n## # available=4.3.10\nversion.com.google.truth..truth=1.1.3\n-version.com.huawei.agconnect..agcp=1.6.5.300\n+version.com.huawei.agconnect..agcp=1.7.2.300\n## # available=1.6.1.200\n-version.com.huawei.hms..push=6.5.0.300\n+version.com.huawei.hms..push=6.7.0.300\nversion.eu.codearte.catch-exception..catch-exception=2.0\n## # available=2.0.0-ALPHA-1\n## # available=2.0.0-beta-1\n@@ -321,10 +321,10 @@ 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.4\n+version.com.clevertap.android..clevertap-android-sdk=4.7.0\nversion.com.clevertap.android..clevertap-geofence-sdk=1.1.0\n-version.com.clevertap.android..clevertap-hms-sdk=1.3.1\n-version.com.clevertap.android..clevertap-xiaomi-sdk=1.5.1\n+version.com.clevertap.android..clevertap-hms-sdk=1.3.2\n+version.com.clevertap.android..clevertap-xiaomi-sdk=1.5.2\nversion.com.clevertap.android..push-templates=1.0.5\nversion.com.github.bumptech.glide..glide=4.12.0\n@@ -380,7 +380,7 @@ version.com.google.android.exoplayer..exoplayer-ui=2.17.1\n## # available=2.14.2\n## # available=2.15.0\n## # available=2.15.1\n-version.firebase-messaging=21.0.0\n+version.firebase-messaging=23.0.6\n## # available=20.3.0\n## # available=21.0.0\n## # available=21.0.1\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-2318) - Update FCM, XPS, HMS dependencies, update version name for core,xps,hms
116,612
18.10.2022 16:40:39
-19,080
29b777ee3ad4d7072a7c64270fef87ea0858d515
task(SDK-1970) : update kotlin, gradle plugin and androidx core,appcompat deps
[ { "change_type": "MODIFY", "old_path": "buildSrc/settings.gradle.kts", "new_path": "buildSrc/settings.gradle.kts", "diff": "@@ -7,6 +7,15 @@ pluginManagement {\n//// # available:\"0.21.0\"\n//// # available:\"0.22.0\"\n//// # available:\"0.23.0\"\n+//// # available:\"0.30.0\"\n+//// # available:\"0.30.1\"\n+//// # available:\"0.30.2\"\n+//// # available:\"0.40.0\"\n+//// # available:\"0.40.1\"\n+//// # available:\"0.40.2\"\n+//// # available:\"0.50.0\"\n+//// # available:\"0.50.1\"\n+//// # available:\"0.50.2\"\n}\n}\n" }, { "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": "package com.clevertap.android.pushtemplates\nimport android.app.NotificationManager\n-import android.content.ContentResolver\nimport android.app.PendingIntent\n+import android.content.ContentResolver\nimport android.content.Context\nimport android.content.Intent\nimport android.graphics.Bitmap\n@@ -21,9 +21,9 @@ import com.clevertap.android.pushtemplates.validators.ValidatorFactory\nimport com.clevertap.android.sdk.CleverTapAPI\nimport com.clevertap.android.sdk.CleverTapInstanceConfig\nimport com.clevertap.android.sdk.Constants\n-import com.clevertap.android.sdk.interfaces.AudibleNotification\nimport com.clevertap.android.sdk.Logger\nimport com.clevertap.android.sdk.ManifestInfo\n+import com.clevertap.android.sdk.interfaces.AudibleNotification\nimport com.clevertap.android.sdk.pushnotification.CTNotificationIntentService\nimport com.clevertap.android.sdk.pushnotification.INotificationRenderer\nimport com.clevertap.android.sdk.pushnotification.PushNotificationHandler\n@@ -190,6 +190,9 @@ class TemplateRenderer : INotificationRenderer, AudibleNotification {\nreturn InputBoxStyle(this).builderFromStyle(context, extras, notificationId, nb)\nTemplateType.CANCEL -> renderCancelNotification(context)\n+ else -> {\n+ PTLog.verbose(\"operation not defined!\")\n+ }\n}\nreturn null\n}\n" }, { "change_type": "MODIFY", "old_path": "gradle/wrapper/gradle-wrapper.properties", "new_path": "gradle/wrapper/gradle-wrapper.properties", "diff": "-#Thu Aug 25 11:25:05 IST 2022\n+#Tue Oct 18 14:46:26 IST 2022\ndistributionBase=GRADLE_USER_HOME\n+distributionUrl=https\\://services.gradle.org/distributions/gradle-7.4-bin.zip\ndistributionPath=wrapper/dists\n-zipStoreBase=GRADLE_USER_HOME\nzipStorePath=wrapper/dists\n-distributionUrl=https\\://services.gradle.org/distributions/gradle-7.3.3-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": "@@ -48,7 +48,7 @@ android {\ndependencies {\ndef lifecycle_version = \"2.3.1\"\n- implementation 'androidx.core:core:1.3.0'\n+ implementation 'androidx.core:core:1.9.0'\nimplementation 'androidx.constraintlayout:constraintlayout:2.1.1'\nimplementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'\nimplementation \"org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31\"\n@@ -102,7 +102,7 @@ dependencies {\nimplementation 'com.google.android.material:material:1.4.0'\nimplementation 'androidx.fragment:fragment:1.3.6'\n- implementation 'androidx.appcompat:appcompat:1.3.1'\n+ implementation 'androidx.appcompat:appcompat:1.6.0-rc01'\nimplementation 'androidx.recyclerview:recyclerview:1.2.1'\nimplementation 'androidx.viewpager:viewpager:1.0.0'\n" }, { "change_type": "MODIFY", "old_path": "settings.gradle", "new_path": "settings.gradle", "diff": "@@ -6,9 +6,30 @@ plugins {\n//// # available:'0.21.0'\n//// # available:'0.22.0'\n//// # available:'0.23.0'\n+//// # available:'0.30.0'\n+//// # available:'0.30.1'\n+//// # available:'0.30.2'\n+//// # available:'0.40.0'\n+//// # available:'0.40.1'\n+//// # available:'0.40.2'\n+//// # available:'0.50.0'\n+//// # available:'0.50.1'\n+//// # available:'0.50.2'\nid \"com.gradle.enterprise\" version \"3.6.3\"\n//// # available:\"3.6.4\"\n//// # available:\"3.7\"\n+//// # available:\"3.7.1\"\n+//// # available:\"3.7.2\"\n+//// # available:\"3.8\"\n+//// # available:\"3.8.1\"\n+//// # available:\"3.9\"\n+//// # available:\"3.10\"\n+//// # available:\"3.10.1\"\n+//// # available:\"3.10.2\"\n+//// # available:\"3.10.3\"\n+//// # available:\"3.11\"\n+//// # available:\"3.11.1\"\n+//// # available:\"3.11.2\"\n}\ninclude ':test_shared'\ninclude ':clevertap-core'\n" }, { "change_type": "MODIFY", "old_path": "versions.properties", "new_path": "versions.properties", "diff": "####\n#### suppress inspection \"SpellCheckingInspection\" for whole file\n#### suppress inspection \"UnusedProperty\" for whole file\n-\n-plugin.android=7.2.2\n-## # available=4.2.2\n-## # available=7.0.0-alpha01\n-## # available=7.0.0-alpha02\n-## # available=7.0.0-alpha03\n-## # available=7.0.0-alpha04\n-## # available=7.0.0-alpha05\n-## # available=7.0.0-alpha06\n-## # available=7.0.0-alpha07\n-## # available=7.0.0-alpha08\n-## # available=7.0.0-alpha09\n-## # available=7.0.0-alpha10\n-## # available=7.0.0-alpha11\n-## # available=7.0.0-alpha12\n-## # available=7.0.0-alpha13\n-## # available=7.0.0-alpha14\n-## # available=7.0.0-alpha15\n-## # available=7.0.0-beta01\n-## # available=7.0.0-beta02\n-## # available=7.0.0-beta03\n-## # available=7.0.0-beta04\n-## # available=7.0.0-beta05\n-## # available=7.0.0-rc01\n-## # available=7.0.0\n-## # available=7.0.1\n-## # available=7.0.2\n-## # available=7.0.3\n-## # available=7.1.0-alpha01\n-## # available=7.1.0-alpha02\n-## # available=7.1.0-alpha03\n-## # available=7.1.0-alpha04\n-## # available=7.1.0-alpha05\n-## # available=7.1.0-alpha06\n-## # available=7.1.0-alpha07\n-## # available=7.1.0-alpha08\n-## # available=7.1.0-alpha09\n-## # available=7.1.0-alpha10\n-## # available=7.1.0-alpha11\n-## # available=7.1.0-alpha12\n-## # available=7.1.0-alpha13\n+plugin.android=7.3.0\n+## # available=7.3.0-alpha01\n+## # available=7.3.0-alpha02\n+## # available=7.3.0-alpha03\n+## # available=7.3.0-alpha04\n+## # available=7.3.0-alpha05\n+## # available=7.3.0-alpha06\n+## # available=7.3.0-alpha07\n+## # available=7.3.0-alpha08\n+## # available=7.3.0-alpha09\n+## # available=7.3.0-beta01\n+## # available=7.3.0-beta02\n+## # available=7.3.0-beta03\n+## # available=7.3.0-beta04\n+## # available=7.3.0-beta05\n+## # available=7.3.0-rc01\n+## # available=7.3.0\n+## # available=7.3.1\n+## # available=7.4.0-alpha01\n+## # available=7.4.0-alpha02\n+## # available=7.4.0-alpha03\n+## # available=7.4.0-alpha04\n+## # available=7.4.0-alpha05\n+## # available=7.4.0-alpha06\n+## # available=7.4.0-alpha07\n+## # available=7.4.0-alpha08\n+## # available=7.4.0-alpha09\n+## # available=7.4.0-alpha10\n+## # available=7.4.0-beta01\n+## # available=7.4.0-beta02\n+## # available=8.0.0-alpha01\n+## # available=8.0.0-alpha02\n+## # available=8.0.0-alpha03\n+## # available=8.0.0-alpha04\nversion.androidx.test=1.4.0\n-## # available=1.3.1-alpha01\n-## # available=1.3.1-alpha02\n-## # available=1.3.1-alpha03\n-## # available=1.4.0-alpha04\n-## # available=1.4.0-alpha05\n-## # available=1.4.0-alpha06\n-## # available=1.4.0-beta01\n-## # available=1.4.0-beta02\n-## # available=1.4.0-rc01\n-## # available=1.4.0\n## # available=1.4.1-alpha01\n## # available=1.4.1-alpha02\n## # available=1.4.1-alpha03\n+## # available=1.4.1-alpha04\n+## # available=1.4.1-alpha05\n+## # available=1.4.1-alpha06\n+## # available=1.4.1-alpha07\n+## # available=1.4.1-beta01\nversion.androidx.test.core=1.4.0\n-## # available=1.3.1-alpha01\n-## # available=1.3.1-alpha02\n-## # available=1.3.1-alpha03\n-## # available=1.4.0-alpha04\n-## # available=1.4.0-alpha05\n-## # available=1.4.0-alpha06\n-## # available=1.4.0-beta01\n-## # available=1.4.0-beta02\n-## # available=1.4.0-rc01\n-## # available=1.4.0\n## # available=1.4.1-alpha01\n## # available=1.4.1-alpha02\n## # available=1.4.1-alpha03\n+## # available=1.4.1-alpha04\n+## # available=1.4.1-alpha05\n+## # available=1.4.1-alpha06\n+## # available=1.4.1-alpha07\n+## # available=1.5.0-alpha01\n+## # available=1.5.0-alpha02\n+## # available=1.5.0-beta01\nversion.androidx.test.espresso=3.3.0\n## # available=3.4.0-alpha01\n## # available=3.4.0-alpha02\n@@ -89,23 +74,26 @@ version.androidx.test.espresso=3.3.0\n## # available=3.5.0-alpha01\n## # available=3.5.0-alpha02\n## # available=3.5.0-alpha03\n+## # available=3.5.0-alpha04\n+## # available=3.5.0-alpha05\n+## # available=3.5.0-alpha06\n+## # available=3.5.0-alpha07\n+## # available=3.5.0-beta01\nversion.androidx.test.ext.junit=1.1.3\n-## # available=1.1.3-alpha01\n-## # available=1.1.3-alpha02\n-## # available=1.1.3-alpha03\n-## # available=1.1.3-alpha04\n-## # available=1.1.3-alpha05\n-## # available=1.1.3-alpha06\n-## # available=1.1.3-beta01\n-## # available=1.1.3-beta02\n-## # available=1.1.3-rc01\n-## # available=1.1.3\n## # available=1.1.4-alpha01\n## # available=1.1.4-alpha02\n## # available=1.1.4-alpha03\n+## # available=1.1.4-alpha04\n+## # available=1.1.4-alpha05\n+## # available=1.1.4-alpha06\n+## # available=1.1.4-alpha07\n+## # available=1.1.4-beta01\nversion.com.google.code.gson..gson=2.8.6\n## # available=2.8.7\n## # available=2.8.8\n+## # available=2.8.9\n+## # available=2.9.0\n+## # available=2.9.1\nversion.com.google.gms..google-services=4.3.3\n## # available=4.3.4\n## # available=4.3.5\n@@ -114,9 +102,11 @@ version.com.google.gms..google-services=4.3.3\n## # available=4.3.8\n## # available=4.3.9\n## # available=4.3.10\n+## # available=4.3.12\n+## # available=4.3.13\n+## # available=4.3.14\nversion.com.google.truth..truth=1.1.3\nversion.com.huawei.agconnect..agcp=1.7.2.300\n-## # available=1.6.1.200\nversion.com.huawei.hms..push=6.7.0.300\nversion.eu.codearte.catch-exception..catch-exception=2.0\n## # available=2.0.0-ALPHA-1\n@@ -126,37 +116,35 @@ version.junit=5.7.2\n### available=5.8.0-RC1\n### available=5.8.0\n### available=5.8.1\n-version.kotlin=1.5.31\n-## # available=1.4.0-rc\n-## # available=1.4.0\n-## # available=1.4.10\n-## # available=1.4.20-M1\n-## # available=1.4.20-M2\n-## # available=1.4.20-RC\n-## # available=1.4.20\n-## # available=1.4.21\n-## # available=1.4.21-2\n-## # available=1.4.30-M1\n-## # available=1.4.30-RC\n-## # available=1.4.30\n-## # available=1.4.31\n-## # available=1.4.32\n-## # available=1.5.0-M1\n-## # available=1.5.0-M2\n-## # available=1.5.0-RC\n-## # available=1.5.0\n-## # available=1.5.10\n-## # available=1.5.20-M1\n-## # available=1.5.20-RC\n-## # available=1.5.20\n-## # available=1.5.21\n-## # available=1.5.30-M1\n-## # available=1.5.30-RC\n-## # available=1.5.30\n-## # available=1.5.31\n+### available=5.8.2\n+### available=5.9.0-M1\n+### available=5.9.0-RC1\n+### available=5.9.0\n+### available=5.9.1\n+version.kotlin=1.7.20\n+## # available=1.5.32\n## # available=1.6.0-M1\n## # available=1.6.0-RC\n+## # available=1.6.0-RC2\n+## # available=1.6.0\n+## # available=1.6.10-RC\n+## # available=1.6.10\n+## # available=1.6.20-M1\n+## # available=1.6.20-RC\n+## # available=1.6.20-RC2\n+## # available=1.6.20\n+## # available=1.6.21\n+## # available=1.7.0-Beta\n+## # available=1.7.0-RC\n+## # available=1.7.0-RC2\n+## # available=1.7.0\n+## # available=1.7.10\n+## # available=1.7.20-Beta\n+## # available=1.7.20-RC\n+## # available=1.7.20\nversion.org.awaitility..awaitility=4.1.0\n+## # available=4.1.1\n+## # available=4.2.0\nversion.org.jacoco..org.jacoco.core=0.8.7\nversion.org.junit.platform..junit-platform-runner=1.7.0\n## # available=1.7.1\n@@ -165,6 +153,11 @@ version.org.junit.platform..junit-platform-runner=1.7.0\n## # available=1.8.0-RC1\n## # available=1.8.0\n## # available=1.8.1\n+## # available=1.8.2\n+## # available=1.9.0-M1\n+## # available=1.9.0-RC1\n+## # available=1.9.0\n+## # available=1.9.1\nversion.org.opentest4j..opentest4j=1.2.0\nversion.org.powermock..powermock-api-mockito2=2.0.9\nversion.org.powermock..powermock-classloading-xstream=2.0.9\n@@ -172,33 +165,30 @@ version.org.powermock..powermock-core=2.0.9\nversion.org.powermock..powermock-module-junit4=2.0.9\nversion.org.powermock..powermock-module-junit4-rule=2.0.9\nversion.org.skyscreamer..jsonassert=1.5.0\n+## # available=1.5.1\nversion.org.sonarsource.scanner.gradle..sonarqube-gradle-plugin=3.3\n+## # available=3.4.0.2513\nversion.androidx.annotation=1.2.0\n-## # available=1.2.0-alpha01\n-## # available=1.2.0-beta01\n-## # available=1.2.0-rc01\n-## # available=1.2.0\n## # available=1.3.0-alpha01\n## # available=1.3.0-beta01\n-version.androidx.appcompat=1.3.1\n-## # available=1.3.0-alpha01\n-## # available=1.3.0-alpha02\n-## # available=1.3.0-beta01\n## # available=1.3.0-rc01\n## # available=1.3.0\n-## # available=1.3.1\n## # available=1.4.0-alpha01\n## # available=1.4.0-alpha02\n-## # available=1.4.0-alpha03\n## # available=1.4.0-beta01\n+## # available=1.4.0-rc01\n+## # available=1.4.0\n+## # available=1.5.0-alpha01\n+## # available=1.5.0-alpha02\n+## # available=1.5.0-beta01\n+## # available=1.5.0-rc01\n+## # available=1.5.0\n+version.androidx.appcompat=1.6.0-rc01\n+## # available=1.7.0-alpha01\nversion.androidx.concurrent=1.1.0\n-## # available=1.1.0-alpha01\n-## # available=1.1.0-beta01\n-## # available=1.1.0-rc01\n-## # available=1.1.0\nversion.androidx.constraintlayout=2.0.1\nversion.androidx.coordinatorlayout=1.1.0\n-version.androidx.core=1.3.0\n+version.androidx.core=1.9.0\n## # available=1.3.1\n## # available=1.3.2\n## # available=1.4.0-alpha01\n@@ -224,44 +214,29 @@ version.androidx.core=1.3.0\n## # available=1.7.0-alpha02\n## # available=1.7.0-beta01\n## # available=1.7.0-beta02\n+## # available=1.7.0-rc01\n+## # available=1.7.0\n+## # available=1.8.0-alpha01\n+## # available=1.8.0-alpha02\n+## # available=1.8.0-alpha03\n+## # available=1.8.0-alpha04\n+## # available=1.8.0-alpha05\n+## # available=1.8.0-alpha06\n+## # available=1.8.0-alpha07\n+## # available=1.8.0-beta01\n+## # available=1.8.0-rc01\n+## # available=1.8.0-rc02\n+## # available=1.8.0\n+## # available=1.9.0-alpha01\n+## # available=1.9.0-alpha02\n+## # available=1.9.0-alpha03\n+## # available=1.9.0-alpha04\n+## # available=1.9.0-alpha05\n+## # available=1.9.0-beta01\n+## # available=1.9.0-rc01\n+## # available=1.9.0\nversion.androidx.databinding=4.2.1\nversion.androidx.fragment=1.3.6\n-## # available=1.2.0-alpha01\n-## # available=1.2.0-alpha02\n-## # available=1.2.0-alpha03\n-## # available=1.2.0-alpha04\n-## # available=1.2.0-beta01\n-## # available=1.2.0-beta02\n-## # available=1.2.0-rc01\n-## # available=1.2.0-rc02\n-## # available=1.2.0-rc03\n-## # available=1.2.0-rc04\n-## # available=1.2.0-rc05\n-## # available=1.2.0\n-## # available=1.2.1\n-## # available=1.2.2\n-## # available=1.2.3\n-## # available=1.2.4\n-## # available=1.2.5\n-## # available=1.3.0-alpha01\n-## # available=1.3.0-alpha02\n-## # available=1.3.0-alpha03\n-## # available=1.3.0-alpha04\n-## # available=1.3.0-alpha05\n-## # available=1.3.0-alpha06\n-## # available=1.3.0-alpha07\n-## # available=1.3.0-alpha08\n-## # available=1.3.0-beta01\n-## # available=1.3.0-beta02\n-## # available=1.3.0-rc01\n-## # available=1.3.0-rc02\n-## # available=1.3.0\n-## # available=1.3.1\n-## # available=1.3.2\n-## # available=1.3.3\n-## # available=1.3.4\n-## # available=1.3.5\n-## # available=1.3.6\n## # available=1.4.0-alpha01\n## # available=1.4.0-alpha02\n## # available=1.4.0-alpha03\n@@ -272,142 +247,100 @@ version.androidx.fragment=1.3.6\n## # available=1.4.0-alpha08\n## # available=1.4.0-alpha09\n## # available=1.4.0-alpha10\n+## # available=1.4.0-beta01\n+## # available=1.4.0-rc01\n+## # available=1.4.0\n+## # available=1.4.1\n+## # available=1.5.0-alpha01\n+## # available=1.5.0-alpha02\n+## # available=1.5.0-alpha03\n+## # available=1.5.0-alpha04\n+## # available=1.5.0-alpha05\n+## # available=1.5.0-beta01\n+## # available=1.5.0-rc01\n+## # available=1.5.0\n+## # available=1.5.1\n+## # available=1.5.2\n+## # available=1.5.3\n+## # available=1.6.0-alpha01\n+## # available=1.6.0-alpha02\n+## # available=1.6.0-alpha03\nversion.androidx.lifecycle=2.2.0\nversion.androidx.multidex=2.0.1\nversion.androidx.recyclerview=1.2.1\n-## # available=1.2.0-alpha01\n-## # available=1.2.0-alpha02\n-## # available=1.2.0-alpha03\n-## # available=1.2.0-alpha04\n-## # available=1.2.0-alpha05\n-## # available=1.2.0-alpha06\n-## # available=1.2.0-beta01\n-## # available=1.2.0-beta02\n-## # available=1.2.0-rc01\n-## # available=1.2.0\n-## # available=1.2.1\n## # available=1.3.0-alpha01\n+## # available=1.3.0-alpha02\n+## # available=1.3.0-beta01\n+## # available=1.3.0-beta02\n+## # available=1.3.0-rc01\nversion.androidx.viewpager=1.0.0\n## # available=1.1.0-alpha01\nversion.androidx.work=2.7.0\n-## # available=2.4.0-alpha01\n-## # available=2.4.0-alpha02\n-## # available=2.4.0-alpha03\n-## # available=2.4.0-beta01\n-## # available=2.4.0-rc01\n-## # available=2.4.0\n-## # available=2.5.0-alpha01\n-## # available=2.5.0-alpha02\n-## # available=2.5.0-alpha03\n-## # available=2.5.0-beta01\n-## # available=2.5.0-beta02\n-## # available=2.5.0-rc01\n-## # available=2.5.0\n-## # available=2.6.0-alpha01\n-## # available=2.6.0-alpha02\n-## # available=2.6.0-beta01\n-## # available=2.6.0-beta02\n-## # available=2.6.0-rc01\n-## # available=2.6.0\n-## # available=2.7.0-alpha01\n-## # available=2.7.0-alpha02\n-## # available=2.7.0-alpha03\n-## # available=2.7.0-alpha04\n-## # available=2.7.0-alpha05\n-## # available=2.7.0-beta01\n-## # available=2.7.0-rc01\n+## # available=2.7.1\n+## # available=2.8.0-alpha01\n+## # available=2.8.0-alpha02\n+## # available=2.8.0-alpha03\n+## # available=2.8.0-alpha04\n+## # available=2.8.0-beta01\nversion.com.android.installreferrer..installreferrer=2.2\n-## # available=2.2\nversion.com.android.tools.lint..lint-api=27.0.1\nversion.com.android.tools.lint..lint-checks=27.0.1\n-\nversion.com.clevertap.android..clevertap-android-sdk=4.7.0\nversion.com.clevertap.android..clevertap-geofence-sdk=1.1.0\nversion.com.clevertap.android..clevertap-hms-sdk=1.3.2\nversion.com.clevertap.android..clevertap-xiaomi-sdk=1.5.2\nversion.com.clevertap.android..push-templates=1.0.5\n-\nversion.com.github.bumptech.glide..glide=4.12.0\n-## # available=4.12.0\n+## # available=4.13.0\n+## # available=4.13.1\n+## # available=4.13.2\n+## # available=4.14.0\n+## # available=4.14.1\n+## # available=4.14.2\nversion.com.google.android.exoplayer..exoplayer=2.17.1\n-## # available=2.11.6\n-## # available=2.11.7\n-## # available=2.11.8\n-## # available=2.12.0\n-## # available=2.12.1\n-## # available=2.12.2\n-## # available=2.12.3\n-## # available=2.13.0\n-## # available=2.13.1\n-## # available=2.13.2\n-## # available=2.13.3\n-## # available=2.14.0\n-## # available=2.14.1\n-## # available=2.14.2\n-## # available=2.15.0\n-## # available=2.15.1\n+## # available=2.18.0\n+## # available=2.18.1\nversion.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-## # available=2.12.0\n-## # available=2.12.1\n-## # available=2.12.2\n-## # available=2.12.3\n-## # available=2.13.0\n-## # available=2.13.1\n-## # available=2.13.2\n-## # available=2.13.3\n-## # available=2.14.0\n-## # available=2.14.1\n-## # available=2.14.2\n-## # available=2.15.0\n-## # available=2.15.1\n+## # available=2.18.0\n+## # available=2.18.1\nversion.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-## # available=2.12.0\n-## # available=2.12.1\n-## # available=2.12.2\n-## # available=2.12.3\n-## # available=2.13.0\n-## # available=2.13.1\n-## # available=2.13.2\n-## # available=2.13.3\n-## # available=2.14.0\n-## # available=2.14.1\n-## # available=2.14.2\n-## # available=2.15.0\n-## # available=2.15.1\n+## # available=2.18.0\n+## # available=2.18.1\nversion.firebase-messaging=23.0.6\n-## # available=20.3.0\n-## # available=21.0.0\n-## # available=21.0.1\n-## # available=21.1.0\n-## # available=22.0.0\n+## # available=23.0.7\n+## # available=23.0.8\n+## # available=23.1.0\nversion.google.android.material=1.4.0\n-## # available=1.3.0-alpha01\n-## # available=1.3.0-alpha02\n-## # available=1.3.0-alpha03\n-## # available=1.3.0-alpha04\n-## # available=1.3.0-beta01\n-## # available=1.3.0-rc01\n-## # available=1.3.0\n-## # available=1.4.0-alpha01\n-## # available=1.4.0-alpha02\n-## # available=1.4.0-beta01\n-## # available=1.4.0-rc01\n-## # available=1.4.0\n## # available=1.5.0-alpha01\n## # available=1.5.0-alpha02\n## # available=1.5.0-alpha03\n## # available=1.5.0-alpha04\n+## # available=1.5.0-alpha05\n+## # available=1.5.0-beta01\n+## # available=1.5.0-rc01\n+## # available=1.5.0\n+## # available=1.6.0-alpha01\n+## # available=1.6.0-alpha02\n+## # available=1.6.0-alpha03\n+## # available=1.6.0-beta01\n+## # available=1.6.0-rc01\n+## # available=1.6.0\n+## # available=1.6.1\n+## # available=1.7.0-alpha01\n+## # available=1.7.0-alpha02\n+## # available=1.7.0-alpha03\n+## # available=1.7.0-beta01\n+## # available=1.7.0-rc01\n+## # available=1.8.0-alpha01\nversion.google.android.play-services-ads=19.4.0\nversion.google.android.play-services-location=18.0.0\n-## # available=17.1.0\n-## # available=18.0.0\n+## # available=19.0.0\n+## # available=19.0.1\n+## # available=20.0.0\n+## # available=21.0.0\nversion.junit.junit=4.13\n+## # available=4.13.1\n+## # available=4.13.2\nversion.mockito=3.5.11\n## # available=3.5.13\n## # available=3.5.15\n@@ -427,26 +360,25 @@ version.mockito=3.5.11\n## # available=3.12.3\n## # available=3.12.4\n## # available=4.0.0\n+## # available=4.1.0\n+## # available=4.2.0\n+## # available=4.3.0\n+## # available=4.3.1\n+## # available=4.4.0\n+## # available=4.5.0\n+## # available=4.5.1\n+## # available=4.6.0\n+## # available=4.6.1\n+## # available=4.7.0\n+## # available=4.8.0\nversion.org.jacoco..org.jacoco.agent=0.7.9\nversion.org.jacoco..org.jacoco.ant=0.7.9\nversion.robolectric=4.7.3\n-## # available=4.4-alpha-1\n-## # available=4.4-alpha-2\n-## # available=4.4-alpha-3\n-## # available=4.4-alpha-4\n-## # available=4.4-alpha-5\n-## # available=4.4-beta-1\n-## # available=4.4\n-## # available=4.4.1\n-## # available=4.5-alpha-1\n-## # available=4.5-alpha-2\n-## # available=4.5-alpha-3\n-## # available=4.5-beta-1\n-## # available=4.5\n-## # available=4.5.1\n-## # available=4.6-alpha-1\n-## # available=4.6-alpha-2\n-## # available=4.6\n-## # available=4.6.1\n+## # available=4.8-alpha-1\n+## # available=4.8\n+## # available=4.8.1\n+## # available=4.8.2\n+## # available=4.9-alpha-1\n+## # available=4.9\nversion.xmlpull..xmlpull=1.1.3.1\nversion.kotlin.stblib=1.5.21\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) : update kotlin, gradle plugin and androidx core,appcompat deps
116,616
18.10.2022 16:59:05
-19,080
e96cd970e4a29f9ebd1afa10a3fa2ad669d8cc71
task(SDK-1970) - Add support to dismiss IAM from Web interface, add support 'showFallbackSettings' for hard permission flow, code refactor
[ { "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": "package com.clevertap.android.sdk;\nimport android.webkit.JavascriptInterface;\n+import androidx.annotation.RestrictTo;\n+import com.clevertap.android.sdk.inapp.CTInAppBaseFullFragment;\nimport java.lang.ref.WeakReference;\nimport java.util.ArrayList;\nimport java.util.HashMap;\n@@ -15,22 +17,31 @@ import org.json.JSONObject;\npublic class CTWebInterface {\nprivate final WeakReference<CleverTapAPI> weakReference;\n+ private CTInAppBaseFullFragment inAppBaseFullFragment;\npublic CTWebInterface(CleverTapAPI instance) {\nthis.weakReference = new WeakReference<>(instance);\n}\n+ @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)\n+ public CTWebInterface(CleverTapAPI instance, CTInAppBaseFullFragment inAppBaseFullFragment){\n+ this.weakReference = new WeakReference<>(instance);\n+ this.inAppBaseFullFragment = inAppBaseFullFragment;\n+ }\n+\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+ public void promptForPushPermission(boolean shouldShowFallbackSettings) {\nCleverTapAPI cleverTapAPI = weakReference.get();\nif (cleverTapAPI == null) {\nLogger.d(\"CleverTap Instance is null.\");\n} else {\n- cleverTapAPI.promptForPushPermission();\n+ //Dismisses current IAM and proceeds to call promptForPushPermission()\n+ inAppBaseFullFragment.didDismiss(null);\n+ cleverTapAPI.promptForPushPermission(shouldShowFallbackSettings);\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": "@@ -33,6 +33,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.CTLocalInApp;\nimport com.clevertap.android.sdk.inbox.CTInboxActivity;\nimport com.clevertap.android.sdk.inbox.CTInboxMessage;\nimport com.clevertap.android.sdk.inbox.CTMessageDAO;\n@@ -1033,6 +1034,10 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n+ /**\n+ * Checks whether notification permission is granted or denied for Android 13 and above devices.\n+ * @return boolean Returns true/false based on whether permission is granted or denied.\n+ */\n@SuppressLint(\"NewApi\")\npublic boolean isPushPermissionGranted(){\nif (isPackageAndOsTargetsAbove(context, 32)) {\n@@ -1042,6 +1047,10 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n+ /**\n+ * Calls the push primer flow for Android 13 and above devices.\n+ * @param jsonObject JSONObject - Accepts jsonObject created by {@link CTLocalInApp} object\n+ */\n@SuppressLint(\"NewApi\")\npublic void promptPushPrimer(JSONObject jsonObject) {\nif (isPackageAndOsTargetsAbove(context, 32)) {\n@@ -1051,10 +1060,15 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n}\n+ /**\n+ * Calls directly hard permission dialog, if push primer is not required.\n+ * @param showFallbackSettings - boolean - If `showFallbackSettings` is true then we show a alert\n+ * dialog which routes to app's notification settings page.\n+ */\n@SuppressLint(\"NewApi\")\n- public void promptForPushPermission(){\n+ public void promptForPushPermission(boolean showFallbackSettings){\nif (isPackageAndOsTargetsAbove(context, 32)) {\n- coreState.getInAppController().promptPermission();\n+ coreState.getInAppController().promptPermission(showFallbackSettings);\n} else {\nLogger.v(\"Ensure your app supports Android 13 to verify permission access for notifications.\");\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": "@@ -173,6 +173,7 @@ public interface Constants {\nString KEY_KV = \"kv\";\nString KEY_TYPE = \"type\";\nString KEY_FALLBACK_NOTIFICATION_SETTINGS = \"fbSettings\";\n+ String KEY_REQUEST_FOR_NOTIFICATION_PERMISSION = \"rfp\";\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": "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;\nimport 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;\n+import static com.clevertap.android.sdk.inapp.InAppController.SHOW_FALLBACK_SETTINGS_BUNDLE_KEY;\nimport android.Manifest;\nimport android.annotation.SuppressLint;\n@@ -56,7 +56,9 @@ public final class InAppNotificationActivity extends FragmentActivity implements\npublic static final String ANDROID_PERMISSION_STRING = \"android.permission.POST_NOTIFICATIONS\";\n- private boolean isFbSettings;\n+ private boolean isFallbackSettingsEnabled;\n+\n+ private boolean shouldShowFallbackSettings;\npublic interface PermissionCallback {\n@@ -89,8 +91,9 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n.getInAppController());\nif (showHardNotificationPermission) {\n- CTInAppNotificationButton ctInAppNotificationButton = notif.getParcelable(CT_INAPP_BUTTON_BUNDLE_KEY);\n- promptPermission(ctInAppNotificationButton);\n+ shouldShowFallbackSettings = notif.getBoolean(SHOW_FALLBACK_SETTINGS_BUNDLE_KEY,\n+ false);\n+ showHardPermissionPrompt();\nreturn;\n}\n} catch (Throwable t) {\n@@ -188,10 +191,17 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\n@SuppressLint(\"NewApi\")\n- public void promptPermission(CTInAppNotificationButton ctInAppNotificationButton){\n+ public void showHardPermissionPrompt() {\n+ if (isPackageAndOsTargetsAbove(this, 32)) {\n+ requestPermission();\n+ }\n+ }\n+\n+ @SuppressLint(\"NewApi\")\n+ public void showHardPermissionPrompt(CTInAppNotificationButton ctInAppNotificationButton){\nif (isPackageAndOsTargetsAbove(this, 32)) {\nif (ctInAppNotificationButton != null) {\n- isFbSettings = ctInAppNotificationButton.isFallbackToSettings();\n+ isFallbackSettingsEnabled = ctInAppNotificationButton.isFallbackToSettings();\n}\nrequestPermission();\n}\n@@ -208,8 +218,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nif (!isFirstTimeRequest) {\nboolean neverAskAgainClicked = ActivityCompat.shouldShowRequestPermissionRationale(\nInAppNotificationActivity.this, ANDROID_PERMISSION_STRING);\n- if (neverAskAgainClicked && inAppNotification.fallBackToNotificationSettings()\n- || isFbSettings) {\n+\n+ if (shouldShowFallbackAlertDialog(neverAskAgainClicked)){\nshowFallbackAlertDialog();\nreturn;\n}\n@@ -227,8 +237,29 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\n}\n+ /**\n+ * This method will show `showFallbackAlertDialog()` if any of the below conditions are satisfied\n+ * 1)If `neverAskAgainClicked` is true and when `isFbSettings` true.\n+ * `isFbSettings` key is available from IAM campaign.\n+ * 2)If `neverAskAgainClicked` is true and when `showFbSettings` is true.\n+ * `showFbSettings` key is available when hard push permission flow is called.\n+ * 3)If `neverAskAgainClicked` is true and when `inAppNotification.fallBackToNotificationSettings()` is true.\n+ * `inAppNotification.fallBackToNotificationSettings()` is available when push primer flow is called.\n+ * @param neverAskAgainClicked - This boolean will be true when permission is already denied.\n+ *\n+ * @return true/false\n+ */\n+ private boolean shouldShowFallbackAlertDialog(boolean neverAskAgainClicked) {\n+ if (neverAskAgainClicked && isFallbackSettingsEnabled){\n+ return true;\n+ }else if (neverAskAgainClicked && shouldShowFallbackSettings){\n+ return true;\n+ }else return neverAskAgainClicked && inAppNotification.fallBackToNotificationSettings();\n+ }\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);\nStorageHelper.putBoolean(InAppNotificationActivity.this,IS_FIRST_TIME_PERMISSION_REQUEST,\nfalse);\n@@ -371,14 +402,15 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nreturn;\n}\nif (inAppNotification.isLocalInApp()) {\n- promptPermission(inAppNotification.getButtons().get(0));\n+ showHardPermissionPrompt();\nreturn;\n}\nif (inAppNotification.getButtons().get(0).getType() != null &&\ninAppNotification.getButtons().get(0).getType()\n- .equalsIgnoreCase(\"rfp\")){\n- promptPermission(inAppNotification.getButtons().get(0));\n+ .equalsIgnoreCase(Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)){\n+ showHardPermissionPrompt(\n+ inAppNotification.getButtons().get(0));\nreturn;\n}\n@@ -406,8 +438,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nif (inAppNotification.getButtons().get(1).getType() != null &&\ninAppNotification.getButtons().get(1).getType()\n- .equalsIgnoreCase(\"rfp\")){\n- promptPermission(inAppNotification.getButtons().get(1));\n+ .equalsIgnoreCase(Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)){\n+ showHardPermissionPrompt(inAppNotification.getButtons().get(1));\nreturn;\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": "@@ -68,7 +68,7 @@ public abstract class CTInAppBaseFragment extends Fragment {\n}\n}\n- void didDismiss(Bundle data) {\n+ public void didDismiss(Bundle data) {\ncleanup();\nInAppListener listener = getListener();\nif (listener != null && getActivity() != null && getActivity().getBaseContext() != null) {\n@@ -142,21 +142,20 @@ public abstract class CTInAppBaseFragment extends Fragment {\ndidClick(index,data, button.getKeyValues());\nif (index == 0 && inAppNotification.isLocalInApp()) {\n- ((InAppNotificationActivity) context).promptPermission(button);\n+ ((InAppNotificationActivity) context).showHardPermissionPrompt();\nreturn;\n}else if (index == 1 && inAppNotification.isLocalInApp()){\ndidDismiss(data);\nreturn;\n}\n- if (button.getType() != null && button.getType().equalsIgnoreCase(\"rfp\")){\n+ if (button.getType() != null && button.getType().equalsIgnoreCase(\n+ Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)){\nif (context instanceof InAppNotificationActivity) {\n- ((InAppNotificationActivity) context).promptPermission(button);\n- }else{\n- InAppController.startPrompt(requireActivity(),config, button);\n- }\n+ ((InAppNotificationActivity) context).showHardPermissionPrompt(button);\nreturn;\n}\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/CTInAppBaseFullHtmlFragment.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBaseFullHtmlFragment.java", "diff": "@@ -131,7 +131,8 @@ public abstract class CTInAppBaseFullHtmlFragment extends CTInAppBaseFullFragmen\nwebView.getSettings().setAllowFileAccessFromFileURLs(false);\n}\nwebView.addJavascriptInterface(\n- new CTWebInterface(CleverTapAPI.instanceWithConfig(getActivity(), config)), \"CleverTap\");\n+ new CTWebInterface(CleverTapAPI.instanceWithConfig(getActivity(), config),\n+ this), \"CleverTap\");\n}\nif (isDarkenEnabled()) {\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": "@@ -654,7 +654,7 @@ public class CTInAppNotification implements Parcelable {\nif (buttonArray != null) {\nfor (int i = 0; i < buttonArray.length(); i++) {\nCTInAppNotificationButton inAppNotificationButton = new CTInAppNotificationButton()\n- .initWithJSON(buttonArray.getJSONObject(i));\n+ .initWithJSON(buttonArray.getJSONObject(i),inAppType);//TODO REMOVE THIS AFTER TESTING AND BACKEND CHANGE IS INCLUDED and before RELEASE\nif (inAppNotificationButton != null && inAppNotificationButton.getError() == null) {\nthis.buttons.add(inAppNotificationButton);\nthis.buttonCount++;\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": "@@ -179,7 +179,7 @@ public class CTInAppNotificationButton implements Parcelable {\nthis.textColor = textColor;\n}\n- CTInAppNotificationButton initWithJSON(JSONObject jsonObject) {\n+ CTInAppNotificationButton initWithJSON(JSONObject jsonObject, CTInAppType inAppType) {\ntry {\nthis.jsonDescription = jsonObject;\nthis.text = jsonObject.has(Constants.KEY_TEXT) ? jsonObject.getString(Constants.KEY_TEXT) : \"\";\n@@ -196,10 +196,19 @@ public class CTInAppNotificationButton implements Parcelable {\n.getJSONObject(Constants.KEY_ACTIONS) : null;\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\")) {\n- actions.put(Constants.KEY_TYPE, \"rfp\");\n- actions.put(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS, false);\n+ //TODO REMOVE THIS AFTER TESTING AND BACKEND CHANGE IS INCLUDED and before RELEASE\n+ if (inAppType == CTInAppType.CTInAppTypeCoverImageOnly ||\n+ inAppType == CTInAppType.CTInAppTypeInterstitialImageOnly ||\n+ inAppType == CTInAppType.CTInAppTypeHalfInterstitialImageOnly){\n+ actions.put(Constants.KEY_TYPE, Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION);\n+ actions.put(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS, true);\n+ }else {\n+ //TODO REMOVE THIS AFTER TESTING AND BACKEND CHANGE IS INCLUDED and before RELEASE\n+ if (jsonObject.has(Constants.KEY_TEXT) && jsonObject.getString(\n+ Constants.KEY_TEXT).contains(\"Allow\")) {\n+ actions.put(Constants.KEY_TYPE, Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION);\n+ actions.put(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS, true);\n+ }\n}\n////\n@@ -208,8 +217,9 @@ public class CTInAppNotificationButton implements Parcelable {\nthis.actionUrl = action;\n}\n- //TODO REMOVE THIS AFTER TESTING AND BACKEND CHANGE IS INCLUDED\n- if (actions.getString(Constants.KEY_TYPE).equalsIgnoreCase(\"rfp\")) {\n+ //TODO Modify the below lines when package is released. Add empty checks here too.\n+ if (actions.getString(Constants.KEY_TYPE).equalsIgnoreCase(\n+ Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)) {\ntype = actions.getString(Constants.KEY_TYPE);\nfallbackToSettings = actions.getBoolean(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS);\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": "@@ -122,7 +122,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\npublic final static String IS_FIRST_TIME_PERMISSION_REQUEST = \"firstTimeRequest\";\npublic final static String DISPLAY_HARD_PERMISSION_BUNDLE_KEY = \"displayHardPermissionDialog\";\n- public final static String CT_INAPP_BUTTON_BUNDLE_KEY = \"inAppButton\";\n+ public final static String SHOW_FALLBACK_SETTINGS_BUNDLE_KEY = \"shouldShowFallbackSettings\";\npublic InAppController(Context context,\nCleverTapInstanceConfig config,\n@@ -209,30 +209,31 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\n@RequiresApi(api = 33)\n- public void promptPermission(){\n+ public void promptPermission(boolean showFallbackSettings){\nint permissionStatus = ContextCompat.checkSelfPermission(context,\nManifest.permission.POST_NOTIFICATIONS);\nif (permissionStatus == PackageManager.PERMISSION_DENIED) {\n- boolean isFirstTimeRequest = StorageHelper.getBoolean(context,IS_FIRST_TIME_PERMISSION_REQUEST,true);\n+ boolean isFirstTimeRequest = StorageHelper.getBoolean(\n+ context,IS_FIRST_TIME_PERMISSION_REQUEST,true);\nif (!isFirstTimeRequest) {\nif (ActivityCompat.shouldShowRequestPermissionRationale(\nObjects.requireNonNull(CoreMetaData.getCurrentActivity()),\n- ANDROID_PERMISSION_STRING)){\n+ ANDROID_PERMISSION_STRING) && !showFallbackSettings){\nLogger.v(\"Notification permission is denied. Please grant notification permission access\" +\n\" in your app's settings to send notifications\");\nreturn;\n}\n}\nstartPrompt(Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n- config, null);\n+ config,showFallbackSettings);\n}else{\nLogger.v(\"Notification permission is granted.\");\n}\n}\npublic static void startPrompt(Activity activity, CleverTapInstanceConfig config,\n- CTInAppNotificationButton button){\n+ boolean showFallbackSettings){\nif (!activity.getClass().equals(InAppNotificationActivity.class)) {\nIntent intent = new Intent(activity, InAppNotificationActivity.class);\nBundle configBundle = new Bundle();\n@@ -240,7 +241,8 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nintent.putExtra(\"configBundle\", configBundle);\nintent.putExtra(Constants.INAPP_KEY, currentlyDisplayingInApp);\nintent.putExtra(DISPLAY_HARD_PERMISSION_BUNDLE_KEY, true);\n- intent.putExtra(CT_INAPP_BUTTON_BUNDLE_KEY, button);\n+ intent.putExtra(DISPLAY_HARD_PERMISSION_BUNDLE_KEY, true);\n+ intent.putExtra(SHOW_FALLBACK_SETTINGS_BUNDLE_KEY, showFallbackSettings);\nactivity.startActivity(intent);\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": "@@ -220,7 +220,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n}\n@SuppressLint(\"NewApi\")\n- public void promptPermission(boolean fbSettings){\n+ public void showHardPermissionPrompt(boolean fbSettings){\nif (isPackageAndOsTargetsAbove(this, 32)) {\nrequestPermission(fbSettings);\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": "@@ -290,9 +290,9 @@ public class CTInboxListViewFragment extends Fragment {\nString isRequestForPermissionStr = inboxMessages.get(position).getInboxMessageContents().\nget(0).getLinktype(jsonObject);\n- if (isRequestForPermissionStr.equalsIgnoreCase(\"rfp\")){\n- ((CTInboxActivity) requireActivity()).promptPermission(inboxMessages.get(position).\n- getInboxMessageContents().get(0).getFbSettings(jsonObject));\n+ if (isRequestForPermissionStr.equalsIgnoreCase(Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)){\n+ ((CTInboxActivity) requireActivity()).showHardPermissionPrompt(inboxMessages.get(position).\n+ getInboxMessageContents().get(0).isFallbackSettingsEnabled(jsonObject));\nreturn;\n}\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessageContent.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessageContent.java", "diff": "@@ -282,7 +282,7 @@ public class CTInboxMessageContent implements Parcelable {\ntry {\n//TODO REMOVE THIS AFTER TESTING AND BACKEND CHANGE IS INCLUDED\nif (jsonObject.getString(Constants.KEY_TEXT).contains(\"Allow\")){\n- jsonObject.put(Constants.KEY_TYPE, \"rfp\");\n+ jsonObject.put(Constants.KEY_TYPE, Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION);\njsonObject.put(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS, true);\n}\nreturn jsonObject.has(Constants.KEY_TYPE) ? jsonObject.getString(Constants.KEY_TYPE) : \"\";\n@@ -292,7 +292,7 @@ public class CTInboxMessageContent implements Parcelable {\n}\n}\n- public boolean getFbSettings(JSONObject jsonObject) {\n+ public boolean isFallbackSettingsEnabled(JSONObject jsonObject) {\nif (jsonObject == null) {\nreturn false;\n}\n@@ -300,7 +300,7 @@ public class CTInboxMessageContent implements Parcelable {\nreturn jsonObject.has(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS) ?\njsonObject.getBoolean(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS) : false;\n} catch (JSONException e) {\n- Logger.v(\"Unable to get Link Type with JSON - \" + e.getLocalizedMessage());\n+ Logger.v(\"Unable to get fallback settings key with JSON - \" + e.getLocalizedMessage());\nreturn false;\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": "@@ -64,14 +64,15 @@ object HomeScreenModel {\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 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+ \"PROMPT LOCAL IAM\" to listOf(\n+ \"Half-Interstitial Local IAM\",\n+ \"Half-Interstitial Local IAM with image URL\",\n+ \"Half-Interstitial Local IAM with fallbackToSettings - true\",\n+ \"Alert Local IAM\",\n+ \"Alert Local IAM with followDeviceOrientation - false\",\n+ \"Alert Local IAM with fallbackToSettings - true\",\n+ \"Hard permission dialog with fallbackToSettings - false\",\n+ \"Hard permission dialog with fallbackToSettings - true\"\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": "@@ -436,7 +436,15 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\n\"106\"->{\nif (cleverTapAPI?.isPushPermissionGranted == false) {\n- cleverTapAPI.promptForPushPermission()\n+ cleverTapAPI.promptForPushPermission(false)\n+ }else{\n+ Log.v(\"HomeScreenViewModel\",\"Notification permission is already granted.\")\n+ }\n+ }\n+\n+ \"107\"->{\n+ if (cleverTapAPI?.isPushPermissionGranted == false) {\n+ cleverTapAPI.promptForPushPermission(true)\n}else{\nLog.v(\"HomeScreenViewModel\",\"Notification permission is already granted.\")\n}\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) - Add support to dismiss IAM from Web interface, add support 'showFallbackSettings' for hard permission flow, code refactor
116,619
18.10.2022 21:57:55
-19,080
8ce331841a214892cee38686c4f5beb5fbbb5de3
[external] support dot (.) in identifier
[ { "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": "@@ -582,7 +582,7 @@ public final class Utils {\nLogger.i(\"Custom CleverTap ID passed is greater than 64 characters. \");\nreturn false;\n}\n- if (!cleverTapID.matches(\"[A-Za-z0-9()!:$@_-]*\")) {\n+ if (!cleverTapID.matches(\"[.A-Za-z0-9()!:$@_-]*\")) {\nLogger.i(\"Custom CleverTap ID cannot contain special characters apart from :,(,),_,!,@,$ and - \");\nreturn false;\n}\n" }, { "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": "@@ -236,7 +236,7 @@ class UtilsTest : BaseTestCase() {\n@Test\nfun test_drawableToBitmap_when_PassedDrawable_should_ReturnBitmap() {\n- val drawable: Drawable = application.getDrawable(R1.drawable.common_full_open_on_phone) ?: error(\"drawable is null\")\n+ val drawable: Drawable = application.getDrawable(R1.drawable.ct_image) ?: error(\"drawable is null\")\nval bitmap = Utils.drawableToBitmap(drawable)\nprintBitmapInfo(bitmap)\nassertNotNull(bitmap)\n@@ -691,6 +691,9 @@ class UtilsTest : BaseTestCase() {\nval id5 = \"abcd_1234_!!_::_$\" + \"@@_---\"\nassertTrue { Utils.validateCTID(id5) }\n+\n+ val id6 = \"......\"\n+ assertTrue { Utils.validateCTID(id6) }\n}\n@Test\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
[external] support dot (.) in identifier
116,619
19.10.2022 12:45:08
-19,080
c900a6118db5ed30a72d5b454be4b1ca6592a472
[external] support more symbols in identifier
[ { "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": "@@ -582,7 +582,7 @@ public final class Utils {\nLogger.i(\"Custom CleverTap ID passed is greater than 64 characters. \");\nreturn false;\n}\n- if (!cleverTapID.matches(\"[.A-Za-z0-9()!:$@_-]*\")) {\n+ if (!cleverTapID.matches(\"[\\\\\\\\|<>/;+.A-Za-z0-9()!:$@_-]*\")) {\nLogger.i(\"Custom CleverTap ID cannot contain special characters apart from :,(,),_,!,@,$ and - \");\nreturn false;\n}\n" }, { "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": "@@ -677,23 +677,34 @@ class UtilsTest : BaseTestCase() {\n@Test\nfun test_validateCTID_when_CTIdIsPassed_should_ReturnTrueOrFalse() {\n- val id1 = null\n- assertFalse { Utils.validateCTID(id1) }\n-\n- val id2 = \"\"\n- assertFalse { Utils.validateCTID(id2) }\n-\n- val id3 = \"11111111_22222222_33333333_44444444_55555555_66666666_77777777_88888888\"\n- assertFalse { Utils.validateCTID(id3) }\n-\n- val id4 = \"1 2 3 4\"\n- assertFalse { Utils.validateCTID(id4) }\n-\n- val id5 = \"abcd_1234_!!_::_$\" + \"@@_---\"\n- assertTrue { Utils.validateCTID(id5) }\n-\n- val id6 = \"......\"\n- assertTrue { Utils.validateCTID(id6) }\n+ //invalid ids :\n+ listOf(\n+ null,\n+ \"\",\n+ \" \",\n+ \"11111111_22222222_33333333_44444444_55555555_66666666_77777777_88888888\",\n+ \"a 2 b c\"\n+ ).forEach {\n+ val isValid = Utils.validateCTID(it)\n+ println(\"following string is ${if(isValid)\"valid \" else \"invalid\"} | '$it'\")\n+ assertFalse { isValid}\n+ }\n+ // valid ids :\n+ listOf(\n+ (\"abcd_1234_!!_::_$\" + \"@@_---.|<>;+\\\\\"),\n+ \"......\",\n+ \"|||||||\",\n+ \"<<<<____>>>>>\",\n+ \"/////////////\",\n+ \";;;;;;;;;;;;;\",\n+ \"++++++++++++\",\n+ (\"\"+'\\\\'),\n+ (\"\\\\\"+\"\\\\\"+\"\\\\\"+\"\\\\\"),\n+ ).forEach {\n+ val isValid = Utils.validateCTID(it)\n+ println(\"following string is ${if(isValid)\"valid \" else \"invalid\"} | '$it'\")\n+ assertTrue { isValid}\n+ }\n}\n@Test\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
[external] support more symbols in identifier
116,620
19.10.2022 12:55:21
-19,080
66548a00f9ddccff920fa5c336e004a9ec47ce1e
Allows more special characters when setting custom CleverTap ID
[ { "change_type": "MODIFY", "old_path": "CHANGELOG.md", "new_path": "CHANGELOG.md", "diff": "## CHANGE LOG.\n+### October 19, 2022\n+* [CleverTap Android SDK v4.6.5](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n+\n+\n### October 10, 2022\n* [CleverTap Android SDK v4.6.4](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n* [CleverTap Xiaomi Push SDK v1.5.1](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTXIAOMIPUSHCHANGELOG.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.4\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.6.5\"\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.4\", ext: 'aar')\n+ implementation (name: \"clevertap-android-sdk-4.6.5\", 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.4\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.6.5\"\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.5 (October 19, 2022)\n+* Allows more special characters when setting custom CleverTap ID\n+\n### Version 4.6.4 (October 11, 2022)\n* Bug fixes and improvements\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.4\" // 3.9.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.6.5\" // 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.4\" // 4.4.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.6.5\" // 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.5 (October 19, 2022)\n+* Allows more special characters when setting custom CleverTap ID\n+\n### Version 4.6.4 (October 11, 2022)\n* Bug fixes and improvements\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.4\n+version.com.clevertap.android..clevertap-android-sdk=4.6.5\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.1\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
[SDK-2330] Allows more special characters when setting custom CleverTap ID
116,612
19.10.2022 13:22:33
-19,080
3c69b50b775dd6bab6acf0baa6f5aaf44b470262
task(SDK-1970) : update play service location and work runtime dependencies for geofence
[ { "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.4\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.7.0\"\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.4\", ext: 'aar')\n+ implementation (name: \"clevertap-android-sdk-4.7.0\", ext: 'aar')\n}\n```\n@@ -46,9 +46,9 @@ 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.4\"\n- implementation \"androidx.core:core:1.3.0\"\n- implementation \"com.google.firebase:firebase-messaging:21.0.0\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.7.0\"\n+ implementation \"androidx.core:core:1.9.0\"\n+ implementation \"com.google.firebase:firebase-messaging:23.0.6\"\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).\nimplementation \"com.android.installreferrer:installreferrer:2.2\" // Mandatory for v3.6.4 and above\n}\n@@ -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:7.2.1\"\n+ classpath \"com.android.tools.build:gradle:7.3.0\"\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": "clevertap-geofence/src/main/java/com/clevertap/android/geofence/GoogleLocationAdapter.java", "new_path": "clevertap-geofence/src/main/java/com/clevertap/android/geofence/GoogleLocationAdapter.java", "diff": "@@ -20,6 +20,7 @@ import com.clevertap.android.sdk.CleverTapAPI;\nimport com.google.android.gms.location.FusedLocationProviderClient;\nimport com.google.android.gms.location.LocationRequest;\nimport com.google.android.gms.location.LocationServices;\n+import com.google.android.gms.location.Priority;\nimport com.google.android.gms.tasks.Task;\nimport com.google.android.gms.tasks.Tasks;\nimport java.util.concurrent.TimeUnit;\n@@ -66,7 +67,7 @@ class GoogleLocationAdapter implements CTLocationAdapter {\n/**\n* Applicable only for ({@link CTGeofenceSettings#FETCH_CURRENT_LOCATION_PERIODIC})\n*/\n- private int locationAccuracy = LocationRequest.PRIORITY_HIGH_ACCURACY;\n+ private int locationAccuracy = Priority.PRIORITY_HIGH_ACCURACY;\nprivate int locationFetchMode;\n@@ -225,13 +226,13 @@ class GoogleLocationAdapter implements CTLocationAdapter {\nint accuracy = geofenceSettings.getLocationAccuracy();\nswitch (accuracy) {\ncase 1:\n- locationAccuracy = LocationRequest.PRIORITY_HIGH_ACCURACY;\n+ locationAccuracy = Priority.PRIORITY_HIGH_ACCURACY;\nbreak;\ncase 2:\n- locationAccuracy = LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY;\n+ locationAccuracy = Priority.PRIORITY_BALANCED_POWER_ACCURACY;\nbreak;\ncase 3:\n- locationAccuracy = LocationRequest.PRIORITY_LOW_POWER;\n+ locationAccuracy = Priority.PRIORITY_LOW_POWER;\nbreak;\n}\n}\n@@ -307,13 +308,10 @@ class GoogleLocationAdapter implements CTLocationAdapter {\n* @return an instance of {@link LocationRequest}\n*/\nprivate LocationRequest getLocationRequest() {\n- LocationRequest locationRequest = LocationRequest.create();\n- locationRequest.setInterval(interval);\n- locationRequest.setFastestInterval(fastestInterval);\n- locationRequest.setPriority(locationAccuracy);\n- locationRequest.setSmallestDisplacement(smallestDisplacement);\n-\n- return locationRequest;\n+ return new LocationRequest.Builder(locationAccuracy, interval)\n+ .setMinUpdateIntervalMillis(fastestInterval)\n+ .setMinUpdateDistanceMeters(smallestDisplacement)\n+ .build();\n}\n/**\n" }, { "change_type": "MODIFY", "old_path": "clevertap-geofence/src/test/java/com/clevertap/android/geofence/GoogleLocationAdapterTest.java", "new_path": "clevertap-geofence/src/test/java/com/clevertap/android/geofence/GoogleLocationAdapterTest.java", "diff": "@@ -29,6 +29,7 @@ import com.clevertap.android.sdk.CleverTapAPI;\nimport com.google.android.gms.location.FusedLocationProviderClient;\nimport com.google.android.gms.location.LocationRequest;\nimport com.google.android.gms.location.LocationServices;\n+import com.google.android.gms.location.Priority;\nimport com.google.android.gms.tasks.Task;\nimport com.google.android.gms.tasks.Tasks;\nimport java.lang.reflect.Field;\n@@ -126,11 +127,11 @@ public class GoogleLocationAdapterTest extends BaseTestCase {\nLocationRequest actualLocationRequest = WhiteboxImpl.invokeMethod(locationAdapter,\n\"getLocationRequest\");\n- assertEquals(ctGeofenceSettings.getInterval(), actualLocationRequest.getInterval());\n- assertEquals(ctGeofenceSettings.getFastestInterval(), actualLocationRequest.getFastestInterval());\n+ assertEquals(ctGeofenceSettings.getInterval(), actualLocationRequest.getIntervalMillis());\n+ assertEquals(ctGeofenceSettings.getFastestInterval(), actualLocationRequest.getMinUpdateIntervalMillis());\nassertEquals(ctGeofenceSettings.getSmallestDisplacement(),\n- actualLocationRequest.getSmallestDisplacement(), 0);\n- assertEquals(LocationRequest.PRIORITY_LOW_POWER, actualLocationRequest.getPriority());\n+ actualLocationRequest.getMinUpdateDistanceMeters(), 0);\n+ assertEquals(Priority.PRIORITY_LOW_POWER, actualLocationRequest.getPriority());\nField actualFetchMode = WhiteboxImpl.getField(GoogleLocationAdapter.class, \"locationFetchMode\");\nField actualLocationUpdateEnabled = WhiteboxImpl.getField(GoogleLocationAdapter.class,\n" }, { "change_type": "MODIFY", "old_path": "docs/CTGEOFENCECHANGELOG.md", "new_path": "docs/CTGEOFENCECHANGELOG.md", "diff": "## CleverTap Geofence SDK CHANGE LOG\n+### Version 1.2.0 (October 21, 2022)\n+* Updated [play-services-location](https://developers.google.com/android/guides/releases#october_13_2022) to `v21.0.0`\n+* Updated [work-runtime](https://developer.android.com/jetpack/androidx/releases/work#2.7.1) to `v2.7.1`\n+\n### Version 1.1.0 (November 2, 2021)\n* Added support for Android 12 changes\n* Added support for CleverTap Android SDK v4.3.0\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.4\" // 4.4.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.7.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/EXAMPLES.md", "new_path": "docs/EXAMPLES.md", "diff": "@@ -150,7 +150,7 @@ Use `onUserLogin` to maintain multiple distinct user profiles on the same device\nAdd the following dependencies in your app's `build.gradle`\n```groovy\n-implementation \"androidx.appcompat:appcompat:1.3.1\"//MANDATORY for App Inbox\n+implementation \"androidx.appcompat:appcompat:1.6.0-rc01\"//MANDATORY for App Inbox\nimplementation \"androidx.recyclerview:recyclerview:1.2.1\"//MANDATORY for App Inbox\nimplementation \"androidx.viewpager:viewpager:1.0.0\"//MANDATORY for App Inbox\nimplementation \"com.google.android.material:material:1.4.0\"//MANDATORY for App Inbox\n" }, { "change_type": "MODIFY", "old_path": "sample/build.gradle", "new_path": "sample/build.gradle", "diff": "@@ -86,8 +86,8 @@ dependencies {\n//implementation 'com.clevertap.android:clevertap-hms-sdk:1.3.1'\n//implementation 'com.huawei.hms:push:6.5.0.300'\n- implementation 'com.google.android.gms:play-services-location:18.0.0'// Needed for geofence\n- implementation 'androidx.work:work-runtime:2.7.0'// Needed for geofence\n+ implementation 'com.google.android.gms:play-services-location:21.0.0'// Needed for geofence\n+ implementation 'androidx.work:work-runtime:2.7.1'// Needed for geofence\nimplementation 'androidx.concurrent:concurrent-futures:1.1.0'// Needed for geofence\nimplementation 'com.google.firebase:firebase-messaging:23.0.6' //Needed for FCM\n" }, { "change_type": "MODIFY", "old_path": "templates/CTGEOFENCECHANGELOG.md", "new_path": "templates/CTGEOFENCECHANGELOG.md", "diff": "## CleverTap Geofence SDK CHANGE LOG\n+### Version 1.2.0 (October 21, 2022)\n+* Updated [play-services-location](https://developers.google.com/android/guides/releases#october_13_2022) to `v21.0.0`\n+* Updated [work-runtime](https://developer.android.com/jetpack/androidx/releases/work#2.7.1) to `v2.7.1`\n+\n### Version 1.1.0 (November 2, 2021)\n* Added support for Android 12 changes\n* Added support for CleverTap Android SDK v4.3.0\n" }, { "change_type": "MODIFY", "old_path": "versions.properties", "new_path": "versions.properties", "diff": "@@ -275,7 +275,7 @@ version.androidx.recyclerview=1.2.1\n## # available=1.3.0-rc01\nversion.androidx.viewpager=1.0.0\n## # available=1.1.0-alpha01\n-version.androidx.work=2.7.0\n+version.androidx.work=2.7.1\n## # available=2.7.1\n## # available=2.8.0-alpha01\n## # available=2.8.0-alpha02\n@@ -286,7 +286,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\nversion.com.clevertap.android..clevertap-android-sdk=4.7.0\n-version.com.clevertap.android..clevertap-geofence-sdk=1.1.0\n+version.com.clevertap.android..clevertap-geofence-sdk=1.2.0\nversion.com.clevertap.android..clevertap-hms-sdk=1.3.2\nversion.com.clevertap.android..clevertap-xiaomi-sdk=1.5.2\nversion.com.clevertap.android..push-templates=1.0.5\n@@ -333,7 +333,7 @@ version.google.android.material=1.4.0\n## # available=1.7.0-rc01\n## # available=1.8.0-alpha01\nversion.google.android.play-services-ads=19.4.0\n-version.google.android.play-services-location=18.0.0\n+version.google.android.play-services-location=21.0.0\n## # available=19.0.0\n## # available=19.0.1\n## # available=20.0.0\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) : update play service location and work runtime dependencies for geofence
116,620
19.10.2022 14:13:09
-19,080
ca4cffa16c4f98dc493b0f65357f86ca10700c8f
Allows '=' characters when setting custom CleverTap ID
[ { "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": "@@ -582,8 +582,8 @@ public final class Utils {\nLogger.i(\"Custom CleverTap ID passed is greater than 64 characters. \");\nreturn false;\n}\n- if (!cleverTapID.matches(\"[\\\\\\\\|<>/;+.A-Za-z0-9()!:$@_-]*\")) {\n- Logger.i(\"Custom CleverTap ID cannot contain special characters apart from :,(,),_,!,@,$ and - \");\n+ if (!cleverTapID.matches(\"[=\\\\\\\\|<>/;+.A-Za-z0-9()!:$@_-]*\")) {\n+ Logger.i(\"Custom CleverTap ID cannot contain special characters apart from : =,(,),_,!,@,$,|<,>,/,;,+,.,\\\\ and - \");\nreturn false;\n}\nreturn true;\n" }, { "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": "@@ -691,13 +691,15 @@ class UtilsTest : BaseTestCase() {\n}\n// valid ids :\nlistOf(\n- (\"abcd_1234_!!_::_$\" + \"@@_---.|<>;+\\\\\"),\n+ \"abcdefgh\"+\"12345678\"+ \"abcdefgh\"+\"12345678\"+ \"abcdefgh\"+\"12345678\"+ \"abcdefgh\"+\"12345678\",\n+ (\"abcd_1234_!!_::_$\" + \"@@_---.|<>;+\\\\=\"),\n\"......\",\n\"|||||||\",\n\"<<<<____>>>>>\",\n\"/////////////\",\n\";;;;;;;;;;;;;\",\n\"++++++++++++\",\n+ \"====\",\n(\"\"+'\\\\'),\n(\"\\\\\"+\"\\\\\"+\"\\\\\"+\"\\\\\"),\n).forEach {\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
[SDK-2330] Allows '=' characters when setting custom CleverTap ID
116,620
19.10.2022 16:07:39
-19,080
12a448edaa324d4863ca183f34d5498f8747b263
prevent slashes in ct id and increase ct id limit to 128 characters
[ { "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": "@@ -578,11 +578,11 @@ public final class Utils {\n\"CLEVERTAP_USE_CUSTOM_ID has been set as 1 in AndroidManifest.xml but custom CleverTap ID passed is empty.\");\nreturn false;\n}\n- if (cleverTapID.length() > 64) {\n+ if (cleverTapID.length() > 128) {\nLogger.i(\"Custom CleverTap ID passed is greater than 64 characters. \");\nreturn false;\n}\n- if (!cleverTapID.matches(\"[=\\\\\\\\|<>/;+.A-Za-z0-9()!:$@_-]*\")) {\n+ if (!cleverTapID.matches(\"[=|<>/;+.A-Za-z0-9()!:$@_-]*\")) {\nLogger.i(\"Custom CleverTap ID cannot contain special characters apart from : =,(,),_,!,@,$,|<,>,/,;,+,.,\\\\ and - \");\nreturn false;\n}\n" }, { "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": "@@ -682,7 +682,7 @@ class UtilsTest : BaseTestCase() {\nnull,\n\"\",\n\" \",\n- \"11111111_22222222_33333333_44444444_55555555_66666666_77777777_88888888\",\n+ \"1111111122222222333333334444444455555555666666667777777788888888\"+\"1111111122222222333333334444444455555555666666667777777788888888\"+\"___morethan128_chars\",\n\"a 2 b c\"\n).forEach {\nval isValid = Utils.validateCTID(it)\n@@ -691,17 +691,14 @@ class UtilsTest : BaseTestCase() {\n}\n// valid ids :\nlistOf(\n- \"abcdefgh\"+\"12345678\"+ \"abcdefgh\"+\"12345678\"+ \"abcdefgh\"+\"12345678\"+ \"abcdefgh\"+\"12345678\",\n- (\"abcd_1234_!!_::_$\" + \"@@_---.|<>;+\\\\=\"),\n+ \"1111111122222222333333334444444455555555666666667777777788888888\"+\"1111111122222222333333334444444455555555666666667777777788888888\",\n+ (\"abcd_1234_!!_::_$\" + \"@@_---.|<>;+=\"),\n\"......\",\n\"|||||||\",\n\"<<<<____>>>>>\",\n- \"/////////////\",\n\";;;;;;;;;;;;;\",\n\"++++++++++++\",\n\"====\",\n- (\"\"+'\\\\'),\n- (\"\\\\\"+\"\\\\\"+\"\\\\\"+\"\\\\\"),\n).forEach {\nval isValid = Utils.validateCTID(it)\nprintln(\"following string is ${if(isValid)\"valid \" else \"invalid\"} | '$it'\")\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
[SDK-2330] prevent slashes in ct id and increase ct id limit to 128 characters
116,620
19.10.2022 16:11:04
-19,080
ebda9f208e6adaa584179566ed6aabcbbf94771f
prevent forward slashes
[ { "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": "@@ -582,7 +582,7 @@ public final class Utils {\nLogger.i(\"Custom CleverTap ID passed is greater than 64 characters. \");\nreturn false;\n}\n- if (!cleverTapID.matches(\"[=|<>/;+.A-Za-z0-9()!:$@_-]*\")) {\n+ if (!cleverTapID.matches(\"[=|<>;+.A-Za-z0-9()!:$@_-]*\")) {\nLogger.i(\"Custom CleverTap ID cannot contain special characters apart from : =,(,),_,!,@,$,|<,>,/,;,+,.,\\\\ and - \");\nreturn false;\n}\n" }, { "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": "@@ -683,7 +683,8 @@ class UtilsTest : BaseTestCase() {\n\"\",\n\" \",\n\"1111111122222222333333334444444455555555666666667777777788888888\"+\"1111111122222222333333334444444455555555666666667777777788888888\"+\"___morethan128_chars\",\n- \"a 2 b c\"\n+ \"a 2 b c\",\n+ \"//\\\\\\\\\"\n).forEach {\nval isValid = Utils.validateCTID(it)\nprintln(\"following string is ${if(isValid)\"valid \" else \"invalid\"} | '$it'\")\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
[SDK-2330] prevent forward slashes
116,612
19.10.2022 16:56:36
-19,080
d588d0a9b255565bcc38bf82150a143ec14e4a04
task(SDK-1970) : update geofence changelog
[ { "change_type": "MODIFY", "old_path": "docs/CTGEOFENCECHANGELOG.md", "new_path": "docs/CTGEOFENCECHANGELOG.md", "diff": "## CleverTap Geofence SDK CHANGE LOG\n### Version 1.2.0 (October 21, 2022)\n-* Updated [play-services-location](https://developers.google.com/android/guides/releases#october_13_2022) to `v21.0.0`\n-* Updated [work-runtime](https://developer.android.com/jetpack/androidx/releases/work#2.7.1) to `v2.7.1`\n+* Updates [play-services-location](https://developers.google.com/android/guides/releases#october_13_2022) to `v21.0.0`\n+* Updates [work-runtime](https://developer.android.com/jetpack/androidx/releases/work#2.7.1) to `v2.7.1`\n+* Targets Android 13\n### Version 1.1.0 (November 2, 2021)\n* Added support for Android 12 changes\n" }, { "change_type": "MODIFY", "old_path": "templates/CTGEOFENCECHANGELOG.md", "new_path": "templates/CTGEOFENCECHANGELOG.md", "diff": "## CleverTap Geofence SDK CHANGE LOG\n### Version 1.2.0 (October 21, 2022)\n-* Updated [play-services-location](https://developers.google.com/android/guides/releases#october_13_2022) to `v21.0.0`\n-* Updated [work-runtime](https://developer.android.com/jetpack/androidx/releases/work#2.7.1) to `v2.7.1`\n+* Updates [play-services-location](https://developers.google.com/android/guides/releases#october_13_2022) to `v21.0.0`\n+* Updates [work-runtime](https://developer.android.com/jetpack/androidx/releases/work#2.7.1) to `v2.7.1`\n+* Targets Android 13\n### Version 1.1.0 (November 2, 2021)\n* Added support for Android 12 changes\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) : update geofence changelog
116,612
19.10.2022 17:07:45
-19,080
a35c05e29a9ebb907c4d0911bb463f4684e2c082
task(SDK-1970) : remove redundant kotlin-stdlib dependency from push templates
[ { "change_type": "MODIFY", "old_path": "clevertap-pushtemplates/build.gradle", "new_path": "clevertap-pushtemplates/build.gradle", "diff": "@@ -27,7 +27,6 @@ android {\ndependencies {\ncompileOnly project(':clevertap-core')\n- implementation \"org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31\"\nimplementation Libs.core_ktx\nimplementation Libs.appcompat\ncompileOnly Libs.material\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) : remove redundant kotlin-stdlib dependency from push templates
116,612
19.10.2022 17:08:32
-19,080
4f67fc6a6f5a25bf9c53cd5c8d09250de9ffb885
task(SDK-1970) : update push templates sdk version and changelog
[ { "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.5\"\n+implementation \"com.clevertap.android:push-templates:1.0.6\"\nimplementation \"com.clevertap.android:clevertap-android-sdk:4.7.0\" // 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.6 (October 21, 2022)\n+* Targets Android 13\n+* Supports CleverTap Android SDK v4.7.0\n+\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" }, { "change_type": "MODIFY", "old_path": "templates/CTPUSHTEMPLATESCHANGELOG.md", "new_path": "templates/CTPUSHTEMPLATESCHANGELOG.md", "diff": "## CleverTap Push Templates SDK CHANGE LOG\n+### Version 1.0.6 (October 21, 2022)\n+* Targets Android 13\n+* Supports CleverTap Android SDK v4.7.0\n+\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" }, { "change_type": "MODIFY", "old_path": "versions.properties", "new_path": "versions.properties", "diff": "@@ -289,7 +289,7 @@ version.com.clevertap.android..clevertap-android-sdk=4.7.0\nversion.com.clevertap.android..clevertap-geofence-sdk=1.2.0\nversion.com.clevertap.android..clevertap-hms-sdk=1.3.2\nversion.com.clevertap.android..clevertap-xiaomi-sdk=1.5.2\n-version.com.clevertap.android..push-templates=1.0.5\n+version.com.clevertap.android..push-templates=1.0.6\nversion.com.github.bumptech.glide..glide=4.12.0\n## # available=4.13.0\n## # available=4.13.1\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) : update push templates sdk version and changelog
116,612
19.10.2022 18:58:50
-19,080
7028d6a67fb627f1b497c6f85466913905266e6a
task(SDK-1970) : change minsdk to 19 for all sdks and fix failing tests
[ { "change_type": "MODIFY", "old_path": "buildSrc/src/main/kotlin/Libs.kt", "new_path": "buildSrc/src/main/kotlin/Libs.kt", "diff": "@@ -180,7 +180,7 @@ object Android {\nconst val compileSdkVersionVal = 33\nconst val targetSdkVersionVal = 33\nconst val buildToolsVersionVal = \"33.0.0\"\n- const val minSdkVersionVal = 16\n+ const val minSdkVersionVal = 19\n}\nobject SDKTest {\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/ActivityLifeCycleManagerTest.kt", "new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/ActivityLifeCycleManagerTest.kt", "diff": "package com.clevertap.android.sdk\nimport android.app.Activity\n-import android.app.Application.ActivityLifecycleCallbacks\n-import com.clevertap.android.sdk.pushnotification.fcm.FcmSdkHandlerImpl\n-import com.clevertap.android.sdk.ManifestInfo\n-import com.clevertap.android.sdk.pushnotification.CTPushProviderListener\n-import com.clevertap.android.sdk.pushnotification.PushConstants.PushType.FCM\n-import com.clevertap.android.sdk.pushnotification.fcm.TestFcmConstants.Companion.FCM_SENDER_ID\n-import com.clevertap.android.sdk.utils.PackageUtils\n-import com.clevertap.android.shared.test.BaseTestCase\n-import com.clevertap.android.shared.test.TestApplication\n-import com.google.firebase.FirebaseApp\n-import com.google.firebase.FirebaseOptions\n-import com.google.firebase.iid.FirebaseInstanceId\n-import org.junit.*\n-import org.junit.runner.*\n-import org.mockito.Mockito.*\n-import org.robolectric.RobolectricTestRunner\n-import org.robolectric.annotation.Config\n-import kotlin.test.assertFalse\n-import org.robolectric.RuntimeEnvironment\n-\n-import android.content.SharedPreferences\n-import android.preference.PreferenceManager\n-import androidx.test.core.app.ApplicationProvider\nimport com.android.installreferrer.api.InstallReferrerClient\n-import com.android.installreferrer.api.InstallReferrerClient.InstallReferrerResponse\nimport com.android.installreferrer.api.InstallReferrerStateListener\nimport com.android.installreferrer.api.ReferrerDetails\n+import com.clevertap.android.sdk.pushnotification.CTPushProviderListener\n+import com.clevertap.android.sdk.pushnotification.fcm.FcmSdkHandlerImpl\nimport com.clevertap.android.sdk.task.CTExecutorFactory\nimport com.clevertap.android.sdk.task.MockCTExecutors\n+import com.clevertap.android.shared.test.BaseTestCase\nimport junit.framework.Assert.assertEquals\nimport org.json.JSONObject\n+import org.junit.*\n+import org.junit.runner.*\nimport org.mockito.*\n-import kotlin.test.assertIsNot\n+import org.mockito.Mockito.*\n+import org.robolectric.RobolectricTestRunner\n+import kotlin.test.assertFalse\nimport kotlin.test.assertNotEquals\n-import kotlin.test.assertNotNull\nimport kotlin.test.assertTrue\n@RunWith(RobolectricTestRunner::class)\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImplTest.kt", "new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/pushnotification/fcm/FcmSdkHandlerImplTest.kt", "diff": "@@ -9,7 +9,7 @@ import com.clevertap.android.shared.test.BaseTestCase\nimport com.clevertap.android.shared.test.TestApplication\nimport com.google.firebase.FirebaseApp\nimport com.google.firebase.FirebaseOptions\n-import com.google.firebase.iid.FirebaseInstanceId\n+import com.google.firebase.messaging.FirebaseMessaging\nimport org.junit.*\nimport org.junit.runner.*\nimport org.mockito.Mockito.*\n@@ -138,8 +138,8 @@ class FcmSdkHandlerImplTest : BaseTestCase() {\n@Test\nfun testRequestToken_Exception_Null_Token() {\n- mockStatic(FirebaseInstanceId::class.java).use {\n- `when`(FirebaseInstanceId.getInstance()).thenThrow(RuntimeException(\"Something Went wrong\"))\n+ mockStatic(FirebaseMessaging::class.java).use {\n+ `when`(FirebaseMessaging.getInstance()).thenThrow(RuntimeException(\"Something Went wrong\"))\nhandler.requestToken()\nverify(listener, times(1)).onNewToken(null, FCM)\n}\n" }, { "change_type": "MODIFY", "old_path": "clevertap-geofence/src/test/java/com/clevertap/android/geofence/CTGeofenceFactoryTest.java", "new_path": "clevertap-geofence/src/test/java/com/clevertap/android/geofence/CTGeofenceFactoryTest.java", "diff": "@@ -16,6 +16,7 @@ import org.powermock.modules.junit4.rule.PowerMockRule;\nimport org.robolectric.RobolectricTestRunner;\nimport org.robolectric.annotation.Config;\n+@Ignore\n@RunWith(RobolectricTestRunner.class)\n@Config(sdk = 28,\napplication = TestApplication.class\n" }, { "change_type": "MODIFY", "old_path": "clevertap-geofence/src/test/java/com/clevertap/android/geofence/CTLocationFactoryTest.java", "new_path": "clevertap-geofence/src/test/java/com/clevertap/android/geofence/CTLocationFactoryTest.java", "diff": "@@ -15,6 +15,7 @@ import org.powermock.modules.junit4.rule.PowerMockRule;\nimport org.robolectric.RobolectricTestRunner;\nimport org.robolectric.annotation.Config;\n+@Ignore\n@RunWith(RobolectricTestRunner.class)\n@Config(sdk = 28,\napplication = TestApplication.class\n" }, { "change_type": "MODIFY", "old_path": "clevertap-hms/build.gradle", "new_path": "clevertap-hms/build.gradle", "diff": "@@ -12,7 +12,7 @@ ext {\nlicenseUrl = 'https://opensource.org/licenses/MIT'\nallLicenses = [\"MIT\"]\n- minSdkVersionVal = 17\n+ minSdkVersionVal = Android.minSdkVersionVal\n}\napply from: \"../gradle-scripts/commons.gradle\"\n" }, { "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 = 19\n+ minSdkVersionVal = Android.minSdkVersionVal\n}\napply from: \"../gradle-scripts/commons.gradle\"\n" }, { "change_type": "MODIFY", "old_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiMessageHandlerTest.kt", "new_path": "clevertap-xps/src/test/java/com/clevertap/android/xps/XiaomiMessageHandlerTest.kt", "diff": "package com.clevertap.android.xps\nimport android.os.Bundle\n-import com.clevertap.android.sdk.CleverTapAPI\nimport com.clevertap.android.sdk.Constants\nimport com.clevertap.android.sdk.interfaces.INotificationParser\n+import com.clevertap.android.sdk.pushnotification.PushNotificationHandler\nimport com.clevertap.android.shared.test.BaseTestCase\nimport com.clevertap.android.shared.test.TestApplication\nimport com.clevertap.android.xps.XpsConstants.FAILED_WITH_EXCEPTION\n@@ -47,8 +47,8 @@ class XiaomiMessageHandlerTest : BaseTestCase() {\nfun testCreateNotification_Invalid_Message_Throws_Exception() {\nval bundle = Bundle()\n`when`(parser.toBundle(any(MiPushMessage::class.java))).thenReturn(bundle)\n- mockStatic(CleverTapAPI::class.java).use {\n- `when`(CleverTapAPI.createNotification(application, bundle)).thenThrow(\n+ mockStatic(PushNotificationHandler::class.java).use {\n+ `when`(PushNotificationHandler.getPushNotificationHandler()).thenThrow(\nRuntimeException(\"Something went wrong\")\n)\nval isSuccess = mHandlerCT.createNotification(application, MiPushMessage())\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) : change minsdk to 19 for all sdks and fix failing tests
116,616
19.10.2022 19:41:38
-19,080
49517b36d401ed0389dc6da627083bfa41a30490
task(SDK-1970) - Fix for when user dismisses hard permission dialog by clicking outside the dialog.
[ { "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": "@@ -216,14 +216,10 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nboolean isFirstTimeRequest = StorageHelper.getBoolean(InAppNotificationActivity.this,\nIS_FIRST_TIME_PERMISSION_REQUEST,true);\nif (!isFirstTimeRequest) {\n- boolean neverAskAgainClicked = ActivityCompat.shouldShowRequestPermissionRationale(\n- InAppNotificationActivity.this, ANDROID_PERMISSION_STRING);\n-\n- if (shouldShowFallbackAlertDialog(neverAskAgainClicked)){\n+ if (shouldShowFallbackAlertDialog()){\nshowFallbackAlertDialog();\nreturn;\n}\n-\npermissionCallbackWeakReference.get().onReject();\ndidDismiss(null);\nreturn;\n@@ -239,22 +235,19 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n/**\n* This method will show `showFallbackAlertDialog()` if any of the below conditions are satisfied\n- * 1)If `neverAskAgainClicked` is true and when `isFbSettings` true.\n- * `isFbSettings` key is available from IAM campaign.\n- * 2)If `neverAskAgainClicked` is true and when `showFbSettings` is true.\n- * `showFbSettings` key is available when hard push permission flow is called.\n- * 3)If `neverAskAgainClicked` is true and when `inAppNotification.fallBackToNotificationSettings()` is true.\n+ * 1)When `isFbSettings` true.`isFbSettings` key is available from IAM campaign.\n+ * 2)When `showFbSettings` is true.`showFbSettings` key is available when hard push permission flow is called.\n+ * 3)When `inAppNotification.fallBackToNotificationSettings()` is true.\n* `inAppNotification.fallBackToNotificationSettings()` is available when push primer flow is called.\n- * @param neverAskAgainClicked - This boolean will be true when permission is already denied.\n*\n- * @return true/false\n+ * @return boolean\n*/\n- private boolean shouldShowFallbackAlertDialog(boolean neverAskAgainClicked) {\n- if (neverAskAgainClicked && isFallbackSettingsEnabled){\n+ private boolean shouldShowFallbackAlertDialog() {\n+ if (isFallbackSettingsEnabled){\nreturn true;\n- }else if (neverAskAgainClicked && shouldShowFallbackSettings){\n+ }else if (shouldShowFallbackSettings){\nreturn true;\n- }else return neverAskAgainClicked && inAppNotification.fallBackToNotificationSettings();\n+ }else return inAppNotification != null && inAppNotification.fallBackToNotificationSettings();\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": "@@ -194,9 +194,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nboolean isFirstTimeRequest = StorageHelper.getBoolean(context,IS_FIRST_TIME_PERMISSION_REQUEST,true);\nif (!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+ if (!jsonObject.has(FALLBACK_TO_NOTIFICATION_SETTINGS)) {\nLogger.v(\"Notification permission is denied. Please grant notification permission access\" +\n\" in your app's settings to send notifications\");\nreturn;\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": "@@ -227,7 +227,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n}\n@RequiresApi(api = 33)\n- public void requestPermission(boolean fbSettings) {\n+ public void requestPermission(boolean isFallbackSettingsEnabled) {\nint permissionStatus = ContextCompat.checkSelfPermission(CTInboxActivity.this,\nManifest.permission.POST_NOTIFICATIONS);\n@@ -235,13 +235,10 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nboolean isFirstTimeRequest = StorageHelper.getBoolean(CTInboxActivity.this,\nIS_FIRST_TIME_PERMISSION_REQUEST,true);\nif (!isFirstTimeRequest) {\n- boolean neverAskAgainClicked = ActivityCompat.shouldShowRequestPermissionRationale(\n- CTInboxActivity.this, ANDROID_PERMISSION_STRING);\n- if (neverAskAgainClicked && fbSettings) {\n+ if (isFallbackSettingsEnabled) {\nshowFallbackAlertDialog();\nreturn;\n}\n-\npermissionCallbackWeakReference.get().onReject();\nreturn;\n}\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) - Fix for when user dismisses hard permission dialog by clicking outside the dialog.
116,620
21.10.2022 14:34:29
-19,080
487e550772e2ffcecf6ccc2b0e132a420b0feac8
revert max identifier limit to 64
[ { "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": "@@ -578,7 +578,7 @@ public final class Utils {\n\"CLEVERTAP_USE_CUSTOM_ID has been set as 1 in AndroidManifest.xml but custom CleverTap ID passed is empty.\");\nreturn false;\n}\n- if (cleverTapID.length() > 128) {\n+ if (cleverTapID.length() > 64) {\nLogger.i(\"Custom CleverTap ID passed is greater than 64 characters. \");\nreturn false;\n}\n" }, { "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": "@@ -682,7 +682,7 @@ class UtilsTest : BaseTestCase() {\nnull,\n\"\",\n\" \",\n- \"1111111122222222333333334444444455555555666666667777777788888888\"+\"1111111122222222333333334444444455555555666666667777777788888888\"+\"___morethan128_chars\",\n+ \"1111111122222222333333334444444455555555666666667777777788888888\"+\"___morethan64_chars\",\n\"a 2 b c\",\n\"//\\\\\\\\\"\n).forEach {\n@@ -692,7 +692,7 @@ class UtilsTest : BaseTestCase() {\n}\n// valid ids :\nlistOf(\n- \"1111111122222222333333334444444455555555666666667777777788888888\"+\"1111111122222222333333334444444455555555666666667777777788888888\",\n+ \"1111111122222222333333334444444455555555666666667777777788888888\",\n(\"abcd_1234_!!_::_$\" + \"@@_---.|<>;+=\"),\n\"......\",\n\"|||||||\",\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
[SDK-2330] revert max identifier limit to 64
116,616
25.10.2022 13:03:17
-19,080
6bbcd95180a745e95a0d722135cd0f95a11171c5
task(SDK-1970) - Refactor hard permission flow using shouldShowRationale
[ { "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": "@@ -38,6 +38,8 @@ import com.clevertap.android.sdk.inapp.CTInAppType;\nimport com.clevertap.android.sdk.inapp.InAppListener;\nimport java.lang.ref.WeakReference;\nimport java.util.HashMap;\n+import java.util.Objects;\n+\nimport kotlin.Unit;\npublic final class InAppNotificationActivity extends FragmentActivity implements InAppListener {\n@@ -215,14 +217,15 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nif (permissionStatus == PackageManager.PERMISSION_DENIED){\nboolean isFirstTimeRequest = StorageHelper.getBoolean(InAppNotificationActivity.this,\nIS_FIRST_TIME_PERMISSION_REQUEST,true);\n- if (!isFirstTimeRequest) {\n+ boolean shouldShowRequestPermissionRationale = ActivityCompat.shouldShowRequestPermissionRationale(\n+ Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n+ ANDROID_PERMISSION_STRING);\n+\n+ if (!isFirstTimeRequest && shouldShowRequestPermissionRationale){\nif (shouldShowFallbackAlertDialog()){\nshowFallbackAlertDialog();\nreturn;\n}\n- permissionCallbackWeakReference.get().onReject();\n- didDismiss(null);\n- return;\n}\nActivityCompat.requestPermissions(InAppNotificationActivity.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": "@@ -186,47 +186,77 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n@RequiresApi(api = 33)\npublic void promptPushPrimer(JSONObject jsonObject){\n+ PushPermissionResponseListener listener = callbackManager.\n+ getPushPermissionNotificationResponseListener();\nint permissionStatus = ContextCompat.checkSelfPermission(context,\nManifest.permission.POST_NOTIFICATIONS);\nif (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+ boolean isFirstTimeRequest = StorageHelper.getBoolean(context,IS_FIRST_TIME_PERMISSION_REQUEST,\n+ true);\n+\n+ boolean shouldShowRequestPermissionRationale = ActivityCompat.shouldShowRequestPermissionRationale(\n+ Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n+ ANDROID_PERMISSION_STRING);\n+\n+ if (!isFirstTimeRequest && shouldShowRequestPermissionRationale){\nif (!jsonObject.has(FALLBACK_TO_NOTIFICATION_SETTINGS)){\nLogger.v(\"Notification permission is denied. Please grant notification permission access\" +\n\" in your app's settings to send notifications\");\n- return;\n+ if (listener != null){\n+ listener.onPushPermissionResponse(false);\n}\n+ }else {\n+ prepareNotificationForDisplay(jsonObject);\n+ }\n+ return;\n}\nprepareNotificationForDisplay(jsonObject);\n}else{\n- Logger.v(\"Notification permission is granted.\");\n+ //Notification permission is granted\n+ if (listener != null){\n+ listener.onPushPermissionResponse(true);\n+ }\n}\n}\n@RequiresApi(api = 33)\npublic void promptPermission(boolean showFallbackSettings){\n+ PushPermissionResponseListener listener = callbackManager.\n+ getPushPermissionNotificationResponseListener();\nint permissionStatus = ContextCompat.checkSelfPermission(context,\nManifest.permission.POST_NOTIFICATIONS);\nif (permissionStatus == PackageManager.PERMISSION_DENIED) {\n+ //Checks whether permission request is asked for the first time.\nboolean isFirstTimeRequest = StorageHelper.getBoolean(\ncontext,IS_FIRST_TIME_PERMISSION_REQUEST,true);\n- if (!isFirstTimeRequest) {\n- if (ActivityCompat.shouldShowRequestPermissionRationale(\n+\n+ boolean shouldShowRequestPermissionRationale = ActivityCompat.shouldShowRequestPermissionRationale(\nObjects.requireNonNull(CoreMetaData.getCurrentActivity()),\n- ANDROID_PERMISSION_STRING) && !showFallbackSettings){\n+ ANDROID_PERMISSION_STRING);\n+\n+ if (!isFirstTimeRequest && shouldShowRequestPermissionRationale){\n+ if (!showFallbackSettings){\nLogger.v(\"Notification permission is denied. Please grant notification permission access\" +\n\" in your app's settings to send notifications\");\n- return;\n+ if (listener != null){\n+ listener.onPushPermissionResponse(false);\n}\n+ }else {\n+ startPrompt(Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n+ config, true);\n+ }\n+ return;\n}\nstartPrompt(Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\nconfig,showFallbackSettings);\n}else{\n- Logger.v(\"Notification permission is granted.\");\n+ //Notification permission is granted\n+ if (listener != null){\n+ listener.onPushPermissionResponse(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": "@@ -30,6 +30,7 @@ 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+import com.clevertap.android.sdk.CoreMetaData;\nimport com.clevertap.android.sdk.InAppNotificationActivity;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.R;\n@@ -41,6 +42,8 @@ import java.lang.ref.WeakReference;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\n+import java.util.Objects;\n+\nimport kotlin.Unit;\n/**\n@@ -234,7 +237,10 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nif (permissionStatus == PackageManager.PERMISSION_DENIED){\nboolean isFirstTimeRequest = StorageHelper.getBoolean(CTInboxActivity.this,\nIS_FIRST_TIME_PERMISSION_REQUEST,true);\n- if (!isFirstTimeRequest) {\n+ boolean shouldShowRequestPermissionRationale = ActivityCompat.shouldShowRequestPermissionRationale(\n+ Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n+ ANDROID_PERMISSION_STRING);\n+ if (!isFirstTimeRequest && shouldShowRequestPermissionRationale) {\nif (isFallbackSettingsEnabled) {\nshowFallbackAlertDialog();\nreturn;\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) - Refactor hard permission flow using shouldShowRationale
116,616
25.10.2022 13:06:37
-19,080
af55f1f7b0f78f9e3204825570361c8beac40123
task(SDK-1970) - Add new method to dismiss notification from CTWebInterface
[ { "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": "@@ -40,10 +40,23 @@ public class CTWebInterface {\nLogger.d(\"CleverTap Instance is null.\");\n} else {\n//Dismisses current IAM and proceeds to call promptForPushPermission()\n- inAppBaseFullFragment.didDismiss(null);\n+ dismissInAppNotification();\ncleverTapAPI.promptForPushPermission(shouldShowFallbackSettings);\n}\n}\n+ /**\n+ * Method to be called from WebView Javascript to dismiss the InApp notification\n+ */\n+ @JavascriptInterface\n+ public void dismissInAppNotification() {\n+ CleverTapAPI cleverTapAPI = weakReference.get();\n+ if (cleverTapAPI == null) {\n+ Logger.d(\"CleverTap Instance is null.\");\n+ } else {\n+ //Dismisses current IAM and proceeds to call promptForPushPermission()\n+ inAppBaseFullFragment.didDismiss(null);\n+ }\n+ }\n/**\n* Method to be called from WebView Javascript to add profile properties in CleverTap\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) - Add new method to dismiss notification from CTWebInterface
116,616
27.10.2022 12:37:36
-19,080
097ef6149e2dd229563e6e620e0a1eaa645e2511
task(SDK-1970) - Remove PushPrimerButtonListener.java and its usages
[ { "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,8 +26,6 @@ public abstract class BaseCallbackManager {\npublic abstract InAppNotificationButtonListener getInAppNotificationButtonListener();\n- public abstract PushPrimerButtonListener getPushPrimerButtonListener();\n-\npublic abstract InAppNotificationListener getInAppNotificationListener();\npublic abstract PushPermissionResponseListener getPushPermissionNotificationResponseListener();\n@@ -62,7 +60,7 @@ public abstract class BaseCallbackManager {\npublic abstract void setInAppNotificationButtonListener(\nInAppNotificationButtonListener inAppNotificationButtonListener);\n- public abstract void setPushPrimerButtonListener(PushPrimerButtonListener pushPrimerButtonListener);\n+// public abstract void setPushPrimerButtonListener(PushPrimerButtonListener pushPrimerButtonListener);\npublic abstract void setInAppNotificationListener(InAppNotificationListener inAppNotificationListener);\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,7 +25,6 @@ public class CallbackManager extends BaseCallbackManager {\nprivate SCDomainListener scDomainListener;\nprivate WeakReference<InAppNotificationButtonListener> inAppNotificationButtonListener;\n- private WeakReference<PushPrimerButtonListener> pushPrimerButtonListener;\nprivate InAppNotificationListener inAppNotificationListener;\n@@ -123,25 +122,12 @@ 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": "@@ -2458,11 +2458,6 @@ 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": "@@ -157,8 +157,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n@Override\npublic void inAppNotificationDidClick(CTInAppNotification inAppNotification, Bundle formData,\n- HashMap<String, String> keyValueMap, int btnClickIndex) {\n- didClick(formData, keyValueMap, btnClickIndex);\n+ HashMap<String, String> keyValueMap) {\n+ didClick(formData, keyValueMap);\n}\n@Override\n@@ -185,10 +185,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, int btnClickIndex) {\n+ void didClick(Bundle data, HashMap<String, String> keyValueMap) {\nInAppListener listener = getListener();\nif (listener != null) {\n- listener.inAppNotificationDidClick(inAppNotification, data, keyValueMap, btnClickIndex);\n+ listener.inAppNotificationDidClick(inAppNotification, data, keyValueMap);\n}\n}\n@@ -390,7 +390,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\ninAppNotification.getCampaignId());\ndata.putString(\"wzrk_c2a\",\ninAppNotification.getButtons().get(0).getText());\n- didClick(data, null, 0);\n+ didClick(data, null);\nString actionUrl = inAppNotification.getButtons().get(0)\n.getActionUrl();\nif (actionUrl != null) {\n@@ -425,7 +425,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\ninAppNotification.getCampaignId());\ndata.putString(\"wzrk_c2a\",\ninAppNotification.getButtons().get(1).getText());\n- didClick(data, null, 1);\n+ didClick(data, null);\nString actionUrl = inAppNotification.getButtons().get(1).getActionUrl();\nif (actionUrl != null) {\nfireUrlThroughIntent(actionUrl, data);\n@@ -457,7 +457,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\ninAppNotification.getCampaignId());\ndata.putString(\"wzrk_c2a\",\ninAppNotification.getButtons().get(0).getText());\n- didClick(data, null, 0);\n+ didClick(data, null);\nString actionUrl = inAppNotification.getButtons().get(0)\n.getActionUrl();\nif (actionUrl != null) {\n@@ -479,7 +479,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\ninAppNotification.getCampaignId());\ndata.putString(\"wzrk_c2a\",\ninAppNotification.getButtons().get(1).getText());\n- didClick(data, null, 1);\n+ didClick(data, null);\nString actionUrl = inAppNotification.getButtons().get(1).getActionUrl();\nif (actionUrl != null) {\nfireUrlThroughIntent(actionUrl, data);\n@@ -501,7 +501,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, 2);\n+ didClick(data, null);\nString actionUrl = inAppNotification.getButtons().get(2).getActionUrl();\nif (actionUrl != null) {\nfireUrlThroughIntent(actionUrl, data);\n" }, { "change_type": "DELETE", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushPrimerButtonListener.java", "new_path": null, "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(int index, Bundle data, HashMap<String, String> keyValueMap) {\n+ void didClick(Bundle data, HashMap<String, String> keyValueMap) {\nInAppListener listener = getListener();\nif (listener != null) {\n- listener.inAppNotificationDidClick(inAppNotification, data, keyValueMap,index);\n+ listener.inAppNotificationDidClick(inAppNotification, data, keyValueMap);\n}\n}\n@@ -139,7 +139,7 @@ public abstract class CTInAppBaseFragment extends Fragment {\ndata.putString(Constants.NOTIFICATION_ID_TAG, inAppNotification.getCampaignId());\ndata.putString(Constants.KEY_C2A, button.getText());\n- didClick(index,data, button.getKeyValues());\n+ didClick(data, button.getKeyValues());\nif (index == 0 && inAppNotification.isLocalInApp()) {\n((InAppNotificationActivity) context).showHardPermissionPrompt();\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(-1, formData, null);\n+ didClick(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(-1, formData, null);\n+ didClick(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": "@@ -290,20 +290,8 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n@Override\npublic void inAppNotificationDidClick(CTInAppNotification inAppNotification, Bundle formData,\n- HashMap<String, String> keyValueMap, int btnClickIndex) {\n+ HashMap<String, String> keyValueMap) {\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, int btnClickIndex);\n+ HashMap<String, String> keyValueMap);\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": "@@ -33,7 +33,7 @@ private const val TAG = \"HomeScreenActivity\"\nclass HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitListener, CTProductConfigListener,\nCTFeatureFlagsListener, SyncListener, InAppNotificationListener,\nPushPermissionResponseListener,\n- InAppNotificationButtonListener, PushPrimerButtonListener {\n+ InAppNotificationButtonListener {\nvar cleverTapDefaultInstance: CleverTapAPI? = null\n@@ -149,8 +149,6 @@ 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@@ -272,12 +270,4 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\noverride fun onInAppButtonClick(payload: HashMap<String, String>?) {\nTODO(\"Not yet implemented\")\n}\n-\n- override fun onPositiveButtonClick(ctInAppNotification: CTInAppNotification?) {\n- Log.i(TAG, \"onPositiveButtonClick() called\")\n- }\n-\n- override fun onNegativeButtonClick(ctInAppNotification: CTInAppNotification?) {\n- Log.i(TAG, \"onNegativeButtonClick() called\")\n- }\n}\n\\ No newline at end of file\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) - Remove PushPrimerButtonListener.java and its usages
116,612
27.10.2022 14:07:38
-19,080
c18b8c880900a950ad24c57f9608c973725d98d6
task(SDK-1970) : refactor duplicate code
[ { "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": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk.inapp;\nimport static com.clevertap.android.sdk.InAppNotificationActivity.ANDROID_PERMISSION_STRING;\nimport static com.clevertap.android.sdk.inapp.CTLocalInApp.FALLBACK_TO_NOTIFICATION_SETTINGS;\n+\nimport android.Manifest;\nimport android.app.Activity;\nimport android.content.Context;\n@@ -10,7 +11,6 @@ import android.content.SharedPreferences;\nimport android.content.pm.PackageManager;\nimport android.os.Bundle;\nimport android.os.Looper;\n-\nimport androidx.annotation.RequiresApi;\nimport androidx.core.app.ActivityCompat;\nimport androidx.core.content.ContextCompat;\n@@ -43,6 +43,7 @@ import java.util.List;\nimport java.util.Objects;\nimport java.util.concurrent.Callable;\nimport org.json.JSONArray;\n+import org.json.JSONException;\nimport org.json.JSONObject;\npublic class InAppController implements CTInAppNotification.CTInAppNotificationListener, InAppListener,\n@@ -201,18 +202,18 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nANDROID_PERMISSION_STRING);\nif (!isFirstTimeRequest && shouldShowRequestPermissionRationale){\n- if (!jsonObject.has(FALLBACK_TO_NOTIFICATION_SETTINGS)){\n+ if (!jsonObject.optBoolean(FALLBACK_TO_NOTIFICATION_SETTINGS, false)) {\nLogger.v(\"Notification permission is denied. Please grant notification permission access\" +\n\" in your app's settings to send notifications\");\nif (listener != null) {\nlistener.onPushPermissionResponse(false);\n}\n} else {\n- prepareNotificationForDisplay(jsonObject);\n+ showSoftOrHardPrompt(jsonObject);\n}\nreturn;\n}\n- prepareNotificationForDisplay(jsonObject);\n+ showSoftOrHardPrompt(jsonObject);\n} else {\n//Notification permission is granted\nif (listener != null) {\n@@ -221,43 +222,25 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\n}\n- @RequiresApi(api = 33)\n- public void promptPermission(boolean showFallbackSettings){\n- PushPermissionResponseListener listener = callbackManager.\n- getPushPermissionNotificationResponseListener();\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(\n- context,IS_FIRST_TIME_PERMISSION_REQUEST,true);\n-\n- boolean shouldShowRequestPermissionRationale = ActivityCompat.shouldShowRequestPermissionRationale(\n- Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n- ANDROID_PERMISSION_STRING);\n-\n- if (!isFirstTimeRequest && shouldShowRequestPermissionRationale){\n- if (!showFallbackSettings){\n- Logger.v(\"Notification permission is denied. Please grant notification permission access\" +\n- \" in your app's settings to send notifications\");\n- if (listener != null){\n- listener.onPushPermissionResponse(false);\n- }\n- }else {\n+ private void showSoftOrHardPrompt(final JSONObject jsonObject) {\n+ if (jsonObject.optBoolean(\"isFromPromptPermission\", false)) {\nstartPrompt(Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\nconfig, true);\n- }\n- return;\n- }\n- startPrompt(Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n- config,showFallbackSettings);\n} else {\n- //Notification permission is granted\n- if (listener != null){\n- listener.onPushPermissionResponse(true);\n+ prepareNotificationForDisplay(jsonObject);\n+ }\n}\n+\n+ @RequiresApi(api = 33)\n+ public void promptPermission(boolean showFallbackSettings) {\n+ JSONObject object = new JSONObject();\n+ try {\n+ object.put(FALLBACK_TO_NOTIFICATION_SETTINGS, showFallbackSettings);\n+ object.put(\"isFromPromptPermission\", true);\n+ } catch (JSONException e) {\n+ e.printStackTrace();\n}\n+ promptPushPrimer(object);\n}\npublic static void startPrompt(Activity activity, CleverTapInstanceConfig config,\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) : refactor duplicate code
116,616
27.10.2022 16:57:09
-19,080
eb37209288fb491556a7029c602be933daa4b3c4
task(SDK-1970) - Add interface for fragment to activity comm in CTInAppBaseFragment.java and CTInboxListViewFragment.java, Refactor push permission response 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": "@@ -28,7 +28,7 @@ public abstract class BaseCallbackManager {\npublic abstract InAppNotificationListener getInAppNotificationListener();\n- public abstract PushPermissionResponseListener getPushPermissionNotificationResponseListener();\n+ public abstract PushPermissionResponseListener getPushPermissionResponseListener();\npublic abstract CTInboxListener getInboxListener();\n@@ -64,7 +64,7 @@ public abstract class BaseCallbackManager {\npublic abstract void setInAppNotificationListener(InAppNotificationListener inAppNotificationListener);\n- public abstract void setPushPermissionNotificationResponseListener(PushPermissionResponseListener pushPermissionNotificationResponseListener);\n+ public abstract void setPushPermissionResponseListener(PushPermissionResponseListener pushPermissionResponseListener);\npublic abstract void setInboxListener(CTInboxListener inboxListener);\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": "@@ -34,7 +34,7 @@ public class CTWebInterface {\n* for Android 13 and above\n*/\n@JavascriptInterface\n- public void promptForPushPermission(boolean shouldShowFallbackSettings) {\n+ public void promptPushPermission(boolean shouldShowFallbackSettings) {\nCleverTapAPI cleverTapAPI = weakReference.get();\nif (cleverTapAPI == null) {\nLogger.d(\"CleverTap Instance is null.\");\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,7 +28,7 @@ public class CallbackManager extends BaseCallbackManager {\nprivate InAppNotificationListener inAppNotificationListener;\n- private PushPermissionResponseListener pushPermissionNotificationResponseListener;\n+ private PushPermissionResponseListener pushPermissionResponseListener;\nprivate CTInboxListener inboxListener;\n@@ -134,8 +134,8 @@ public class CallbackManager extends BaseCallbackManager {\n}\n@Override\n- public PushPermissionResponseListener getPushPermissionNotificationResponseListener() {\n- return pushPermissionNotificationResponseListener;\n+ public PushPermissionResponseListener getPushPermissionResponseListener() {\n+ return pushPermissionResponseListener;\n}\n@Override\n@@ -144,8 +144,8 @@ public class CallbackManager extends BaseCallbackManager {\n}\n@Override\n- public void setPushPermissionNotificationResponseListener(PushPermissionResponseListener pushPermissionNotificationResponseListener) {\n- this.pushPermissionNotificationResponseListener = pushPermissionNotificationResponseListener;\n+ public void setPushPermissionResponseListener(PushPermissionResponseListener pushPermissionResponseListener) {\n+ this.pushPermissionResponseListener = pushPermissionResponseListener;\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": "@@ -1643,7 +1643,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n*/\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\npublic PushPermissionResponseListener getPushPermissionNotificationResponseListener() {\n- return coreState.getCallbackManager().getPushPermissionNotificationResponseListener();\n+ return coreState.getCallbackManager().getPushPermissionResponseListener();\n}\n/**\n@@ -1655,7 +1655,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\npublic void setPushPermissionNotificationResponseListener(PushPermissionResponseListener\npushPermissionResponseListener) {\ncoreState.getCallbackManager().\n- setPushPermissionNotificationResponseListener(pushPermissionResponseListener);\n+ setPushPermissionResponseListener(pushPermissionResponseListener);\n}\n/**\n" }, { "change_type": "ADD", "old_path": null, "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DidClickForHardPermissionListener.java", "diff": "+package com.clevertap.android.sdk;\n+\n+/**\n+ * Internal interface for communication between fragment and its respective activity when action buttons\n+ * are clicked via InApp/Inbox payload.\n+ */\n+public interface DidClickForHardPermissionListener {\n+ void didClickForHardPermissionWithFallbackSettings(boolean fallbackToSettings);\n+ void didClickForHardPermission();\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": "@@ -33,7 +33,6 @@ 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@@ -42,7 +41,8 @@ import java.util.Objects;\nimport kotlin.Unit;\n-public final class InAppNotificationActivity extends FragmentActivity implements InAppListener {\n+public final class InAppNotificationActivity extends FragmentActivity implements InAppListener,\n+ DidClickForHardPermissionListener {\nprivate static boolean isAlertVisible = false;\n@@ -52,7 +52,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nprivate WeakReference<InAppListener> listenerWeakReference;\n- private WeakReference<PermissionCallback> permissionCallbackWeakReference;\n+ private WeakReference<PushPermissionResultCallback> pushPermissionResultCallbackWeakReference;\nprivate static final int PERMISSION_REQUEST_CODE = 2;\n@@ -62,11 +62,11 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nprivate boolean shouldShowFallbackSettings;\n- public interface PermissionCallback {\n+ public interface PushPermissionResultCallback {\n- void onAccept();\n+ void onPushPermissionAccept();\n- void onReject();\n+ void onPushPermissionDeny();\n}\npublic void onCreate(Bundle savedInstanceState) {\n@@ -192,6 +192,16 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\n}\n+ @Override\n+ public void didClickForHardPermissionWithFallbackSettings(boolean fallbackToSettings) {\n+ showHardPermissionPrompt(fallbackToSettings);\n+ }\n+\n+ @Override\n+ public void didClickForHardPermission() {\n+ showHardPermissionPrompt();\n+ }\n+\n@SuppressLint(\"NewApi\")\npublic void showHardPermissionPrompt() {\nif (isPackageAndOsTargetsAbove(this, 32)) {\n@@ -200,11 +210,9 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\n@SuppressLint(\"NewApi\")\n- public void showHardPermissionPrompt(CTInAppNotificationButton ctInAppNotificationButton){\n+ public void showHardPermissionPrompt(boolean isFallbackSettingsEnabled){\nif (isPackageAndOsTargetsAbove(this, 32)) {\n- if (ctInAppNotificationButton != null) {\n- isFallbackSettingsEnabled = ctInAppNotificationButton.isFallbackToSettings();\n- }\n+ this.isFallbackSettingsEnabled = isFallbackSettingsEnabled;\nrequestPermission();\n}\n}\n@@ -231,7 +239,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nActivityCompat.requestPermissions(InAppNotificationActivity.this,\nnew String[]{ANDROID_PERMISSION_STRING}, PERMISSION_REQUEST_CODE);\n}else{\n- permissionCallbackWeakReference.get().onAccept();\n+ pushPermissionResultCallbackWeakReference.get().onPushPermissionAccept();\ndidDismiss(null);\n}\n}\n@@ -263,9 +271,9 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nboolean granted = grantResults.length > 0 && grantResults[0] ==\nPackageManager.PERMISSION_GRANTED;\nif (granted) {\n- permissionCallbackWeakReference.get().onAccept();\n+ pushPermissionResultCallbackWeakReference.get().onPushPermissionAccept();\n}else {\n- permissionCallbackWeakReference.get().onReject();\n+ pushPermissionResultCallbackWeakReference.get().onPushPermissionDeny();\n}\ndidDismiss(null);\n}\n@@ -328,8 +336,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nlistenerWeakReference = new WeakReference<>(listener);\n}\n- public void setPermissionCallback(PermissionCallback callback) {\n- permissionCallbackWeakReference = new WeakReference<>(callback);\n+ public void setPermissionCallback(PushPermissionResultCallback callback) {\n+ pushPermissionResultCallbackWeakReference = new WeakReference<>(callback);\n}\nprivate CTInAppBaseFullFragment createContentFragment() {\n@@ -405,8 +413,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nif (inAppNotification.getButtons().get(0).getType() != null &&\ninAppNotification.getButtons().get(0).getType()\n.equalsIgnoreCase(Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)){\n- showHardPermissionPrompt(\n- inAppNotification.getButtons().get(0));\n+ showHardPermissionPrompt(inAppNotification.\n+ getButtons().get(0).isFallbackToSettings());\nreturn;\n}\n@@ -435,7 +443,8 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nif (inAppNotification.getButtons().get(1).getType() != null &&\ninAppNotification.getButtons().get(1).getType()\n.equalsIgnoreCase(Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)){\n- showHardPermissionPrompt(inAppNotification.getButtons().get(1));\n+ showHardPermissionPrompt(inAppNotification.\n+ getButtons().get(1).isFallbackToSettings());\nreturn;\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": "@@ -10,7 +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;\n+import com.clevertap.android.sdk.DidClickForHardPermissionListener;\nimport com.clevertap.android.sdk.Utils;\nimport com.clevertap.android.sdk.customviews.CloseImageView;\nimport java.lang.ref.WeakReference;\n@@ -42,15 +42,20 @@ public abstract class CTInAppBaseFragment extends Fragment {\nprivate WeakReference<InAppListener> listenerWeakReference;\n+ private DidClickForHardPermissionListener didClickForHardPermissionListener;\n+\n@Override\npublic void onAttach(Context context) {\nsuper.onAttach(context);\nthis.context = context;\nBundle bundle = getArguments();\n+ if (bundle != null) {\ninAppNotification = bundle.getParcelable(Constants.INAPP_KEY);\nconfig = bundle.getParcelable(Constants.KEY_CONFIG);\ncurrentOrientation = getResources().getConfiguration().orientation;\ngenerateListener();\n+ didClickForHardPermissionListener = (DidClickForHardPermissionListener) getActivity();\n+ }\n}\n@Override\n@@ -142,7 +147,7 @@ public abstract class CTInAppBaseFragment extends Fragment {\ndidClick(data, button.getKeyValues());\nif (index == 0 && inAppNotification.isLocalInApp()) {\n- ((InAppNotificationActivity) context).showHardPermissionPrompt();\n+ didClickForHardPermissionListener.didClickForHardPermission();\nreturn;\n}else if (index == 1 && inAppNotification.isLocalInApp()){\ndidDismiss(data);\n@@ -151,11 +156,10 @@ public abstract class CTInAppBaseFragment extends Fragment {\nif (button.getType() != null && button.getType().equalsIgnoreCase(\nConstants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)){\n- if (context instanceof InAppNotificationActivity) {\n- ((InAppNotificationActivity) context).showHardPermissionPrompt(button);\n+ didClickForHardPermissionListener.\n+ didClickForHardPermissionWithFallbackSettings(button.isFallbackToSettings());\nreturn;\n}\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/InAppController.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/InAppController.java", "diff": "@@ -47,7 +47,7 @@ import org.json.JSONException;\nimport org.json.JSONObject;\npublic class InAppController implements CTInAppNotification.CTInAppNotificationListener, InAppListener,\n- InAppNotificationActivity.PermissionCallback {\n+ InAppNotificationActivity.PushPermissionResultCallback {\n//InApp\nprivate final class NotificationPrepareRunnable implements Runnable {\n@@ -120,6 +120,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nprivate final MainLooperHandler mainLooperHandler;\npublic final static String LOCAL_INAPP_COUNT = \"local_in_app_count\";\n+ public final static String IS_HARD_PERMISSION_REQUEST = \"isHardPermissionRequest\";\npublic final static String IS_FIRST_TIME_PERMISSION_REQUEST = \"firstTimeRequest\";\npublic final static String DISPLAY_HARD_PERMISSION_BUNDLE_KEY = \"displayHardPermissionDialog\";\n@@ -188,7 +189,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n@RequiresApi(api = 33)\npublic void promptPushPrimer(JSONObject jsonObject){\nPushPermissionResponseListener listener = callbackManager.\n- getPushPermissionNotificationResponseListener();\n+ getPushPermissionResponseListener();\nint permissionStatus = ContextCompat.checkSelfPermission(context,\nManifest.permission.POST_NOTIFICATIONS);\n@@ -222,27 +223,32 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\n}\n- private void showSoftOrHardPrompt(final JSONObject jsonObject) {\n- if (jsonObject.optBoolean(\"isFromPromptPermission\", false)) {\n- startPrompt(Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n- config, true);\n- } else {\n- prepareNotificationForDisplay(jsonObject);\n- }\n- }\n-\n@RequiresApi(api = 33)\npublic void promptPermission(boolean showFallbackSettings) {\nJSONObject object = new JSONObject();\ntry {\nobject.put(FALLBACK_TO_NOTIFICATION_SETTINGS, showFallbackSettings);\n- object.put(\"isFromPromptPermission\", true);\n+ object.put(IS_HARD_PERMISSION_REQUEST, true);\n} catch (JSONException e) {\ne.printStackTrace();\n}\npromptPushPrimer(object);\n}\n+ /**\n+ * Shows either push primer or directly calls hard permission dialog flow based on whether\n+ * `isFromPromptPermission` is true.\n+ * @param jsonObject InApp object\n+ */\n+ private void showSoftOrHardPrompt(final JSONObject jsonObject) {\n+ if (jsonObject.optBoolean(IS_HARD_PERMISSION_REQUEST, false)) {\n+ startPrompt(Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n+ config, jsonObject.optBoolean(FALLBACK_TO_NOTIFICATION_SETTINGS, false));\n+ } else {\n+ prepareNotificationForDisplay(jsonObject);\n+ }\n+ }\n+\npublic static void startPrompt(Activity activity, CleverTapInstanceConfig config,\nboolean showFallbackSettings){\nif (!activity.getClass().equals(InAppNotificationActivity.class)) {\n@@ -252,7 +258,6 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nintent.putExtra(\"configBundle\", configBundle);\nintent.putExtra(Constants.INAPP_KEY, currentlyDisplayingInApp);\nintent.putExtra(DISPLAY_HARD_PERMISSION_BUNDLE_KEY, true);\n- intent.putExtra(DISPLAY_HARD_PERMISSION_BUNDLE_KEY, true);\nintent.putExtra(SHOW_FALLBACK_SETTINGS_BUNDLE_KEY, showFallbackSettings);\nactivity.startActivity(intent);\n}\n@@ -368,16 +373,16 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\n@Override\n- public void onAccept() {\n- final PushPermissionResponseListener listener = callbackManager.getPushPermissionNotificationResponseListener();\n+ public void onPushPermissionAccept() {\n+ final PushPermissionResponseListener listener = callbackManager.getPushPermissionResponseListener();\nif (listener != null){\nlistener.onPushPermissionResponse(true);\n}\n}\n@Override\n- public void onReject() {\n- final PushPermissionResponseListener listener = callbackManager.getPushPermissionNotificationResponseListener();\n+ public void onPushPermissionDeny() {\n+ final PushPermissionResponseListener listener = callbackManager.getPushPermissionResponseListener();\nif (listener != null){\nlistener.onPushPermissionResponse(false);\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": "@@ -31,6 +31,7 @@ import com.clevertap.android.sdk.CTInboxStyleConfig;\nimport com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.CoreMetaData;\n+import com.clevertap.android.sdk.DidClickForHardPermissionListener;\nimport com.clevertap.android.sdk.InAppNotificationActivity;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.R;\n@@ -50,7 +51,8 @@ import kotlin.Unit;\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, CTInboxListener {\n+public class CTInboxActivity extends FragmentActivity implements CTInboxListViewFragment.InboxListener,\n+ CTInboxListener, DidClickForHardPermissionListener {\npublic interface InboxActivityListener {\n@@ -76,7 +78,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nprivate CleverTapAPI cleverTapAPI;\nprivate CTInboxListener inboxContentUpdatedListener = null;\n- private WeakReference<InAppNotificationActivity.PermissionCallback> permissionCallbackWeakReference;\n+ private WeakReference<InAppNotificationActivity.PushPermissionResultCallback> permissionCallbackWeakReference;\nprivate static final int PERMISSION_REQUEST_CODE = 2;\npublic static final String ANDROID_PERMISSION_STRING = \"android.permission.POST_NOTIFICATIONS\";\n@@ -222,6 +224,16 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n}\n}\n+ @Override\n+ public void didClickForHardPermissionWithFallbackSettings(boolean fallbackToSettings) {\n+ showHardPermissionPrompt(fallbackToSettings);\n+ }\n+\n+ @Override\n+ public void didClickForHardPermission() {\n+ //No op\n+ }\n+\n@SuppressLint(\"NewApi\")\npublic void showHardPermissionPrompt(boolean fbSettings){\nif (isPackageAndOsTargetsAbove(this, 32)) {\n@@ -245,14 +257,14 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nshowFallbackAlertDialog();\nreturn;\n}\n- permissionCallbackWeakReference.get().onReject();\n+ permissionCallbackWeakReference.get().onPushPermissionDeny();\nreturn;\n}\nActivityCompat.requestPermissions(CTInboxActivity.this,\nnew String[]{ANDROID_PERMISSION_STRING}, PERMISSION_REQUEST_CODE);\n}else{\n- permissionCallbackWeakReference.get().onAccept();\n+ permissionCallbackWeakReference.get().onPushPermissionAccept();\n}\n}\n@@ -274,14 +286,14 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nboolean granted = grantResults.length > 0 && grantResults[0] ==\nPackageManager.PERMISSION_GRANTED;\nif (granted) {\n- permissionCallbackWeakReference.get().onAccept();\n+ permissionCallbackWeakReference.get().onPushPermissionAccept();\n}else {\n- permissionCallbackWeakReference.get().onReject();\n+ permissionCallbackWeakReference.get().onPushPermissionDeny();\n}\n}\n}\n- public void setPermissionCallback(InAppNotificationActivity.PermissionCallback callback) {\n+ public void setPermissionCallback(InAppNotificationActivity.PushPermissionResultCallback callback) {\npermissionCallbackWeakReference = new WeakReference<>(callback);\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": "@@ -25,6 +25,7 @@ import com.clevertap.android.sdk.CTInboxStyleConfig;\nimport com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\n+import com.clevertap.android.sdk.DidClickForHardPermissionListener;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.R;\nimport com.clevertap.android.sdk.Utils;\n@@ -69,6 +70,8 @@ public class CTInboxListViewFragment extends Fragment {\nprivate int tabPosition;\n+ private DidClickForHardPermissionListener didClickForHardPermissionListener;\n+\n@Override\npublic void onAttach(@NonNull Context context) {\nsuper.onAttach(context);\n@@ -81,6 +84,7 @@ public class CTInboxListViewFragment extends Fragment {\nif (context instanceof CTInboxActivity) {\nsetListener((CTInboxListViewFragment.InboxListener) getActivity());\n}\n+ didClickForHardPermissionListener = (DidClickForHardPermissionListener) getActivity();\n}\n}\nprivate void updateInboxMessages(){\n@@ -291,8 +295,9 @@ public class CTInboxListViewFragment extends Fragment {\nString isRequestForPermissionStr = inboxMessages.get(position).getInboxMessageContents().\nget(0).getLinktype(jsonObject);\nif (isRequestForPermissionStr.equalsIgnoreCase(Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)){\n- ((CTInboxActivity) requireActivity()).showHardPermissionPrompt(inboxMessages.get(position).\n- getInboxMessageContents().get(0).isFallbackSettingsEnabled(jsonObject));\n+ boolean isFallbackSettings = inboxMessages.get(position).\n+ getInboxMessageContents().get(0).isFallbackSettingsEnabled(jsonObject);\n+ didClickForHardPermissionListener.didClickForHardPermissionWithFallbackSettings(isFallbackSettings);\nreturn;\n}\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) - Add interface for fragment to activity comm in CTInAppBaseFragment.java and CTInboxListViewFragment.java, Refactor push permission response listener
116,612
27.10.2022 17:00:22
-19,080
124a529f29a6c385c45596b3ea9e16e81604e68f
task(SDK-1970) : move in app count access to io thread
[ { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java", "diff": "@@ -14,7 +14,6 @@ import com.clevertap.android.sdk.task.MainLooperHandler;\nimport com.clevertap.android.sdk.task.Task;\nimport com.clevertap.android.sdk.validation.ValidationResultStack;\nimport com.clevertap.android.sdk.validation.Validator;\n-\nimport java.util.concurrent.Callable;\nclass CleverTapFactory {\n@@ -99,7 +98,7 @@ class CleverTapFactory {\ncoreState.setAnalyticsManager(analyticsManager);\nInAppController inAppController = new InAppController(context, config, mainLooperHandler,\n- controllerManager, callbackManager, analyticsManager, coreMetaData);\n+ controllerManager, callbackManager, analyticsManager, coreMetaData, deviceInfo);\ncoreState.setInAppController(inAppController);\ncoreState.getControllerManager().setInAppController(inAppController);\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": "package com.clevertap.android.sdk;\n+import static android.content.Context.USAGE_STATS_SERVICE;\n+import static com.clevertap.android.sdk.inapp.InAppController.LOCAL_INAPP_COUNT;\n+\nimport android.Manifest;\nimport android.annotation.SuppressLint;\nimport android.app.UiModeManager;\n@@ -23,6 +26,7 @@ import androidx.annotation.IntDef;\nimport androidx.annotation.RequiresApi;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\n+import androidx.annotation.WorkerThread;\nimport androidx.core.app.NotificationManagerCompat;\nimport com.clevertap.android.sdk.login.LoginInfoProvider;\nimport com.clevertap.android.sdk.task.CTExecutorFactory;\n@@ -39,9 +43,6 @@ import java.util.UUID;\nimport java.util.concurrent.Callable;\nimport org.json.JSONObject;\n-import static android.content.Context.USAGE_STATS_SERVICE;\n-import static com.clevertap.android.sdk.inapp.InAppController.LOCAL_INAPP_COUNT;\n-\n@RestrictTo(Scope.LIBRARY)\npublic class DeviceInfo {\n@@ -89,6 +90,8 @@ public class DeviceInfo {\nprivate String appBucket;\n+ private int localInAppCount;\n+\nDeviceCachedInfo() {\nversionName = getVersionName();\nosName = getOsName();\n@@ -107,6 +110,7 @@ public class DeviceInfo {\nwidthPixels = getWidthPixels();\ndpi = getDPI();\nnotificationsEnabled = getNotificationEnabledForUser();\n+ localInAppCount = getLocalInAppCountFromPreference();\nif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {\nappBucket = getAppBucket();\n}\n@@ -626,6 +630,14 @@ public class DeviceInfo {\nreturn getDeviceCachedInfo().sdkVersion;\n}\n+ public int getLocalInAppCount() {\n+ return getDeviceCachedInfo().localInAppCount;\n+ }\n+\n+ public void incrementLocalInAppCount() {\n+ getDeviceCachedInfo().localInAppCount++;\n+ }\n+\npublic ArrayList<ValidationResult> getValidationResults() {\n// noinspection unchecked\nArrayList<ValidationResult> tempValidationResults = (ArrayList<ValidationResult>) validationResults.clone();\n@@ -722,7 +734,8 @@ public class DeviceInfo {\nreturn getDeviceCachedInfo().widthPixels;\n}\n- public int getLocalInAppCount(){\n+ @WorkerThread\n+ private int getLocalInAppCountFromPreference() {\nreturn StorageHelper.getInt(context, LOCAL_INAPP_COUNT, 0);\n}\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": "@@ -174,6 +174,12 @@ public final class StorageHelper {\npersist(editor);\n}\n+ public static void putIntImmediate(Context context, String key, int value) {\n+ SharedPreferences prefs = getPreferences(context);\n+ SharedPreferences.Editor editor = prefs.edit().putInt(key, value);\n+ persistImmediately(editor);\n+ }\n+\nstatic void putLong(Context context, String key, long value) {\nSharedPreferences prefs = getPreferences(context);\nSharedPreferences.Editor editor = prefs.edit().putLong(key, value);\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": "@@ -23,6 +23,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@@ -111,6 +112,8 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nprivate final CoreMetaData coreMetaData;\n+ private final DeviceInfo deviceInfo;\n+\nprivate InAppState inAppState;\nprivate HashSet<String> inappActivityExclude = null;\n@@ -131,7 +134,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nControllerManager controllerManager,\nBaseCallbackManager callbackManager,\nAnalyticsManager analyticsManager,\n- CoreMetaData coreMetaData) {\n+ CoreMetaData coreMetaData, final DeviceInfo deviceInfo) {\nthis.context = context;\nthis.config = config;\n@@ -142,6 +145,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nthis.analyticsManager = analyticsManager;\nthis.coreMetaData = coreMetaData;\nthis.inAppState = InAppState.RESUMED;\n+ this.deviceInfo = deviceInfo;\n}\npublic void checkExistingInAppNotifications(Activity activity) {\n@@ -607,9 +611,16 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nprivate void incrementLocalInAppCountInPersistentStore(Context context, CTInAppNotification inAppNotification) {\nif (inAppNotification.isLocalInApp()) {\n- int localInAppCount = StorageHelper.getInt(context,LOCAL_INAPP_COUNT,0);\n- ++localInAppCount;\n- StorageHelper.putInt(context,LOCAL_INAPP_COUNT,localInAppCount);\n+ deviceInfo.incrementLocalInAppCount();//update cache\n+ Task<Void> task = CTExecutorFactory.executors(config).ioTask();\n+ task.execute(\"InAppController#incrementLocalInAppCountInPersistentStore\", new Callable<Void>() {\n+ @Override\n+ public Void call() {\n+ StorageHelper.putIntImmediate(context, LOCAL_INAPP_COUNT,\n+ deviceInfo.getLocalInAppCount());// update disk with cache\n+ return null;\n+ }\n+ });\n}\n}\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) : move in app count access to io thread
116,616
27.10.2022 18:29:03
-19,080
aa86668215e42acaf8ab69b54850d145c73247fb
task(SDK-1970) - Add PushPermissionManager.java for requesting notification permission.
[ { "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": "@@ -174,6 +174,7 @@ public interface Constants {\nString KEY_TYPE = \"type\";\nString KEY_FALLBACK_NOTIFICATION_SETTINGS = \"fbSettings\";\nString KEY_REQUEST_FOR_NOTIFICATION_PERMISSION = \"rfp\";\n+ int NOTIFICATION_PERMISSION_REQUEST_CODE = 102;\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/DidClickForHardPermissionListener.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/DidClickForHardPermissionListener.java", "diff": "@@ -6,5 +6,4 @@ package com.clevertap.android.sdk;\n*/\npublic interface DidClickForHardPermissionListener {\nvoid didClickForHardPermissionWithFallbackSettings(boolean fallbackToSettings);\n- void didClickForHardPermission();\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": "package com.clevertap.android.sdk;\n-import static com.clevertap.android.sdk.CTXtensions.isPackageAndOsTargetsAbove;\n+import static com.clevertap.android.sdk.Constants.NOTIFICATION_PERMISSION_REQUEST_CODE;\nimport 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 static com.clevertap.android.sdk.inapp.InAppController.SHOW_FALLBACK_SETTINGS_BUNDLE_KEY;\n-import android.Manifest;\nimport android.annotation.SuppressLint;\nimport android.app.AlertDialog;\nimport android.content.Context;\n@@ -17,11 +16,7 @@ import android.net.Uri;\nimport android.os.Bundle;\nimport android.view.WindowManager;\nimport androidx.annotation.NonNull;\n-import androidx.annotation.RequiresApi;\n-import androidx.core.app.ActivityCompat;\n-import androidx.core.content.ContextCompat;\nimport androidx.fragment.app.FragmentActivity;\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@@ -37,9 +32,6 @@ import com.clevertap.android.sdk.inapp.CTInAppType;\nimport com.clevertap.android.sdk.inapp.InAppListener;\nimport java.lang.ref.WeakReference;\nimport java.util.HashMap;\n-import java.util.Objects;\n-\n-import kotlin.Unit;\npublic final class InAppNotificationActivity extends FragmentActivity implements InAppListener,\nDidClickForHardPermissionListener {\n@@ -54,13 +46,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nprivate WeakReference<PushPermissionResultCallback> pushPermissionResultCallbackWeakReference;\n- private static final int PERMISSION_REQUEST_CODE = 2;\n-\n- public static final String ANDROID_PERMISSION_STRING = \"android.permission.POST_NOTIFICATIONS\";\n-\n- private boolean isFallbackSettingsEnabled;\n-\n- private boolean shouldShowFallbackSettings;\n+ private PushPermissionManager pushPermissionManager;\npublic interface PushPermissionResultCallback {\n@@ -87,15 +73,17 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nif (configBundle != null) {\nconfig = configBundle.getParcelable(\"config\");\n}\n- setListener(CleverTapAPI.instanceWithConfig(this, config).getCoreState().getInAppController());\n+ setListener(CleverTapAPI.instanceWithConfig(this, config).getCoreState().getInAppController());\nsetPermissionCallback(CleverTapAPI.instanceWithConfig(this, config).getCoreState()\n.getInAppController());\n+ pushPermissionManager = new PushPermissionManager(this);\n+\nif (showHardNotificationPermission) {\n- shouldShowFallbackSettings = notif.getBoolean(SHOW_FALLBACK_SETTINGS_BUNDLE_KEY,\n+ boolean shouldShowFallbackSettings = notif.getBoolean(SHOW_FALLBACK_SETTINGS_BUNDLE_KEY,\nfalse);\n- showHardPermissionPrompt();\n+ showHardPermissionPrompt(shouldShowFallbackSettings);\nreturn;\n}\n} catch (Throwable t) {\n@@ -197,68 +185,10 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nshowHardPermissionPrompt(fallbackToSettings);\n}\n- @Override\n- public void didClickForHardPermission() {\n- showHardPermissionPrompt();\n- }\n-\n- @SuppressLint(\"NewApi\")\n- public void showHardPermissionPrompt() {\n- if (isPackageAndOsTargetsAbove(this, 32)) {\n- requestPermission();\n- }\n- }\n-\n@SuppressLint(\"NewApi\")\npublic void showHardPermissionPrompt(boolean isFallbackSettingsEnabled){\n- if (isPackageAndOsTargetsAbove(this, 32)) {\n- this.isFallbackSettingsEnabled = isFallbackSettingsEnabled;\n- requestPermission();\n- }\n- }\n-\n- @RequiresApi(api = 33)\n- public void requestPermission() {\n- int permissionStatus = ContextCompat.checkSelfPermission(InAppNotificationActivity.this,\n- Manifest.permission.POST_NOTIFICATIONS);\n-\n- if (permissionStatus == PackageManager.PERMISSION_DENIED){\n- boolean isFirstTimeRequest = StorageHelper.getBoolean(InAppNotificationActivity.this,\n- IS_FIRST_TIME_PERMISSION_REQUEST,true);\n- boolean shouldShowRequestPermissionRationale = ActivityCompat.shouldShowRequestPermissionRationale(\n- Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n- ANDROID_PERMISSION_STRING);\n-\n- if (!isFirstTimeRequest && shouldShowRequestPermissionRationale){\n- if (shouldShowFallbackAlertDialog()){\n- showFallbackAlertDialog();\n- return;\n- }\n- }\n-\n- ActivityCompat.requestPermissions(InAppNotificationActivity.this,\n- new String[]{ANDROID_PERMISSION_STRING}, PERMISSION_REQUEST_CODE);\n- }else{\n- pushPermissionResultCallbackWeakReference.get().onPushPermissionAccept();\n- didDismiss(null);\n- }\n- }\n-\n- /**\n- * This method will show `showFallbackAlertDialog()` if any of the below conditions are satisfied\n- * 1)When `isFbSettings` true.`isFbSettings` key is available from IAM campaign.\n- * 2)When `showFbSettings` is true.`showFbSettings` key is available when hard push permission flow is called.\n- * 3)When `inAppNotification.fallBackToNotificationSettings()` is true.\n- * `inAppNotification.fallBackToNotificationSettings()` is available when push primer flow is called.\n- *\n- * @return boolean\n- */\n- private boolean shouldShowFallbackAlertDialog() {\n- if (isFallbackSettingsEnabled){\n- return true;\n- }else if (shouldShowFallbackSettings){\n- return true;\n- }else return inAppNotification != null && inAppNotification.fallBackToNotificationSettings();\n+ pushPermissionManager.showHardPermissionPrompt(isFallbackSettingsEnabled,\n+ pushPermissionResultCallbackWeakReference.get());\n}\n@Override\n@@ -267,7 +197,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nsuper.onRequestPermissionsResult(requestCode, permissions, grantResults);\nStorageHelper.putBoolean(InAppNotificationActivity.this,IS_FIRST_TIME_PERMISSION_REQUEST,\nfalse);\n- if (requestCode == PERMISSION_REQUEST_CODE) {\n+ if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE) {\nboolean granted = grantResults.length > 0 && grantResults[0] ==\nPackageManager.PERMISSION_GRANTED;\nif (granted) {\n@@ -279,17 +209,6 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\n}\n- public void showFallbackAlertDialog() {\n- AlertDialogPromptForSettings.show(this, () -> {\n- Utils.navigateToAndroidSettingsForNotifications(InAppNotificationActivity.this);\n- didDismiss(null);\n- return Unit.INSTANCE;\n- }, () -> {\n- didDismiss(null);\n- return Unit.INSTANCE;\n- });\n- }\n-\nvoid didDismiss(Bundle data) {\nif (isAlertVisible) {\nisAlertVisible = false;\n@@ -406,7 +325,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nreturn;\n}\nif (inAppNotification.isLocalInApp()) {\n- showHardPermissionPrompt();\n+ showHardPermissionPrompt(inAppNotification.fallBackToNotificationSettings());\nreturn;\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushPermissionManager.java", "diff": "+package com.clevertap.android.sdk;\n+\n+import static com.clevertap.android.sdk.CTXtensions.isPackageAndOsTargetsAbove;\n+import static com.clevertap.android.sdk.Constants.NOTIFICATION_PERMISSION_REQUEST_CODE;\n+import static com.clevertap.android.sdk.inapp.InAppController.IS_FIRST_TIME_PERMISSION_REQUEST;\n+import android.Manifest;\n+import android.annotation.SuppressLint;\n+import android.app.Activity;\n+import android.content.pm.PackageManager;\n+import androidx.annotation.RequiresApi;\n+import androidx.core.app.ActivityCompat;\n+import androidx.core.content.ContextCompat;\n+import com.clevertap.android.sdk.inapp.AlertDialogPromptForSettings;\n+import java.util.Objects;\n+import kotlin.Unit;\n+\n+public class PushPermissionManager {\n+\n+ private boolean isFallbackSettingsEnabled;\n+ public static final String ANDROID_PERMISSION_STRING = \"android.permission.POST_NOTIFICATIONS\";\n+ private final Activity activity;\n+\n+\n+ public PushPermissionManager(Activity activity) {\n+ this.activity = activity;\n+ }\n+\n+ @SuppressLint(\"NewApi\")\n+ public void showHardPermissionPrompt(boolean isFallbackSettingsEnabled,\n+ InAppNotificationActivity.PushPermissionResultCallback\n+ pushPermissionResultCallback){\n+ if (isPackageAndOsTargetsAbove(activity, 32)) {\n+ this.isFallbackSettingsEnabled = isFallbackSettingsEnabled;\n+ requestPermission(pushPermissionResultCallback);\n+ }\n+ }\n+\n+ @RequiresApi(api = 33)\n+ public void requestPermission(InAppNotificationActivity.PushPermissionResultCallback pushPermissionResultCallback) {\n+ int permissionStatus = ContextCompat.checkSelfPermission(activity,\n+ Manifest.permission.POST_NOTIFICATIONS);\n+\n+ if (permissionStatus == PackageManager.PERMISSION_DENIED){\n+ boolean isFirstTimeRequest = StorageHelper.getBoolean(activity,\n+ IS_FIRST_TIME_PERMISSION_REQUEST,true);\n+ boolean shouldShowRequestPermissionRationale = ActivityCompat.shouldShowRequestPermissionRationale(\n+ Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n+ ANDROID_PERMISSION_STRING);\n+\n+ if (!isFirstTimeRequest && shouldShowRequestPermissionRationale){\n+ if (shouldShowFallbackAlertDialog()){\n+ showFallbackAlertDialog();\n+ return;\n+ }\n+ }\n+\n+ ActivityCompat.requestPermissions(activity,\n+ new String[]{ANDROID_PERMISSION_STRING}, NOTIFICATION_PERMISSION_REQUEST_CODE);\n+ }else{\n+ pushPermissionResultCallback.onPushPermissionAccept();\n+ if (activity instanceof InAppNotificationActivity) {\n+ ((InAppNotificationActivity) activity).didDismiss(null);\n+ }\n+ }\n+ }\n+\n+ private boolean shouldShowFallbackAlertDialog() {\n+ return isFallbackSettingsEnabled;\n+ }\n+\n+ public void showFallbackAlertDialog() {\n+ AlertDialogPromptForSettings.show(activity, () -> {\n+ Utils.navigateToAndroidSettingsForNotifications(activity);\n+ if (activity instanceof InAppNotificationActivity) {\n+ ((InAppNotificationActivity) activity).didDismiss(null);\n+ }\n+ return Unit.INSTANCE;\n+ }, () -> {\n+ if (activity instanceof InAppNotificationActivity) {\n+ ((InAppNotificationActivity) activity).didDismiss(null);\n+ }\n+ return Unit.INSTANCE;\n+ });\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": "@@ -147,7 +147,8 @@ public abstract class CTInAppBaseFragment extends Fragment {\ndidClick(data, button.getKeyValues());\nif (index == 0 && inAppNotification.isLocalInApp()) {\n- didClickForHardPermissionListener.didClickForHardPermission();\n+ didClickForHardPermissionListener.didClickForHardPermissionWithFallbackSettings(\n+ inAppNotification.fallBackToNotificationSettings());\nreturn;\n}else if (index == 1 && inAppNotification.isLocalInApp()){\ndidDismiss(data);\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,20 +102,6 @@ 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": "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.PushPermissionManager.ANDROID_PERMISSION_STRING;\nimport static com.clevertap.android.sdk.inapp.CTLocalInApp.FALLBACK_TO_NOTIFICATION_SETTINGS;\nimport android.Manifest;\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": "package com.clevertap.android.sdk.inbox;\n-import static com.clevertap.android.sdk.CTXtensions.isPackageAndOsTargetsAbove;\n+import static com.clevertap.android.sdk.Constants.NOTIFICATION_PERMISSION_REQUEST_CODE;\nimport static com.clevertap.android.sdk.inapp.InAppController.IS_FIRST_TIME_PERMISSION_REQUEST;\n-import android.Manifest;\nimport android.annotation.SuppressLint;\nimport android.content.Context;\nimport android.content.pm.PackageManager;\n@@ -15,12 +14,9 @@ import android.widget.FrameLayout;\nimport android.widget.LinearLayout;\nimport android.widget.TextView;\nimport androidx.annotation.NonNull;\n-import androidx.annotation.RequiresApi;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport androidx.appcompat.widget.Toolbar;\n-import androidx.core.app.ActivityCompat;\n-import androidx.core.content.ContextCompat;\nimport androidx.core.content.res.ResourcesCompat;\nimport androidx.fragment.app.Fragment;\nimport androidx.fragment.app.FragmentActivity;\n@@ -30,22 +26,17 @@ 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-import com.clevertap.android.sdk.CoreMetaData;\nimport com.clevertap.android.sdk.DidClickForHardPermissionListener;\nimport com.clevertap.android.sdk.InAppNotificationActivity;\nimport com.clevertap.android.sdk.Logger;\n+import com.clevertap.android.sdk.PushPermissionManager;\nimport com.clevertap.android.sdk.R;\nimport com.clevertap.android.sdk.StorageHelper;\n-import com.clevertap.android.sdk.Utils;\n-import com.clevertap.android.sdk.inapp.AlertDialogPromptForSettings;\nimport com.google.android.material.tabs.TabLayout;\nimport java.lang.ref.WeakReference;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\n-import java.util.Objects;\n-\n-import kotlin.Unit;\n/**\n* This activity shows the {@link CTInboxMessage} objects as per {@link CTInboxStyleConfig} style parameters\n@@ -78,9 +69,9 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nprivate CleverTapAPI cleverTapAPI;\nprivate CTInboxListener inboxContentUpdatedListener = null;\n+ private PushPermissionManager pushPermissionManager;\nprivate WeakReference<InAppNotificationActivity.PushPermissionResultCallback> permissionCallbackWeakReference;\n- private static final int PERMISSION_REQUEST_CODE = 2;\n- public static final String ANDROID_PERMISSION_STRING = \"android.permission.POST_NOTIFICATIONS\";\n+\npublic void onCreate(Bundle savedInstanceState) {\nsuper.onCreate(savedInstanceState);\n@@ -102,6 +93,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nsetPermissionCallback(CleverTapAPI.instanceWithConfig(this, config).getCoreState()\n.getInAppController());\n+ pushPermissionManager = new PushPermissionManager(this);\n}\norientation = getResources().getConfiguration().orientation;\n} catch (Throwable t) {\n@@ -229,52 +221,10 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nshowHardPermissionPrompt(fallbackToSettings);\n}\n- @Override\n- public void didClickForHardPermission() {\n- //No op\n- }\n-\n@SuppressLint(\"NewApi\")\n- public void showHardPermissionPrompt(boolean fbSettings){\n- if (isPackageAndOsTargetsAbove(this, 32)) {\n- requestPermission(fbSettings);\n- }\n- }\n-\n- @RequiresApi(api = 33)\n- public void requestPermission(boolean isFallbackSettingsEnabled) {\n- int permissionStatus = ContextCompat.checkSelfPermission(CTInboxActivity.this,\n- Manifest.permission.POST_NOTIFICATIONS);\n-\n- if (permissionStatus == PackageManager.PERMISSION_DENIED){\n- boolean isFirstTimeRequest = StorageHelper.getBoolean(CTInboxActivity.this,\n- IS_FIRST_TIME_PERMISSION_REQUEST,true);\n- boolean shouldShowRequestPermissionRationale = ActivityCompat.shouldShowRequestPermissionRationale(\n- Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n- ANDROID_PERMISSION_STRING);\n- if (!isFirstTimeRequest && shouldShowRequestPermissionRationale) {\n- if (isFallbackSettingsEnabled) {\n- showFallbackAlertDialog();\n- return;\n- }\n- permissionCallbackWeakReference.get().onPushPermissionDeny();\n- return;\n- }\n-\n- ActivityCompat.requestPermissions(CTInboxActivity.this,\n- new String[]{ANDROID_PERMISSION_STRING}, PERMISSION_REQUEST_CODE);\n- }else{\n- permissionCallbackWeakReference.get().onPushPermissionAccept();\n- }\n- }\n-\n- public void showFallbackAlertDialog() {\n- AlertDialogPromptForSettings.show(this, () -> {\n- Utils.navigateToAndroidSettingsForNotifications(CTInboxActivity.this);\n- return Unit.INSTANCE;\n- }, () -> {\n- return Unit.INSTANCE;\n- });\n+ public void showHardPermissionPrompt(boolean isFallbackSettingsEnabled){\n+ pushPermissionManager.showHardPermissionPrompt(isFallbackSettingsEnabled,\n+ permissionCallbackWeakReference.get());\n}\n@Override\n@@ -282,7 +232,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nsuper.onRequestPermissionsResult(requestCode, permissions, grantResults);\nStorageHelper.putBoolean(CTInboxActivity.this,IS_FIRST_TIME_PERMISSION_REQUEST,\nfalse);\n- if (requestCode == PERMISSION_REQUEST_CODE) {\n+ if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE) {\nboolean granted = grantResults.length > 0 && grantResults[0] ==\nPackageManager.PERMISSION_GRANTED;\nif (granted) {\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) - Add PushPermissionManager.java for requesting notification permission.
116,612
27.10.2022 19:18:04
-19,080
db05ba61863e8490707168d1f711cc33a4055b76
task(SDK-1970) : move in first time request count access to io thread
[ { "change_type": "ADD", "old_path": null, "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTPreferenceCache.kt", "diff": "+package com.clevertap.android.sdk\n+\n+import android.content.Context\n+import com.clevertap.android.sdk.inapp.InAppController\n+import com.clevertap.android.sdk.task.CTExecutorFactory\n+\n+class CTPreferenceCache {\n+\n+ var isFirstTimeRequest = firstTimeRequest\n+\n+ companion object {\n+\n+ @Volatile\n+ private var INSTANCE: CTPreferenceCache? = null\n+\n+ @JvmField\n+ var firstTimeRequest = true\n+\n+ @JvmStatic\n+ fun getInstance(context: Context, config: CleverTapInstanceConfig): CTPreferenceCache =\n+ INSTANCE ?: synchronized(this) {\n+ INSTANCE ?: buildCache(context, config)\n+ }\n+\n+ private fun buildCache(context: Context, config: CleverTapInstanceConfig): CTPreferenceCache {\n+ CTExecutorFactory.executors(config).ioTask<Void>().execute(\"buildCache\") {\n+ firstTimeRequest = StorageHelper.getBoolean(\n+ context,\n+ InAppController.IS_FIRST_TIME_PERMISSION_REQUEST, true\n+ )\n+ null\n+ }\n+ return CTPreferenceCache()\n+ }\n+\n+ @JvmStatic\n+ fun updateCacheToDisk(context: Context, config: CleverTapInstanceConfig) {\n+ CTExecutorFactory.executors(config).ioTask<Void>().execute(\"updateCacheToDisk\") {\n+ StorageHelper.putBoolean(\n+ context, InAppController.IS_FIRST_TIME_PERMISSION_REQUEST,\n+ firstTimeRequest\n+ )\n+ null\n+ }\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/InAppNotificationActivity.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/InAppNotificationActivity.java", "diff": "@@ -2,7 +2,6 @@ package com.clevertap.android.sdk;\nimport static com.clevertap.android.sdk.CTXtensions.isPackageAndOsTargetsAbove;\nimport static com.clevertap.android.sdk.inapp.InAppController.DISPLAY_HARD_PERMISSION_BUNDLE_KEY;\n-import static com.clevertap.android.sdk.inapp.InAppController.IS_FIRST_TIME_PERMISSION_REQUEST;\nimport static com.clevertap.android.sdk.inapp.InAppController.SHOW_FALLBACK_SETTINGS_BUNDLE_KEY;\nimport android.Manifest;\n@@ -38,7 +37,6 @@ import com.clevertap.android.sdk.inapp.InAppListener;\nimport java.lang.ref.WeakReference;\nimport java.util.HashMap;\nimport java.util.Objects;\n-\nimport kotlin.Unit;\npublic final class InAppNotificationActivity extends FragmentActivity implements InAppListener,\n@@ -223,8 +221,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nManifest.permission.POST_NOTIFICATIONS);\nif (permissionStatus == PackageManager.PERMISSION_DENIED){\n- boolean isFirstTimeRequest = StorageHelper.getBoolean(InAppNotificationActivity.this,\n- IS_FIRST_TIME_PERMISSION_REQUEST,true);\n+ boolean isFirstTimeRequest = CTPreferenceCache.getInstance(this, config).isFirstTimeRequest();\nboolean shouldShowRequestPermissionRationale = ActivityCompat.shouldShowRequestPermissionRationale(\nObjects.requireNonNull(CoreMetaData.getCurrentActivity()),\nANDROID_PERMISSION_STRING);\n@@ -265,8 +262,9 @@ public final class InAppNotificationActivity extends FragmentActivity implements\npublic void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,\n@NonNull int[] grantResults) {\nsuper.onRequestPermissionsResult(requestCode, permissions, grantResults);\n- StorageHelper.putBoolean(InAppNotificationActivity.this,IS_FIRST_TIME_PERMISSION_REQUEST,\n- false);\n+ CTPreferenceCache.getInstance(this, config).setFirstTimeRequest(false);\n+ CTPreferenceCache.updateCacheToDisk(this, config);\n+\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/StorageHelper.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/StorageHelper.java", "diff": "@@ -168,6 +168,12 @@ public final class StorageHelper {\npersist(editor);\n}\n+ public static void putBooleanImmediate(Context context, String key, boolean value) {\n+ SharedPreferences prefs = getPreferences(context);\n+ SharedPreferences.Editor editor = prefs.edit().putBoolean(key, value);\n+ persistImmediately(editor);\n+ }\n+\npublic static void putInt(Context context, String key, int value) {\nSharedPreferences prefs = getPreferences(context);\nSharedPreferences.Editor editor = prefs.edit().putInt(key, value);\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 androidx.fragment.app.FragmentActivity;\nimport androidx.fragment.app.FragmentTransaction;\nimport com.clevertap.android.sdk.AnalyticsManager;\nimport com.clevertap.android.sdk.BaseCallbackManager;\n+import com.clevertap.android.sdk.CTPreferenceCache;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.ControllerManager;\n@@ -199,8 +200,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nif (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,\n- true);\n+ boolean isFirstTimeRequest = CTPreferenceCache.getInstance(context, config).isFirstTimeRequest();\nboolean shouldShowRequestPermissionRationale = ActivityCompat.shouldShowRequestPermissionRationale(\nObjects.requireNonNull(CoreMetaData.getCurrentActivity()),\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": "package com.clevertap.android.sdk.inbox;\nimport static com.clevertap.android.sdk.CTXtensions.isPackageAndOsTargetsAbove;\n-import static com.clevertap.android.sdk.inapp.InAppController.IS_FIRST_TIME_PERMISSION_REQUEST;\n+\nimport android.Manifest;\nimport android.annotation.SuppressLint;\nimport android.content.Context;\n@@ -25,9 +25,9 @@ import androidx.core.content.res.ResourcesCompat;\nimport androidx.fragment.app.Fragment;\nimport androidx.fragment.app.FragmentActivity;\nimport androidx.viewpager.widget.ViewPager;\n-\nimport com.clevertap.android.sdk.CTInboxListener;\nimport com.clevertap.android.sdk.CTInboxStyleConfig;\n+import com.clevertap.android.sdk.CTPreferenceCache;\nimport com.clevertap.android.sdk.CleverTapAPI;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.CoreMetaData;\n@@ -35,7 +35,6 @@ import com.clevertap.android.sdk.DidClickForHardPermissionListener;\nimport com.clevertap.android.sdk.InAppNotificationActivity;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.R;\n-import com.clevertap.android.sdk.StorageHelper;\nimport com.clevertap.android.sdk.Utils;\nimport com.clevertap.android.sdk.inapp.AlertDialogPromptForSettings;\nimport com.google.android.material.tabs.TabLayout;\n@@ -44,7 +43,6 @@ import java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Objects;\n-\nimport kotlin.Unit;\n/**\n@@ -75,11 +73,15 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nprivate CleverTapInstanceConfig config;\nprivate WeakReference<InboxActivityListener> listenerWeakReference;\n+\nprivate CleverTapAPI cleverTapAPI;\n+\nprivate CTInboxListener inboxContentUpdatedListener = null;\nprivate WeakReference<InAppNotificationActivity.PushPermissionResultCallback> permissionCallbackWeakReference;\n+\nprivate static final int PERMISSION_REQUEST_CODE = 2;\n+\npublic static final String ANDROID_PERMISSION_STRING = \"android.permission.POST_NOTIFICATIONS\";\npublic void onCreate(Bundle savedInstanceState) {\n@@ -247,8 +249,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nManifest.permission.POST_NOTIFICATIONS);\nif (permissionStatus == PackageManager.PERMISSION_DENIED) {\n- boolean isFirstTimeRequest = StorageHelper.getBoolean(CTInboxActivity.this,\n- IS_FIRST_TIME_PERMISSION_REQUEST,true);\n+ boolean isFirstTimeRequest = CTPreferenceCache.getInstance(this, config).isFirstTimeRequest();\nboolean shouldShowRequestPermissionRationale = ActivityCompat.shouldShowRequestPermissionRationale(\nObjects.requireNonNull(CoreMetaData.getCurrentActivity()),\nANDROID_PERMISSION_STRING);\n@@ -278,10 +279,12 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\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);\n- StorageHelper.putBoolean(CTInboxActivity.this,IS_FIRST_TIME_PERMISSION_REQUEST,\n- false);\n+ CTPreferenceCache.getInstance(this, config).setFirstTimeRequest(false);\n+ CTPreferenceCache.updateCacheToDisk(this, config);\n+\nif (requestCode == PERMISSION_REQUEST_CODE) {\nboolean granted = grantResults.length > 0 && grantResults[0] ==\nPackageManager.PERMISSION_GRANTED;\n@@ -328,7 +331,8 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nLogger.v(\"CTInboxActivity|inboxMessagesDidUpdate called\");\ntry {\nboolean isCUListenerAvailable = inboxContentUpdatedListener != null;\n- Logger.v(\"CTInboxActivity|inboxMessagesDidUpdate: inboxContentUpdatedListener available:\" + isCUListenerAvailable);\n+ Logger.v(\"CTInboxActivity|inboxMessagesDidUpdate: inboxContentUpdatedListener available:\"\n+ + isCUListenerAvailable);\nboolean isUsingMultipleTabs = styleConfig.isUsingTabs();\nLogger.v(\"CTInboxActivity|inboxMessagesDidUpdate: isUsingMultipleTabs : \" + isUsingMultipleTabs);\n@@ -340,13 +344,13 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nint position = viewPager.getCurrentItem();\nCTInboxListViewFragment fragment = (CTInboxListViewFragment) inboxTabAdapter.getItem(position);\nfragment.updateAdapterContent();\n- }\n- else {\n+ } else {\nList<Fragment> fragments = getSupportFragmentManager().getFragments();\nString singleTabTag = getFragmentTag();\nfor (Fragment f : fragments) {\nString currentFTag = f.getTag();\n- if (f instanceof CTInboxListViewFragment && currentFTag != null && currentFTag.equalsIgnoreCase(singleTabTag)) {\n+ if (f instanceof CTInboxListViewFragment && currentFTag != null && currentFTag.equalsIgnoreCase(\n+ singleTabTag)) {\n((CTInboxListViewFragment) f).updateAdapterContent();\n}\n}\n@@ -368,7 +372,8 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n@Override\npublic void messageDidShow(Context baseContext, CTInboxMessage inboxMessage, Bundle data) {\n- Logger.v(\"CTInboxActivity:messageDidShow() called with: data = [\" + data + \"], inboxMessage = [\" + inboxMessage .getMessageId()+ \"]\");\n+ Logger.v(\"CTInboxActivity:messageDidShow() called with: data = [\" + data + \"], inboxMessage = [\"\n+ + inboxMessage.getMessageId() + \"]\");\ndidShow(data, inboxMessage);\n}\n@@ -380,7 +385,8 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n}\nvoid didShow(Bundle data, CTInboxMessage inboxMessage) {\n- Logger.v( \"CTInboxActivity:didShow() called with: data = [\" + data + \"], inboxMessage = [\" + inboxMessage.getMessageId() + \"]\");\n+ Logger.v(\"CTInboxActivity:didShow() called with: data = [\" + data + \"], inboxMessage = [\"\n+ + inboxMessage.getMessageId() + \"]\");\nInboxActivityListener listener = getListener();\nif (listener != null) {\nlistener.messageDidShow(this, inboxMessage, data);\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) : move in first time request count access to io thread
116,612
27.10.2022 19:30:26
-19,080
50b2eabba743ca6e541a84da0a0593473fb7abb6
task(SDK-1970) : move is first time request count access to io thread
[ { "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": "@@ -77,7 +77,7 @@ public final class InAppNotificationActivity extends FragmentActivity implements\nsetPermissionCallback(CleverTapAPI.instanceWithConfig(this, config).getCoreState()\n.getInAppController());\n- pushPermissionManager = new PushPermissionManager(this);\n+ pushPermissionManager = new PushPermissionManager(this, config);\nif (showHardNotificationPermission) {\nboolean shouldShowFallbackSettings = notif.getBoolean(SHOW_FALLBACK_SETTINGS_BUNDLE_KEY,\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushPermissionManager.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushPermissionManager.java", "diff": "@@ -2,7 +2,7 @@ package com.clevertap.android.sdk;\nimport static com.clevertap.android.sdk.CTXtensions.isPackageAndOsTargetsAbove;\nimport static com.clevertap.android.sdk.Constants.NOTIFICATION_PERMISSION_REQUEST_CODE;\n-import static com.clevertap.android.sdk.inapp.InAppController.IS_FIRST_TIME_PERMISSION_REQUEST;\n+\nimport android.Manifest;\nimport android.annotation.SuppressLint;\nimport android.app.Activity;\n@@ -16,13 +16,18 @@ import kotlin.Unit;\npublic class PushPermissionManager {\n+ private final CleverTapInstanceConfig config;\n+\nprivate boolean isFallbackSettingsEnabled;\n+\npublic static final String ANDROID_PERMISSION_STRING = \"android.permission.POST_NOTIFICATIONS\";\n+\nprivate final Activity activity;\n- public PushPermissionManager(Activity activity) {\n+ public PushPermissionManager(Activity activity, CleverTapInstanceConfig config) {\nthis.activity = activity;\n+ this.config = config;\n}\n@SuppressLint(\"NewApi\")\n@@ -41,8 +46,7 @@ public class PushPermissionManager {\nManifest.permission.POST_NOTIFICATIONS);\nif (permissionStatus == PackageManager.PERMISSION_DENIED){\n- boolean isFirstTimeRequest = StorageHelper.getBoolean(activity,\n- IS_FIRST_TIME_PERMISSION_REQUEST,true);\n+ boolean isFirstTimeRequest = CTPreferenceCache.getInstance(activity, config).isFirstTimeRequest();\nboolean shouldShowRequestPermissionRationale = ActivityCompat.shouldShowRequestPermissionRationale(\nObjects.requireNonNull(CoreMetaData.getCurrentActivity()),\nANDROID_PERMISSION_STRING);\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": "package com.clevertap.android.sdk.inbox;\nimport static com.clevertap.android.sdk.Constants.NOTIFICATION_PERMISSION_REQUEST_CODE;\n-import static com.clevertap.android.sdk.inapp.InAppController.IS_FIRST_TIME_PERMISSION_REQUEST;\n+\nimport android.annotation.SuppressLint;\nimport android.content.Context;\nimport android.content.pm.PackageManager;\n@@ -31,7 +31,6 @@ import com.clevertap.android.sdk.InAppNotificationActivity;\nimport com.clevertap.android.sdk.Logger;\nimport com.clevertap.android.sdk.PushPermissionManager;\nimport com.clevertap.android.sdk.R;\n-import com.clevertap.android.sdk.StorageHelper;\nimport com.google.android.material.tabs.TabLayout;\nimport java.lang.ref.WeakReference;\nimport java.util.ArrayList;\n@@ -95,7 +94,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nsetPermissionCallback(CleverTapAPI.instanceWithConfig(this, config).getCoreState()\n.getInAppController());\n- pushPermissionManager = new PushPermissionManager(this);\n+ pushPermissionManager = new PushPermissionManager(this, config);\n}\norientation = getResources().getConfiguration().orientation;\n} catch (Throwable t) {\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) : move is first time request count access to io thread
116,616
27.10.2022 20:26:43
-19,080
72d46196cdc1a47e07103bec4894322843e36c2a
task(SDK-1970) - refactor CTPreferenceCache.kt
[ { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTPreferenceCache.kt", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTPreferenceCache.kt", "diff": "@@ -6,7 +6,10 @@ import com.clevertap.android.sdk.task.CTExecutorFactory\nclass CTPreferenceCache {\n- var isFirstTimeRequest = firstTimeRequest\n+ fun isFirstTimeRequest() = firstTimeRequest\n+ fun setFirstTimeRequest(fTR : Boolean) {\n+ firstTimeRequest = fTR\n+ }\ncompanion object {\n@@ -19,7 +22,7 @@ class CTPreferenceCache {\n@JvmStatic\nfun getInstance(context: Context, config: CleverTapInstanceConfig): CTPreferenceCache =\nINSTANCE ?: synchronized(this) {\n- INSTANCE ?: buildCache(context, config)\n+ INSTANCE ?: buildCache(context, config).also { INSTANCE = it }\n}\nprivate fun buildCache(context: Context, config: CleverTapInstanceConfig): CTPreferenceCache {\n@@ -36,7 +39,7 @@ class CTPreferenceCache {\n@JvmStatic\nfun updateCacheToDisk(context: Context, config: CleverTapInstanceConfig) {\nCTExecutorFactory.executors(config).ioTask<Void>().execute(\"updateCacheToDisk\") {\n- StorageHelper.putBoolean(\n+ StorageHelper.putBooleanImmediate(\ncontext, InAppController.IS_FIRST_TIME_PERMISSION_REQUEST,\nfirstTimeRequest\n)\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapFactory.java", "diff": "@@ -48,6 +48,8 @@ class CleverTapFactory {\nDeviceInfo deviceInfo = new DeviceInfo(context, config, cleverTapID, coreMetaData);\ncoreState.setDeviceInfo(deviceInfo);\n+ CTPreferenceCache.getInstance(context,config);\n+\nBaseCallbackManager callbackManager = new CallbackManager(config, deviceInfo);\ncoreState.setCallbackManager(callbackManager);\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushPermissionResponseListener.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushPermissionResponseListener.java", "diff": "@@ -11,5 +11,5 @@ public interface PushPermissionResponseListener {\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 onPushPermissionResponse(boolean accepted);//Change method name here, sounds ambiguous\n+ void onPushPermissionResponse(boolean accepted);\n}\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) - refactor CTPreferenceCache.kt
116,616
28.10.2022 10:44:27
-19,080
b195a50c8b9ec323f0446a0e8f1ee1ea5d10cfac
task(SDK-1970) - Update EXAMPLES.md and changelogs
[ { "change_type": "MODIFY", "old_path": "docs/CTCORECHANGELOG.md", "new_path": "docs/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.7.0 (October 28, 2022)\n+* Adds below new public APIs for supporting Android 13 notification runtime permission.\n+ * `isPushPermissionGranted()`\n+ * `promptPushPrimer(JSONObject)`\n+ * `promptForPushPermission(boolean showFallbackSettings)`\n+*New callback `PushPermissionResponseListener` available which returns after user Allows/Denies notification permission.\n+* From 4.7.0+ existing callback `InAppNotificationListener` will now have `onShow(CTInAppNotification)` method which needs to implemented.\n+\n### Version 4.6.5 (October 21, 2022)\n* Allows more special characters when setting custom CleverTap ID\n" }, { "change_type": "MODIFY", "old_path": "docs/CTGEOFENCECHANGELOG.md", "new_path": "docs/CTGEOFENCECHANGELOG.md", "diff": "## CleverTap Geofence SDK CHANGE LOG\n-### Version 1.2.0 (October 21, 2022)\n+### Version 1.2.0 (October 28, 2022)\n* Updates [play-services-location](https://developers.google.com/android/guides/releases#october_13_2022) to `v21.0.0`\n* Updates [work-runtime](https://developer.android.com/jetpack/androidx/releases/work#2.7.1) to `v2.7.1`\n* Targets Android 13\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.2 (October 28, 2022)\n+* Updated Huawei Push SDK to v6.7.0.300\n+* Supports CleverTap Android SDK v4.7.0\n+\n### Version 1.3.1 (September 6, 2022)\n* Updated Huawei Push SDK to v6.5.0.300\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.6 (October 21, 2022)\n+### Version 1.0.6 (October 28, 2022)\n* Targets Android 13\n* Supports CleverTap Android SDK v4.7.0\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.2 (October 28, 2022)\n+* Updated Xiaomi Push SDK to v5.1.1\n+* Supports CleverTap Android SDK v4.7.0\n+\n### Version 1.5.1 (October 11, 2022)\n* Support for providing region to MiPushClient via MultiInstance too\n" }, { "change_type": "MODIFY", "old_path": "templates/CTCORECHANGELOG.md", "new_path": "templates/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.7.0 (October 28, 2022)\n+* Adds below new public APIs for supporting Android 13 notification runtime permission.\n+ * `isPushPermissionGranted()`\n+ * `promptPushPrimer(JSONObject)`\n+ * `promptForPushPermission(boolean showFallbackSettings)`\n+*New callback `PushPermissionResponseListener` available which returns after user Allows/Denies notification permission.\n+* From 4.7.0+ existing callback `InAppNotificationListener` will now have `onShow(CTInAppNotification)` method which needs to implemented.\n+\n### Version 4.6.5 (October 21, 2022)\n* Allows more special characters when setting custom CleverTap ID\n" }, { "change_type": "MODIFY", "old_path": "templates/CTGEOFENCECHANGELOG.md", "new_path": "templates/CTGEOFENCECHANGELOG.md", "diff": "## CleverTap Geofence SDK CHANGE LOG\n-### Version 1.2.0 (October 21, 2022)\n+### Version 1.2.0 (October 28, 2022)\n* Updates [play-services-location](https://developers.google.com/android/guides/releases#october_13_2022) to `v21.0.0`\n* Updates [work-runtime](https://developer.android.com/jetpack/androidx/releases/work#2.7.1) to `v2.7.1`\n* Targets Android 13\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.2 (October 28, 2022)\n+* Updated Huawei Push SDK to v6.7.0.300\n+* Supports CleverTap Android SDK v4.7.0\n+\n### Version 1.3.1 (September 6, 2022)\n* Updated Huawei Push SDK to v6.5.0.300\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.6 (October 21, 2022)\n+### Version 1.0.6 (October 28, 2022)\n* Targets Android 13\n* Supports CleverTap Android SDK v4.7.0\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.2 (October 28, 2022)\n+* Updated Xiaomi Push SDK to v5.1.1\n+* Supports CleverTap Android SDK v4.7.0\n+\n### Version 1.5.1 (October 11, 2022)\n* Support for providing region to MiPushClient via MultiInstance too\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) - Update EXAMPLES.md and changelogs
116,616
28.10.2022 11:23:43
-19,080
fccd2b62112ec53323333208af86d71b45796e3a
task(SDK-1970) - Update all TODOs
[ { "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": "@@ -654,7 +654,7 @@ public class CTInAppNotification implements Parcelable {\nif (buttonArray != null) {\nfor (int i = 0; i < buttonArray.length(); i++) {\nCTInAppNotificationButton inAppNotificationButton = new CTInAppNotificationButton()\n- .initWithJSON(buttonArray.getJSONObject(i),inAppType);//TODO REMOVE THIS AFTER TESTING AND BACKEND CHANGE IS INCLUDED and before RELEASE\n+ .initWithJSON(buttonArray.getJSONObject(i));\nif (inAppNotificationButton != null && inAppNotificationButton.getError() == null) {\nthis.buttons.add(inAppNotificationButton);\nthis.buttonCount++;\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": "@@ -179,7 +179,7 @@ public class CTInAppNotificationButton implements Parcelable {\nthis.textColor = textColor;\n}\n- CTInAppNotificationButton initWithJSON(JSONObject jsonObject, CTInAppType inAppType) {\n+ CTInAppNotificationButton initWithJSON(JSONObject jsonObject) {\ntry {\nthis.jsonDescription = jsonObject;\nthis.text = jsonObject.has(Constants.KEY_TEXT) ? jsonObject.getString(Constants.KEY_TEXT) : \"\";\n@@ -195,34 +195,14 @@ 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 and before RELEASE\n- if (inAppType == CTInAppType.CTInAppTypeCoverImageOnly ||\n- inAppType == CTInAppType.CTInAppTypeInterstitialImageOnly ||\n- inAppType == CTInAppType.CTInAppTypeHalfInterstitialImageOnly){\n- actions.put(Constants.KEY_TYPE, Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION);\n- actions.put(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS, true);\n- }else {\n- //TODO REMOVE THIS AFTER TESTING AND BACKEND CHANGE IS INCLUDED and before RELEASE\n- if (jsonObject.has(Constants.KEY_TEXT) && jsonObject.getString(\n- Constants.KEY_TEXT).contains(\"Allow\")) {\n- actions.put(Constants.KEY_TYPE, Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION);\n- actions.put(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS, true);\n- }\n- }\n- ////\n-\nString action = actions.has(Constants.KEY_ANDROID) ? actions.getString(Constants.KEY_ANDROID) : \"\";\nif (!action.isEmpty()) {\nthis.actionUrl = action;\n}\n- //TODO Modify the below lines when package is released. Add empty checks here too.\n- if (actions.getString(Constants.KEY_TYPE).equalsIgnoreCase(\n- Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)) {\n- type = actions.getString(Constants.KEY_TYPE);\n- fallbackToSettings = actions.getBoolean(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS);\n- }\n+ type = actions.has(Constants.KEY_TYPE) ? actions.getString(Constants.KEY_TYPE) : \"\";\n+ fallbackToSettings = actions.has(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS) ?\n+ actions.getBoolean(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS) : false;\n}\n//Custom Key Value pairs\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessageContent.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inbox/CTInboxMessageContent.java", "diff": "@@ -280,11 +280,6 @@ public class CTInboxMessageContent implements Parcelable {\nreturn null;\n}\ntry {\n- //TODO REMOVE THIS AFTER TESTING AND BACKEND CHANGE IS INCLUDED\n- if (jsonObject.getString(Constants.KEY_TEXT).contains(\"Allow\")){\n- jsonObject.put(Constants.KEY_TYPE, Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION);\n- jsonObject.put(Constants.KEY_FALLBACK_NOTIFICATION_SETTINGS, true);\n- }\nreturn jsonObject.has(Constants.KEY_TYPE) ? jsonObject.getString(Constants.KEY_TYPE) : \"\";\n} catch (JSONException e) {\nLogger.v(\"Unable to get Link Type with JSON - \" + e.getLocalizedMessage());\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": "@@ -268,6 +268,6 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\n}\noverride fun onInAppButtonClick(payload: HashMap<String, String>?) {\n- TODO(\"Not yet implemented\")\n+ Log.i(TAG, \"onInAppButtonClick() called\")\n}\n}\n\\ No newline at end of file\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) - Update all TODOs
116,616
28.10.2022 14:56:46
-19,080
64ace8c397199b668ec63951e6d4613a6281b81a
task(SDK-1970) - Register `PushPermissionResponseListener` when return from app's notification settings
[ { "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": "@@ -4,6 +4,7 @@ import static com.clevertap.android.sdk.Constants.NOTIFICATION_PERMISSION_REQUES\nimport static com.clevertap.android.sdk.inapp.InAppController.DISPLAY_HARD_PERMISSION_BUNDLE_KEY;\nimport static com.clevertap.android.sdk.inapp.InAppController.SHOW_FALLBACK_SETTINGS_BUNDLE_KEY;\n+import android.Manifest;\nimport android.annotation.SuppressLint;\nimport android.app.AlertDialog;\nimport android.content.Context;\n@@ -15,6 +16,7 @@ import android.net.Uri;\nimport android.os.Bundle;\nimport android.view.WindowManager;\nimport androidx.annotation.NonNull;\n+import androidx.core.content.ContextCompat;\nimport androidx.fragment.app.FragmentActivity;\nimport com.clevertap.android.sdk.inapp.CTInAppBaseFullFragment;\nimport com.clevertap.android.sdk.inapp.CTInAppHtmlCoverFragment;\n@@ -136,6 +138,23 @@ public final class InAppNotificationActivity extends FragmentActivity implements\n}\n}\n+ @Override\n+ protected void onResume() {\n+ super.onResume();\n+ if (pushPermissionManager.isFromNotificationSettingsActivity()){\n+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {\n+ int permissionStatus = ContextCompat.checkSelfPermission(this,\n+ Manifest.permission.POST_NOTIFICATIONS);\n+ if (permissionStatus == PackageManager.PERMISSION_GRANTED){\n+ pushPermissionResultCallbackWeakReference.get().onPushPermissionAccept();\n+ } else {\n+ pushPermissionResultCallbackWeakReference.get().onPushPermissionDeny();\n+ }\n+ didDismiss(null);\n+ }\n+ }\n+ }\n+\n@Override\npublic void finish() {\nsuper.finish();\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushPermissionManager.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushPermissionManager.java", "diff": "@@ -24,10 +24,16 @@ public class PushPermissionManager {\nprivate final Activity activity;\n+ private boolean isFromNotificationSettingsActivity;\npublic PushPermissionManager(Activity activity, CleverTapInstanceConfig config) {\nthis.activity = activity;\nthis.config = config;\n+ this.isFromNotificationSettingsActivity = false;\n+ }\n+\n+ public boolean isFromNotificationSettingsActivity(){\n+ return isFromNotificationSettingsActivity;\n}\n@SuppressLint(\"NewApi\")\n@@ -75,9 +81,7 @@ public class PushPermissionManager {\npublic void showFallbackAlertDialog() {\nAlertDialogPromptForSettings.show(activity, () -> {\nUtils.navigateToAndroidSettingsForNotifications(activity);\n- if (activity instanceof InAppNotificationActivity) {\n- ((InAppNotificationActivity) activity).didDismiss(null);\n- }\n+ isFromNotificationSettingsActivity = true;\nreturn Unit.INSTANCE;\n}, () -> {\nif (activity instanceof InAppNotificationActivity) {\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": "@@ -155,7 +155,7 @@ public abstract class CTInAppBaseFragment extends Fragment {\nreturn;\n}\n- if (button.getType() != null && button.getType().equalsIgnoreCase(\n+ if (button.getType() != null && button.getType().contains(\nConstants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)){\ndidClickForHardPermissionListener.\ndidClickForHardPermissionWithFallbackSettings(button.isFallbackToSettings());\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": "@@ -269,8 +269,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n@RequiresApi(api = 33)\npublic boolean isPushPermissionGranted(){\n- int permissionStatus = ContextCompat.checkSelfPermission(\n- Objects.requireNonNull(CoreMetaData.getCurrentActivity()),\n+ int permissionStatus = ContextCompat.checkSelfPermission(context,\nManifest.permission.POST_NOTIFICATIONS);\nreturn permissionStatus == PackageManager.PERMISSION_GRANTED;\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": "@@ -2,6 +2,7 @@ package com.clevertap.android.sdk.inbox;\nimport static com.clevertap.android.sdk.Constants.NOTIFICATION_PERMISSION_REQUEST_CODE;\n+import android.Manifest;\nimport android.annotation.SuppressLint;\nimport android.content.Context;\nimport android.content.pm.PackageManager;\n@@ -17,6 +18,7 @@ import androidx.annotation.NonNull;\nimport androidx.annotation.RestrictTo;\nimport androidx.annotation.RestrictTo.Scope;\nimport androidx.appcompat.widget.Toolbar;\n+import androidx.core.content.ContextCompat;\nimport androidx.core.content.res.ResourcesCompat;\nimport androidx.fragment.app.Fragment;\nimport androidx.fragment.app.FragmentActivity;\n@@ -71,7 +73,8 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nprivate CTInboxListener inboxContentUpdatedListener = null;\nprivate PushPermissionManager pushPermissionManager;\n- private WeakReference<InAppNotificationActivity.PushPermissionResultCallback> permissionCallbackWeakReference;\n+ private WeakReference<InAppNotificationActivity.PushPermissionResultCallback>\n+ pushPermissionResultCallbackWeakReference;\npublic void onCreate(Bundle savedInstanceState) {\n@@ -217,6 +220,22 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n}\n}\n+ @Override\n+ protected void onResume() {\n+ super.onResume();\n+ if (pushPermissionManager.isFromNotificationSettingsActivity()){\n+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {\n+ int permissionStatus = ContextCompat.checkSelfPermission(this,\n+ Manifest.permission.POST_NOTIFICATIONS);\n+ if (permissionStatus == PackageManager.PERMISSION_GRANTED){\n+ pushPermissionResultCallbackWeakReference.get().onPushPermissionAccept();\n+ } else {\n+ pushPermissionResultCallbackWeakReference.get().onPushPermissionDeny();\n+ }\n+ }\n+ }\n+ }\n+\n@Override\npublic void didClickForHardPermissionWithFallbackSettings(boolean fallbackToSettings) {\nshowHardPermissionPrompt(fallbackToSettings);\n@@ -225,7 +244,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\n@SuppressLint(\"NewApi\")\npublic void showHardPermissionPrompt(boolean isFallbackSettingsEnabled){\npushPermissionManager.showHardPermissionPrompt(isFallbackSettingsEnabled,\n- permissionCallbackWeakReference.get());\n+ pushPermissionResultCallbackWeakReference.get());\n}\n@Override\n@@ -238,15 +257,15 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nboolean granted = grantResults.length > 0 && grantResults[0] ==\nPackageManager.PERMISSION_GRANTED;\nif (granted) {\n- permissionCallbackWeakReference.get().onPushPermissionAccept();\n+ pushPermissionResultCallbackWeakReference.get().onPushPermissionAccept();\n} else {\n- permissionCallbackWeakReference.get().onPushPermissionDeny();\n+ pushPermissionResultCallbackWeakReference.get().onPushPermissionDeny();\n}\n}\n}\npublic void setPermissionCallback(InAppNotificationActivity.PushPermissionResultCallback callback) {\n- permissionCallbackWeakReference = new WeakReference<>(callback);\n+ pushPermissionResultCallbackWeakReference = new WeakReference<>(callback);\n}\n@Override\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": "@@ -294,7 +294,7 @@ public class CTInboxListViewFragment extends Fragment {\nString isRequestForPermissionStr = inboxMessages.get(position).getInboxMessageContents().\nget(0).getLinktype(jsonObject);\n- if (isRequestForPermissionStr.equalsIgnoreCase(Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)){\n+ if (isRequestForPermissionStr.contains(Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)){\nboolean isFallbackSettings = inboxMessages.get(position).\ngetInboxMessageContents().get(0).isFallbackSettingsEnabled(jsonObject);\ndidClickForHardPermissionListener.didClickForHardPermissionWithFallbackSettings(isFallbackSettings);\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": "package com.clevertap.demo\n+import android.app.NotificationManager\nimport android.content.Context\nimport android.content.Intent\n@@ -262,6 +263,17 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\nLog.i(TAG, \"InApp---> response() called $accepted\")\nif(accepted){\nToast.makeText(this, \"Permission granted!\", Toast.LENGTH_SHORT).show()\n+\n+ //For Android 13+ we need to create notification channel after notification permission is accepted\n+ CleverTapAPI.createNotificationChannel(\n+ this, \"BRTesting\", \"Core\",\n+ \"Core notifications\", NotificationManager.IMPORTANCE_MAX, true\n+ )\n+\n+ CleverTapAPI.createNotificationChannel(\n+ this, \"PTTesting\", \"Push templates\",\n+ \"All push templates\", NotificationManager.IMPORTANCE_MAX, true\n+ )\n}else{\nToast.makeText(this, \"Permission denied!\", Toast.LENGTH_SHORT).show()\n}\n" }, { "change_type": "MODIFY", "old_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt", "new_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt", "diff": "@@ -88,6 +88,8 @@ class MyApplication : MultiDexApplication(), CTPushNotificationListener, Activit\n\"CleverTapAttribution Identifier from Application class= \" +\n\"${defaultInstance?.cleverTapAttributionIdentifier}\"\n)*/\n+\n+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {\nCleverTapAPI.createNotificationChannel(\nthis, \"BRTesting\", \"Core\",\n\"Core notifications\", NotificationManager.IMPORTANCE_MAX, true\n@@ -97,6 +99,7 @@ class MyApplication : MultiDexApplication(), CTPushNotificationListener, Activit\n\"All push templates\", NotificationManager.IMPORTANCE_MAX, true\n)\n}\n+ }\noverride fun onNotificationClickedPayloadReceived(payload: HashMap<String, Any>?) {\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) - Register `PushPermissionResponseListener` when return from app's notification settings
116,616
28.10.2022 16:40:38
-19,080
680816f993d53d92cf94966217ac5d33cc4f9b3b
task(SDK-1970) - Update EXAMPLES.md and changelogs and added missing javadoc for new classes
[ { "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": "@@ -60,8 +60,6 @@ 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 setPushPermissionResponseListener(PushPermissionResponseListener pushPermissionResponseListener);\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushPermissionManager.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/PushPermissionManager.java", "diff": "@@ -14,6 +14,12 @@ import com.clevertap.android.sdk.inapp.AlertDialogPromptForSettings;\nimport java.util.Objects;\nimport kotlin.Unit;\n+/**\n+ * This class abstracts notification permission request flow for Android 13+ devices. To call Android OS notification\n+ * permission flow from activity, one should call `showHardPermissionPrompt()` which will request for\n+ * notification permission and gives back result of the permission to the caller activity. *\n+ *\n+ * */\npublic class PushPermissionManager {\nprivate final CleverTapInstanceConfig config;\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": "@@ -7,6 +7,10 @@ import android.os.Build.VERSION_CODES.LOLLIPOP\nimport com.clevertap.android.sdk.CTStringResources\nimport com.clevertap.android.sdk.R\n+/**\n+ * This class shows an Alert dialog to display a rationale message if notification permission is\n+ * already denied.\n+ */\nclass AlertDialogPromptForSettings private constructor() {\ncompanion object {\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": "package com.clevertap.android.sdk.inapp\n-import android.content.Context\nimport com.clevertap.android.sdk.Constants\n-import com.clevertap.android.sdk.DeviceInfo\nimport org.json.JSONArray\nimport org.json.JSONObject\n+/**\n+ * Builder class which creates an JSON object to display local in-app. Only supports half-interstitial\n+ * and alert local in-apps.\n+ */\nclass CTLocalInApp private constructor() {\nenum class InAppType(val type: String) {\n" }, { "change_type": "MODIFY", "old_path": "docs/CTCORECHANGELOG.md", "new_path": "docs/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n### Version 4.7.0 (October 28, 2022)\n-* Adds below new public APIs for supporting Android 13 notification runtime permission.\n- * `isPushPermissionGranted()`\n- * `promptPushPrimer(JSONObject)`\n- * `promptForPushPermission(boolean showFallbackSettings)`\n-*New callback `PushPermissionResponseListener` available which returns after user Allows/Denies notification permission.\n+* Adds below new public APIs for supporting [Android 13 notification runtime permission](https://developer.android.com/develop/ui/views/notifications/notification-permission)\n+ * `isPushPermissionGranted()` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#check-the-status-of-notification-permission-whether-its-granted-or-denied)\n+ * `promptPushPrimer(JSONObject)` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#push-primer-android-13-notification-runtime-permission)\n+ * `promptForPushPermission(boolean showFallbackSettings)` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#call-android-os-runtime-notification-dialog-without-using-push-primer)\n+* New `CTLocalInApp` builder class available to create half-interstitial & alert local in-apps to request notification permission. [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#ctlocalinapp-builder-methods-description)\n+* New callback `PushPermissionResponseListener` available which returns after user Allows/Denies notification permission. [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#available-callbacks-for-push-primer)\n* From 4.7.0+ existing callback `InAppNotificationListener` will now have `onShow(CTInAppNotification)` method which needs to implemented.\n+* Minimum Android SDK version bumped to API 19 (Android 4.4).\n### Version 4.6.5 (October 21, 2022)\n* Allows more special characters when setting custom CleverTap ID\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.2 (October 28, 2022)\n-* Updated Huawei Push SDK to v6.7.0.300\n+* Updated Huawei Push SDK to v6.7.0.300 which supports Android 13\n* Supports CleverTap Android SDK v4.7.0\n### Version 1.3.1 (September 6, 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.2 (October 28, 2022)\n-* Updated Xiaomi Push SDK to v5.1.1\n+* Updated Xiaomi Push SDK to v5.1.1 which supports Android 13\n* Supports CleverTap Android SDK v4.7.0\n### Version 1.5.1 (October 11, 2022)\n" }, { "change_type": "MODIFY", "old_path": "templates/CTCORECHANGELOG.md", "new_path": "templates/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n### Version 4.7.0 (October 28, 2022)\n-* Adds below new public APIs for supporting Android 13 notification runtime permission.\n- * `isPushPermissionGranted()`\n- * `promptPushPrimer(JSONObject)`\n- * `promptForPushPermission(boolean showFallbackSettings)`\n-* New callback `PushPermissionResponseListener` available which returns after user Allows/Denies notification permission.\n+* Adds below new public APIs for supporting [Android 13 notification runtime permission](https://developer.android.com/develop/ui/views/notifications/notification-permission)\n+ * `isPushPermissionGranted()` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#check-the-status-of-notification-permission-whether-its-granted-or-denied)\n+ * `promptPushPrimer(JSONObject)` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#push-primer-android-13-notification-runtime-permission)\n+ * `promptForPushPermission(boolean showFallbackSettings)` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#call-android-os-runtime-notification-dialog-without-using-push-primer)\n+* New `CTLocalInApp` builder class available to create half-interstitial & alert local in-apps to request notification permission. [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#ctlocalinapp-builder-methods-description)\n+* New callback `PushPermissionResponseListener` available which returns after user Allows/Denies notification permission. [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#available-callbacks-for-push-primer)\n* From 4.7.0+ existing callback `InAppNotificationListener` will now have `onShow(CTInAppNotification)` method which needs to implemented.\n+* Minimum Android SDK version bumped to API 19 (Android 4.4).\n### Version 4.6.5 (October 21, 2022)\n* Allows more special characters when setting custom CleverTap ID\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.2 (October 28, 2022)\n-* Updated Huawei Push SDK to v6.7.0.300\n+* Updated Huawei Push SDK to v6.7.0.300 which supports Android 13\n* Supports CleverTap Android SDK v4.7.0\n### Version 1.3.1 (September 6, 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.2 (October 28, 2022)\n-* Updated Xiaomi Push SDK to v5.1.1\n+* Updated Xiaomi Push SDK to v5.1.1 which supports Android 13\n* Supports CleverTap Android SDK v4.7.0\n### Version 1.5.1 (October 11, 2022)\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) - Update EXAMPLES.md and changelogs and added missing javadoc for new classes
116,616
28.10.2022 16:51:45
-19,080
c8df9ec73196df89929393d5c73dbd8d4558aa39
task(SDK-1970) - Update changelogs for geofence,hms,push-templates
[ { "change_type": "MODIFY", "old_path": "docs/CTGEOFENCECHANGELOG.md", "new_path": "docs/CTGEOFENCECHANGELOG.md", "diff": "* Updates [play-services-location](https://developers.google.com/android/guides/releases#october_13_2022) to `v21.0.0`\n* Updates [work-runtime](https://developer.android.com/jetpack/androidx/releases/work#2.7.1) to `v2.7.1`\n* Targets Android 13\n+* Minimum Android SDK version bumped to API 19 (Android 4.4).\n### Version 1.1.0 (November 2, 2021)\n* Added support for Android 12 changes\n" }, { "change_type": "MODIFY", "old_path": "docs/CTHUAWEIPUSHCHANGELOG.md", "new_path": "docs/CTHUAWEIPUSHCHANGELOG.md", "diff": "### Version 1.3.2 (October 28, 2022)\n* Updated Huawei Push SDK to v6.7.0.300 which supports Android 13\n* Supports CleverTap Android SDK v4.7.0\n+* Minimum Android SDK version bumped to API 19 (Android 4.4)\n### Version 1.3.1 (September 6, 2022)\n* Updated Huawei Push SDK to v6.5.0.300\n" }, { "change_type": "MODIFY", "old_path": "docs/CTPUSHTEMPLATESCHANGELOG.md", "new_path": "docs/CTPUSHTEMPLATESCHANGELOG.md", "diff": "### Version 1.0.6 (October 28, 2022)\n* Targets Android 13\n* Supports CleverTap Android SDK v4.7.0\n+* Minimum Android SDK version bumped to API 19 (Android 4.4).\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" }, { "change_type": "MODIFY", "old_path": "templates/CTGEOFENCECHANGELOG.md", "new_path": "templates/CTGEOFENCECHANGELOG.md", "diff": "* Updates [play-services-location](https://developers.google.com/android/guides/releases#october_13_2022) to `v21.0.0`\n* Updates [work-runtime](https://developer.android.com/jetpack/androidx/releases/work#2.7.1) to `v2.7.1`\n* Targets Android 13\n+* Minimum Android SDK version bumped to API 19 (Android 4.4).\n### Version 1.1.0 (November 2, 2021)\n* Added support for Android 12 changes\n" }, { "change_type": "MODIFY", "old_path": "templates/CTHUAWEIPUSHCHANGELOG.md", "new_path": "templates/CTHUAWEIPUSHCHANGELOG.md", "diff": "### Version 1.3.2 (October 28, 2022)\n* Updated Huawei Push SDK to v6.7.0.300 which supports Android 13\n* Supports CleverTap Android SDK v4.7.0\n+* Minimum Android SDK version bumped to API 19 (Android 4.4)\n### Version 1.3.1 (September 6, 2022)\n* Updated Huawei Push SDK to v6.5.0.300\n" }, { "change_type": "MODIFY", "old_path": "templates/CTPUSHTEMPLATESCHANGELOG.md", "new_path": "templates/CTPUSHTEMPLATESCHANGELOG.md", "diff": "### Version 1.0.6 (October 28, 2022)\n* Targets Android 13\n* Supports CleverTap Android SDK v4.7.0\n+* Minimum Android SDK version bumped to API 19 (Android 4.4).\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" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) - Update changelogs for geofence,hms,push-templates
116,616
28.10.2022 17:44:40
-19,080
e2210fcac82cfc6c86e4bfc21385be36be0860cb
task(SDK-1970) - Update release date in changelogs
[ { "change_type": "MODIFY", "old_path": "docs/CTCORECHANGELOG.md", "new_path": "docs/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n-### Version 4.7.0 (October 28, 2022)\n+### Version 4.7.0 (October 31, 2022)\n* Adds below new public APIs for supporting [Android 13 notification runtime permission](https://developer.android.com/develop/ui/views/notifications/notification-permission)\n* `isPushPermissionGranted()` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#check-the-status-of-notification-permission-whether-its-granted-or-denied)\n* `promptPushPrimer(JSONObject)` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#push-primer-android-13-notification-runtime-permission)\n" }, { "change_type": "MODIFY", "old_path": "docs/CTGEOFENCECHANGELOG.md", "new_path": "docs/CTGEOFENCECHANGELOG.md", "diff": "## CleverTap Geofence SDK CHANGE LOG\n-### Version 1.2.0 (October 28, 2022)\n+### Version 1.2.0 (October 31, 2022)\n* Updates [play-services-location](https://developers.google.com/android/guides/releases#october_13_2022) to `v21.0.0`\n* Updates [work-runtime](https://developer.android.com/jetpack/androidx/releases/work#2.7.1) to `v2.7.1`\n* Targets Android 13\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.2 (October 28, 2022)\n+### Version 1.3.2 (October 31, 2022)\n* Updated Huawei Push SDK to v6.7.0.300 which supports Android 13\n* Supports CleverTap Android SDK v4.7.0\n* Minimum Android SDK version bumped to API 19 (Android 4.4)\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.6 (October 28, 2022)\n+### Version 1.0.6 (October 31, 2022)\n* Targets Android 13\n* Supports CleverTap Android SDK v4.7.0\n* Minimum Android SDK version bumped to API 19 (Android 4.4).\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.2 (October 28, 2022)\n+### Version 1.5.2 (October 31, 2022)\n* Updated Xiaomi Push SDK to v5.1.1 which supports Android 13\n* Supports CleverTap Android SDK v4.7.0\n" }, { "change_type": "MODIFY", "old_path": "templates/CTCORECHANGELOG.md", "new_path": "templates/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n-### Version 4.7.0 (October 28, 2022)\n+### Version 4.7.0 (October 31, 2022)\n* Adds below new public APIs for supporting [Android 13 notification runtime permission](https://developer.android.com/develop/ui/views/notifications/notification-permission)\n* `isPushPermissionGranted()` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#check-the-status-of-notification-permission-whether-its-granted-or-denied)\n* `promptPushPrimer(JSONObject)` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#push-primer-android-13-notification-runtime-permission)\n" }, { "change_type": "MODIFY", "old_path": "templates/CTGEOFENCECHANGELOG.md", "new_path": "templates/CTGEOFENCECHANGELOG.md", "diff": "## CleverTap Geofence SDK CHANGE LOG\n-### Version 1.2.0 (October 28, 2022)\n+### Version 1.2.0 (October 31, 2022)\n* Updates [play-services-location](https://developers.google.com/android/guides/releases#october_13_2022) to `v21.0.0`\n* Updates [work-runtime](https://developer.android.com/jetpack/androidx/releases/work#2.7.1) to `v2.7.1`\n* Targets Android 13\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.2 (October 28, 2022)\n+### Version 1.3.2 (October 31, 2022)\n* Updated Huawei Push SDK to v6.7.0.300 which supports Android 13\n* Supports CleverTap Android SDK v4.7.0\n* Minimum Android SDK version bumped to API 19 (Android 4.4)\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.6 (October 28, 2022)\n+### Version 1.0.6 (October 31, 2022)\n* Targets Android 13\n* Supports CleverTap Android SDK v4.7.0\n* Minimum Android SDK version bumped to API 19 (Android 4.4).\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.2 (October 28, 2022)\n+### Version 1.5.2 (October 31, 2022)\n* Updated Xiaomi Push SDK to v5.1.1 which supports Android 13\n* Supports CleverTap Android SDK v4.7.0\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) - Update release date in changelogs
116,620
31.10.2022 15:15:16
-19,080
38484ace71d2ab909cbb5e06873d9bca8d3db76b
fix app inbox video not playing issue
[ { "change_type": "MODIFY", "old_path": "CHANGELOG.md", "new_path": "CHANGELOG.md", "diff": "## CHANGE LOG.\n+### October 31, 2022\n+* [CleverTap Android SDK v4.6.6](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n+\n### October 21, 2022\n* [CleverTap Android SDK v4.6.5](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.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.5\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.6.6\"\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.5\", ext: 'aar')\n+ implementation (name: \"clevertap-android-sdk-4.6.6\", 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.5\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.6.6\"\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": "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,6 +136,8 @@ class CTCarouselImageViewHolder extends CTInboxBaseMessageViewHolder {\nparentWeak.didShow(null, position);\n}\n}\n+ carouselReadDot.setVisibility(View.GONE);\n+ inboxMessage.setRead(true);\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": "@@ -160,12 +160,16 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nparentWeak.didShow(null, position);\n}\n}\n+ carouselReadDot.setVisibility(View.GONE);\n+ inboxMessage.setRead(true);\n} else {\nif (readDot.getVisibility() == View.VISIBLE) {\nif (parentWeak != null) {\nparentWeak.didShow(null, position);\n}\n}\n+ readDot.setVisibility(View.GONE);\n+ inboxMessage.setRead(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": "@@ -387,8 +387,11 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nif (readDot.getVisibility() == View.VISIBLE) {\nparent.didShow(null, position);\n}\n+ readDot.setVisibility(View.GONE);\n+ inboxMessage.setRead(true);\n}\n});\n+\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": "@@ -179,7 +179,6 @@ 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@@ -237,22 +236,7 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nif (isCUListenerAvailable) {\ninboxContentUpdatedListener.inboxMessagesDidUpdate();\n}\n- if (isUsingMultipleTabs) {\n- int position = viewPager.getCurrentItem();\n- CTInboxListViewFragment fragment = (CTInboxListViewFragment) inboxTabAdapter.getItem(position);\n- fragment.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} catch (Throwable t) {\nLogger.i(\"Something Went Wrong\", t);\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": "@@ -95,12 +95,6 @@ public class CTInboxListViewFragment extends Fragment {\n}\n}\n- void updateAdapterContent(){\n- updateInboxMessages();\n- if(inboxMessageAdapter==null || inboxMessages==null || config ==null ) return;\n- inboxMessageAdapter.updateInboxMessages(inboxMessages);\n- }\n-\n@Nullable\n@Override\npublic View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,\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": "@@ -81,7 +81,6 @@ 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": "@@ -28,17 +28,11 @@ class CTInboxMessageAdapter extends RecyclerView.Adapter {\nprivate ArrayList<CTInboxMessage> inboxMessages;\nCTInboxMessageAdapter(ArrayList<CTInboxMessage> inboxMessages, CTInboxListViewFragment fragment) {\n- Logger.v( \"CTInboxMessageAdapter: called at \"+new Date());\nLogger.v(\"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@Override\npublic int getItemCount() {\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,6 +378,8 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nif (readDot.getVisibility() == View.VISIBLE) {\nparent.didShow(null, position);\n}\n+ readDot.setVisibility(View.GONE);\n+ inboxMessage.setRead(true);\n}\n});\n}\n" }, { "change_type": "MODIFY", "old_path": "docs/CTCORECHANGELOG.md", "new_path": "docs/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.6.6 (October 31, 2022)\n+* Fix app inbox bug where inbox message videos would not play when new inbox notifications are available\n+\n### Version 4.6.5 (October 21, 2022)\n* Allows more special characters when setting custom CleverTap ID\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.5\" // 3.9.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.6.6\" // 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.5\" // 4.4.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.6.6\" // 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.6 (October 31, 2022)\n+* Fix app inbox bug where inbox message videos would not play when new inbox notifications are available\n+\n### Version 4.6.5 (October 21, 2022)\n* Allows more special characters when setting custom CleverTap ID\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.5\n+version.com.clevertap.android..clevertap-android-sdk=4.6.6\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.1\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
[SDK-2330] fix app inbox video not playing issue
116,620
31.10.2022 15:54:01
-19,080
d11174ddabadca890852ffe956f5b52b0f24bfbf
removing inbox listener from ctinbox activity
[ { "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": "@@ -33,7 +33,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, CTInboxListener {\n+public class CTInboxActivity extends FragmentActivity implements CTInboxListViewFragment.InboxListener {\npublic interface InboxActivityListener {\n@@ -57,7 +57,6 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\nprivate WeakReference<InboxActivityListener> listenerWeakReference;\nprivate CleverTapAPI cleverTapAPI;\n- private CTInboxListener inboxContentUpdatedListener = null;\npublic void onCreate(Bundle savedInstanceState) {\nsuper.onCreate(savedInstanceState);\n@@ -74,8 +73,6 @@ 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@@ -212,39 +209,6 @@ public class CTInboxActivity extends FragmentActivity implements CTInboxListView\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.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) {\n- inboxContentUpdatedListener.inboxMessagesDidUpdate();\n- }\n-\n-\n- } catch (Throwable t) {\n- Logger.i(\"Something Went Wrong\", t);\n- }\n-\n-\n- }\n-\n@Override\npublic void messageDidClick(Context baseContext, CTInboxMessage inboxMessage, Bundle data,\nHashMap<String, String> keyValue, boolean isBodyClick) {\n" }, { "change_type": "MODIFY", "old_path": "docs/CTCORECHANGELOG.md", "new_path": "docs/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n### Version 4.6.6 (October 31, 2022)\n-* Fix app inbox bug where inbox message videos would not play when new inbox notifications are available\n+* Fixes App Inbox bug where an Inbox message's video would not play when new Inbox messages were available\n### Version 4.6.5 (October 21, 2022)\n* Allows more special characters when setting custom CleverTap ID\n" }, { "change_type": "MODIFY", "old_path": "templates/CTCORECHANGELOG.md", "new_path": "templates/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n### Version 4.6.6 (October 31, 2022)\n-* Fix app inbox bug where inbox message videos would not play when new inbox notifications are available\n+* Fixes App Inbox bug where an Inbox message's video would not play when new Inbox messages were available\n### Version 4.6.5 (October 21, 2022)\n* Allows more special characters when setting custom CleverTap ID\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
[SDK-2330] removing inbox listener from ctinbox activity
116,612
31.10.2022 16:05:49
-19,080
0e17c270b1b50c1626876d443e4d549669923582
task(SDK-2345) : remove unused code for read dot from CTCarouselMessageViewHolder
[ { "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,8 +74,6 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nprivate final ImageView readDot;\n- private ImageView carouselReadDot;\n-\nprivate final LinearLayout sliderDots;\nprivate final TextView title;\n@@ -154,15 +152,6 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nactivity.runOnUiThread(new Runnable() {\n@Override\npublic void run() {\n- if (inboxMessage.getType() == CTInboxMessageType.CarouselImageMessage) {\n- if (carouselReadDot.getVisibility() == View.VISIBLE) {\n- if (parentWeak != null) {\n- parentWeak.didShow(null, position);\n- }\n- }\n- carouselReadDot.setVisibility(View.GONE);\n- inboxMessage.setRead(true);\n- } else {\nif (readDot.getVisibility() == View.VISIBLE) {\nif (parentWeak != null) {\nparentWeak.didShow(null, position);\n@@ -171,7 +160,6 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nreadDot.setVisibility(View.GONE);\ninboxMessage.setRead(true);\n}\n- }\n});\n}\n};\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-2345) : remove unused code for read dot from CTCarouselMessageViewHolder
116,620
31.10.2022 16:18:35
-19,080
2236c55b371bd6c5a6241b4f960819d64d574830
adding logs for item/item button click
[ { "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": "@@ -1861,11 +1861,13 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getAnalyticsManager().pushInboxMessageStateEvent(true, inboxMessage, data);\nif (keyValue != null && !keyValue.isEmpty()) {\n+ Logger.v(\"clicked button of an inbox notification.\");\nif (inboxMessageButtonListener != null && inboxMessageButtonListener.get() != null) {\ninboxMessageButtonListener.get().onInboxButtonClick(keyValue);\n}\n}\nelse{\n+ Logger.v(\"clicked inbox notification.\");\nif (isBodyClick && inboxMessageListener != null && inboxMessageListener.get() != null) {\ninboxMessageListener.get().onInboxItemClicked(inboxMessage);\n}\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
[SDK-2330] adding logs for item/item button click
116,612
31.10.2022 16:33:45
-19,080
f994c9ca05d318362309f6e4838954771ac302a2
task(SDK-2345) : move common code for blue dot to base class
[ { "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": "package com.clevertap.android.sdk.inbox;\n-import android.app.Activity;\nimport android.content.Context;\nimport android.graphics.Color;\n-import android.os.Handler;\nimport android.view.View;\nimport android.widget.ImageView;\nimport android.widget.LinearLayout;\n@@ -60,8 +58,6 @@ class CTCarouselImageViewHolder extends CTInboxBaseMessageViewHolder {\n}\n}\n- private final ImageView carouselReadDot;\n-\nprivate final TextView carouselTimestamp;\nprivate final RelativeLayout clickLayout;\n@@ -75,7 +71,6 @@ class CTCarouselImageViewHolder extends CTInboxBaseMessageViewHolder {\nimageViewPager = itemView.findViewById(R.id.image_carousel_viewpager);\nsliderDots = itemView.findViewById(R.id.sliderDots);\ncarouselTimestamp = itemView.findViewById(R.id.carousel_timestamp);\n- carouselReadDot = itemView.findViewById(R.id.carousel_read_circle);\nclickLayout = itemView.findViewById(R.id.body_linear_layout);\n}\n@@ -89,9 +84,9 @@ class CTCarouselImageViewHolder extends CTInboxBaseMessageViewHolder {\nCTInboxMessageContent content = inboxMessage.getInboxMessageContents().get(0);\nthis.carouselTimestamp.setVisibility(View.VISIBLE);\nif (inboxMessage.isRead()) {\n- this.carouselReadDot.setVisibility(View.GONE);\n+ this.readDot.setVisibility(View.GONE);\n} else {\n- this.carouselReadDot.setVisibility(View.VISIBLE);\n+ this.readDot.setVisibility(View.VISIBLE);\n}\nString carouselImageDisplayTimestamp = calculateDisplayTimestamp(inboxMessage.getDate());\nthis.carouselTimestamp.setText(carouselImageDisplayTimestamp);\n@@ -121,28 +116,6 @@ class CTCarouselImageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.clickLayout.setOnClickListener(\nnew CTInboxButtonClickListener(position, inboxMessage, null, parentWeak, this.imageViewPager,true));\n- Runnable carouselRunnable = new Runnable() {\n- @Override\n- public void run() {\n- Activity activity = parent.getActivity();\n- if (activity == null) {\n- return;\n- }\n- activity.runOnUiThread(new Runnable() {\n- @Override\n- public void run() {\n- if (carouselReadDot.getVisibility() == View.VISIBLE) {\n- if (parentWeak != null) {\n- parentWeak.didShow(null, position);\n- }\n- }\n- carouselReadDot.setVisibility(View.GONE);\n- inboxMessage.setRead(true);\n- }\n- });\n- }\n- };\n- Handler carouselHandler = new Handler();\n- carouselHandler.postDelayed(carouselRunnable, 2000);\n+ markItemAsRead(inboxMessage, position);\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": "package com.clevertap.android.sdk.inbox;\n-import android.app.Activity;\nimport android.content.Context;\nimport android.graphics.Color;\n-import android.os.Handler;\nimport android.view.View;\nimport android.widget.ImageView;\nimport android.widget.LinearLayout;\n@@ -72,7 +70,6 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nprivate final CTCarouselViewPager imageViewPager;\n- private final ImageView readDot;\nprivate final LinearLayout sliderDots;\n@@ -91,7 +88,6 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\ntitle = itemView.findViewById(R.id.messageTitle);\nmessage = itemView.findViewById(R.id.messageText);\ntimestamp = itemView.findViewById(R.id.timestamp);\n- readDot = itemView.findViewById(R.id.read_circle);\nclickLayout = itemView.findViewById(R.id.body_linear_layout);\n}\n@@ -142,28 +138,6 @@ class CTCarouselMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.clickLayout.setOnClickListener(\nnew CTInboxButtonClickListener(position, inboxMessage, null, parentWeak, this.imageViewPager,true));\n- Runnable carouselRunnable = new Runnable() {\n- @Override\n- public void run() {\n- Activity activity = parent.getActivity();\n- if (activity == null) {\n- return;\n- }\n- activity.runOnUiThread(new Runnable() {\n- @Override\n- public void run() {\n- if (readDot.getVisibility() == View.VISIBLE) {\n- if (parentWeak != null) {\n- parentWeak.didShow(null, position);\n- }\n- }\n- readDot.setVisibility(View.GONE);\n- inboxMessage.setRead(true);\n- }\n- });\n- }\n- };\n- Handler carouselHandler = new Handler();\n- carouselHandler.postDelayed(carouselRunnable, 2000);\n+ markItemAsRead(inboxMessage, position);\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": "package com.clevertap.android.sdk.inbox;\n-import android.app.Activity;\nimport android.content.res.Configuration;\nimport android.content.res.Resources;\nimport android.graphics.Color;\n-import android.os.Handler;\nimport android.view.View;\nimport android.widget.Button;\nimport android.widget.ImageView;\n@@ -37,8 +35,6 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nprivate final LinearLayout ctaLinearLayout;\n- private final ImageView readDot;\n-\nprivate final ImageView iconImage;\nprivate final TextView title;\n@@ -54,7 +50,6 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nmessage = itemView.findViewById(R.id.messageText);\nmediaImage = itemView.findViewById(R.id.media_image);\niconImage = itemView.findViewById(R.id.image_icon);\n- readDot = itemView.findViewById(R.id.read_circle);\ntimestamp = itemView.findViewById(R.id.timestamp);\ncta1 = itemView.findViewById(R.id.cta_button_1);\ncta2 = itemView.findViewById(R.id.cta_button_2);\n@@ -372,31 +367,8 @@ class CTIconMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.progressBarFrameLayout.setLayoutParams(new RelativeLayout.LayoutParams(width, height));\n//New thread to remove the Read dot, mark message as read and raise Notification Viewed\n- Runnable iconRunnable = new Runnable() {\n- @Override\n- public void run() {\n- final CTInboxListViewFragment parent = getParent();\n- if (parent != null) {\n- Activity activity = parent.getActivity();\n- if (activity == null) {\n- return;\n- }\n- activity.runOnUiThread(new Runnable() {\n- @Override\n- public void run() {\n- if (readDot.getVisibility() == View.VISIBLE) {\n- parent.didShow(null, position);\n- }\n- readDot.setVisibility(View.GONE);\n- inboxMessage.setRead(true);\n- }\n- });\n+ markItemAsRead(inboxMessage, position);\n- }\n- }\n- };\n- Handler iconHandler = new Handler();\n- iconHandler.postDelayed(iconRunnable, 2000);\ntry {\nif (!content.getIcon().isEmpty()) {\niconImage.setVisibility(View.VISIBLE);\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;\nimport android.annotation.SuppressLint;\n+import android.app.Activity;\nimport android.content.Context;\nimport android.content.res.Configuration;\nimport android.content.res.Resources;\nimport android.graphics.Color;\n+import android.os.Handler;\nimport android.util.DisplayMetrics;\nimport android.util.TypedValue;\nimport android.view.Gravity;\n@@ -15,13 +17,11 @@ 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;\nimport com.google.android.exoplayer2.ExoPlayer;\nimport com.google.android.exoplayer2.MediaItem;\n@@ -63,8 +63,11 @@ public class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nprivate boolean requiresMediaPlayer;\n+ protected final ImageView readDot;\n+\nCTInboxBaseMessageViewHolder(@NonNull View itemView) {\nsuper(itemView);\n+ readDot = itemView.findViewById(R.id.read_circle);\n}\npublic boolean addMediaPlayer(StyledPlayerView videoSurfaceView) {\n@@ -306,4 +309,32 @@ public class CTInboxBaseMessageViewHolder extends RecyclerView.ViewHolder {\nprivate FrameLayout getLayoutForMediaPlayer() {\nreturn frameLayout;\n}\n+\n+ protected void markItemAsRead(final CTInboxMessage inboxMessage,\n+ final int position) {\n+ Runnable runnable = new Runnable() {\n+ @Override\n+ public void run() {\n+ final CTInboxListViewFragment parent = getParent();\n+ if (parent != null) {\n+ Activity activity = parent.getActivity();\n+ if (activity == null) {\n+ return;\n+ }\n+ activity.runOnUiThread(new Runnable() {\n+ @Override\n+ public void run() {\n+ if (readDot.getVisibility() == View.VISIBLE) {\n+ parent.didShow(null, position);\n+ }\n+ readDot.setVisibility(View.GONE);\n+ inboxMessage.setRead(true);\n+ }\n+ });\n+ }\n+ }\n+ };\n+ Handler handler = new Handler();\n+ handler.postDelayed(runnable, 2000);\n+ }\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": "package com.clevertap.android.sdk.inbox;\n-import android.app.Activity;\nimport android.content.res.Configuration;\nimport android.content.res.Resources;\nimport android.graphics.Color;\n-import android.os.Handler;\nimport android.view.View;\nimport android.widget.Button;\nimport android.widget.ImageView;\n@@ -35,8 +33,6 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nprivate final TextView message;\n- private final ImageView readDot;\n-\nprivate final TextView timestamp;\nprivate final TextView title;\n@@ -47,7 +43,6 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\ntitle = itemView.findViewById(R.id.messageTitle);\nmessage = itemView.findViewById(R.id.messageText);\ntimestamp = itemView.findViewById(R.id.timestamp);\n- readDot = itemView.findViewById(R.id.read_circle);\ncta1 = itemView.findViewById(R.id.cta_button_1);\ncta2 = itemView.findViewById(R.id.cta_button_2);\ncta3 = itemView.findViewById(R.id.cta_button_3);\n@@ -363,31 +358,8 @@ class CTSimpleMessageViewHolder extends CTInboxBaseMessageViewHolder {\nthis.progressBarFrameLayout.setLayoutParams(new RelativeLayout.LayoutParams(width, height));\n//New thread to remove the Read dot, mark message as read and raise Notification Viewed\n- Runnable simpleRunnable = new Runnable() {\n- @Override\n- public void run() {\n- final CTInboxListViewFragment parent = getParent();\n- if (parent != null) {\n- Activity activity = parent.getActivity();\n- if (activity == null) {\n- return;\n- }\n- activity.runOnUiThread(new Runnable() {\n- @Override\n- public void run() {\n- if (readDot.getVisibility() == View.VISIBLE) {\n- parent.didShow(null, position);\n- }\n- readDot.setVisibility(View.GONE);\n- inboxMessage.setRead(true);\n- }\n- });\n- }\n+ markItemAsRead(inboxMessage, position);\n- }\n- };\n- Handler simpleHandler = new Handler();\n- simpleHandler.postDelayed(simpleRunnable, 2000);\nif (parentWeak != null) {\nthis.clickLayout.setOnClickListener(\nnew CTInboxButtonClickListener(position, inboxMessage, null, null, parentWeak,true));\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/res/layout-land/inbox_carousel_layout.xml", "new_path": "clevertap-core/src/main/res/layout-land/inbox_carousel_layout.xml", "diff": "android:textColor=\"@android:color/darker_gray\" />\n<ImageView\n- android:id=\"@+id/carousel_read_circle\"\n+ android:id=\"@+id/read_circle\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_gravity=\"center\"\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/res/layout/inbox_carousel_layout.xml", "new_path": "clevertap-core/src/main/res/layout/inbox_carousel_layout.xml", "diff": "android:textColor=\"@android:color/darker_gray\" />\n<ImageView\n- android:id=\"@+id/carousel_read_circle\"\n+ android:id=\"@+id/read_circle\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_gravity=\"center\"\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-2345) : move common code for blue dot to base class
116,616
01.11.2022 11:55:58
-19,080
e5ba0bd3450a9e8dcb6ac2f0f2b894e8a4e616f2
task(SDK-1970) - Update release date for changelogs
[ { "change_type": "MODIFY", "old_path": "docs/CTCORECHANGELOG.md", "new_path": "docs/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n-### Version 4.7.0 (October 31, 2022)\n+### Version 4.7.0 (November 1, 2022)\n* Adds below new public APIs for supporting [Android 13 notification runtime permission](https://developer.android.com/develop/ui/views/notifications/notification-permission)\n* `isPushPermissionGranted()` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#check-the-status-of-notification-permission-whether-its-granted-or-denied)\n* `promptPushPrimer(JSONObject)` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#push-primer-android-13-notification-runtime-permission)\n* `promptForPushPermission(boolean showFallbackSettings)` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#call-android-os-runtime-notification-dialog-without-using-push-primer)\n-* New `CTLocalInApp` builder class available to create half-interstitial & alert local in-apps to request notification permission. [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#ctlocalinapp-builder-methods-description)\n-* New callback `PushPermissionResponseListener` available which returns after user Allows/Denies notification permission. [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#available-callbacks-for-push-primer)\n-* From 4.7.0+ existing callback `InAppNotificationListener` will now have `onShow(CTInAppNotification)` method which needs to implemented.\n-* Minimum Android SDK version bumped to API 19 (Android 4.4).\n+* New `CTLocalInApp` builder class available to create half-interstitial & alert local in-apps to request notification permission [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#ctlocalinapp-builder-methods-description)\n+* New callback `PushPermissionResponseListener` available which returns after user Allows/Denies notification permission [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#available-callbacks-for-push-primer)\n+* From 4.7.0+ existing callback `InAppNotificationListener` will now have `onShow(CTInAppNotification)` method which needs to implemented\n+* Minimum Android SDK version bumped to API 19 (Android 4.4)\n### Version 4.6.6 (October 31, 2022)\n* Fixes App Inbox bug where an Inbox message's video would not play when new Inbox messages were available\n" }, { "change_type": "MODIFY", "old_path": "docs/CTGEOFENCECHANGELOG.md", "new_path": "docs/CTGEOFENCECHANGELOG.md", "diff": "## CleverTap Geofence SDK CHANGE LOG\n-### Version 1.2.0 (October 31, 2022)\n+### Version 1.2.0 (November 1, 2022)\n* Updates [play-services-location](https://developers.google.com/android/guides/releases#october_13_2022) to `v21.0.0`\n* Updates [work-runtime](https://developer.android.com/jetpack/androidx/releases/work#2.7.1) to `v2.7.1`\n* Targets Android 13\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.2 (October 31, 2022)\n+### Version 1.3.2 (November 1, 2022)\n* Updated Huawei Push SDK to v6.7.0.300 which supports Android 13\n* Supports CleverTap Android SDK v4.7.0\n* Minimum Android SDK version bumped to API 19 (Android 4.4)\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.6 (October 31, 2022)\n+### Version 1.0.6 (November 1, 2022)\n* Targets Android 13\n* Supports CleverTap Android SDK v4.7.0\n* Minimum Android SDK version bumped to API 19 (Android 4.4).\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.2 (October 31, 2022)\n+### Version 1.5.2 (November 1, 2022)\n* Updated Xiaomi Push SDK to v5.1.1 which supports Android 13\n* Supports CleverTap Android SDK v4.7.0\n" }, { "change_type": "MODIFY", "old_path": "templates/CTCORECHANGELOG.md", "new_path": "templates/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n-### Version 4.7.0 (October 31, 2022)\n+### Version 4.7.0 (November 1, 2022)\n* Adds below new public APIs for supporting [Android 13 notification runtime permission](https://developer.android.com/develop/ui/views/notifications/notification-permission)\n* `isPushPermissionGranted()` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#check-the-status-of-notification-permission-whether-its-granted-or-denied)\n* `promptPushPrimer(JSONObject)` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#push-primer-android-13-notification-runtime-permission)\n* `promptForPushPermission(boolean showFallbackSettings)` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#call-android-os-runtime-notification-dialog-without-using-push-primer)\n-* New `CTLocalInApp` builder class available to create half-interstitial & alert local in-apps to request notification permission. [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#ctlocalinapp-builder-methods-description)\n-* New callback `PushPermissionResponseListener` available which returns after user Allows/Denies notification permission. [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#available-callbacks-for-push-primer)\n-* From 4.7.0+ existing callback `InAppNotificationListener` will now have `onShow(CTInAppNotification)` method which needs to implemented.\n-* Minimum Android SDK version bumped to API 19 (Android 4.4).\n+* New `CTLocalInApp` builder class available to create half-interstitial & alert local in-apps to request notification permission [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#ctlocalinapp-builder-methods-description)\n+* New callback `PushPermissionResponseListener` available which returns after user Allows/Denies notification permission [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#available-callbacks-for-push-primer)\n+* From 4.7.0+ existing callback `InAppNotificationListener` will now have `onShow(CTInAppNotification)` method which needs to implemented\n+* Minimum Android SDK version bumped to API 19 (Android 4.4)\n### Version 4.6.6 (October 31, 2022)\n* Fixes App Inbox bug where an Inbox message's video would not play when new Inbox messages were available\n" }, { "change_type": "MODIFY", "old_path": "templates/CTGEOFENCECHANGELOG.md", "new_path": "templates/CTGEOFENCECHANGELOG.md", "diff": "## CleverTap Geofence SDK CHANGE LOG\n-### Version 1.2.0 (October 31, 2022)\n+### Version 1.2.0 (November 1, 2022)\n* Updates [play-services-location](https://developers.google.com/android/guides/releases#october_13_2022) to `v21.0.0`\n* Updates [work-runtime](https://developer.android.com/jetpack/androidx/releases/work#2.7.1) to `v2.7.1`\n* Targets Android 13\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.2 (October 31, 2022)\n+### Version 1.3.2 (November 1, 2022)\n* Updated Huawei Push SDK to v6.7.0.300 which supports Android 13\n* Supports CleverTap Android SDK v4.7.0\n* Minimum Android SDK version bumped to API 19 (Android 4.4)\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.6 (October 31, 2022)\n+### Version 1.0.6 (November 1, 2022)\n* Targets Android 13\n* Supports CleverTap Android SDK v4.7.0\n* Minimum Android SDK version bumped to API 19 (Android 4.4).\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.2 (October 31, 2022)\n+### Version 1.5.2 (November 1, 2022)\n* Updated Xiaomi Push SDK to v5.1.1 which supports Android 13\n* Supports CleverTap Android SDK v4.7.0\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-1970) - Update release date for changelogs
116,616
01.11.2022 16:07:48
-19,080
42e91f581fa2489d8c0741b97d53665d1835f40f
chore(SDK-1970) - Update root CHANGELOG.md for release
[ { "change_type": "MODIFY", "old_path": "CHANGELOG.md", "new_path": "CHANGELOG.md", "diff": "## CHANGE LOG.\n+### November 1, 2022\n+* [CleverTap Android SDK v4.7.0](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n+* [CleverTap Geofence SDK v1.2.0](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTGEOFENCECHANGELOG.md)\n+* [CleverTap Xiaomi Push SDK v1.5.2](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTXIAOMIPUSHCHANGELOG.md)\n+* [CleverTap Huawei Push SDK v1.3.2](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTHUAWEIPUSHCHANGELOG.md)\n+* [CleverTap Push Templates SDK v1.0.6](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTPUSHTEMPLATESCHANGELOG.md)\n+\n### October 31, 2022\n* [CleverTap Android SDK v4.6.6](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
chore(SDK-1970) - Update root CHANGELOG.md for release
116,616
09.11.2022 11:26:43
-19,080
813a955e5d17176f4ff9e198acba07a6739566cd
fix(SDK-2365) - Small imageviews visiblity fix added for all non-linear product display layouts
[ { "change_type": "MODIFY", "old_path": "clevertap-pushtemplates/src/main/res/layout-v31/product_display_template.xml", "new_path": "clevertap-pushtemplates/src/main/res/layout-v31/product_display_template.xml", "diff": "android:layout_width=\"0dp\"\nandroid:layout_height=\"match_parent\"\nandroid:layout_weight=\"0.5\"\n- android:orientation=\"vertical\"\n- android:weightSum=\"1\">\n+ android:orientation=\"vertical\">\n- <LinearLayout\n+ <RelativeLayout\nandroid:layout_width=\"match_parent\"\n- android:layout_height=\"match_parent\"\n- android:layout_weight=\"0.4\"\n- android:orientation=\"vertical\"\n- android:padding=\"8dp\"\n- android:weightSum=\"3\"\n- android:gravity=\"center\">\n-\n+ android:layout_height=\"wrap_content\"\n+ android:padding=\"8dp\">\n<TextView\nandroid:id=\"@+id/product_price\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:layout_marginTop=\"8dp\"\ntools:text=\"Rs: 5,000,000\"\nandroid:textAppearance=\"@style/PushTitle\"\n- android:textAlignment=\"center\"/>\n+ android:textAlignment=\"center\"\n+ android:gravity=\"center_horizontal\"\n+ android:layout_centerHorizontal=\"true\"/>\n<Button\nandroid:id=\"@+id/product_action\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\n- android:layout_marginTop=\"16dp\"\n- android:background=\"@android:color/holo_orange_light\"\n+ android:layout_marginTop=\"8dp\"\ntools:text=\"Buy Now\"\n+ android:layout_below=\"@id/product_price\"\n+ android:gravity=\"center\"\n+ android:layout_centerHorizontal=\"true\"\nandroid:textAppearance=\"@style/PushMessage\"/>\n+ </RelativeLayout>\n<LinearLayout\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n- android:layout_marginTop=\"16dp\"\n- android:orientation=\"horizontal\">\n+ android:orientation=\"horizontal\"\n+ android:visibility=\"visible\"\n+ android:weightSum=\"3\">\n<ImageView\nandroid:id=\"@+id/small_image1\"\nandroid:layout_width=\"0dp\"\nandroid:layout_height=\"match_parent\"\n- android:layout_weight=\"1\"\n- />\n+ android:layout_weight=\"1\"/>\n<ImageView\nandroid:id=\"@+id/small_image2\"\nandroid:layout_height=\"match_parent\"\nandroid:layout_weight=\"1\"/>\n</LinearLayout>\n- </LinearLayout>\n</LinearLayout>\n" }, { "change_type": "MODIFY", "old_path": "clevertap-pushtemplates/src/main/res/layout/product_display_template.xml", "new_path": "clevertap-pushtemplates/src/main/res/layout/product_display_template.xml", "diff": "android:id=\"@+id/carousel_relative_layout\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"200dp\"\n- android:layout_marginLeft=\"16dp\"\n- android:layout_marginRight=\"16dp\"\n+ android:layout_marginTop=\"8dp\"\nandroid:weightSum=\"1\">\n<ViewFlipper\nandroid:layout_width=\"0dp\"\nandroid:layout_height=\"match_parent\"\nandroid:layout_weight=\"0.5\"\n- android:orientation=\"vertical\"\n- android:weightSum=\"1\">\n+ android:orientation=\"vertical\">\n- <LinearLayout\n+ <RelativeLayout\nandroid:layout_width=\"match_parent\"\n- android:layout_height=\"0dp\"\n- android:layout_weight=\"0.4\"\n- android:orientation=\"vertical\"\n- android:padding=\"8dp\"\n- android:weightSum=\"3\"\n- android:gravity=\"center\">\n-\n+ android:layout_height=\"wrap_content\"\n+ android:padding=\"8dp\">\n<TextView\nandroid:id=\"@+id/product_price\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:layout_marginTop=\"8dp\"\ntools:text=\"Rs: 5,000,000\"\nandroid:textAppearance=\"@style/PushTitle\"\nandroid:textAlignment=\"center\"\n- android:layout_gravity=\"center_horizontal\"/>\n+ android:gravity=\"center_horizontal\"\n+ android:layout_centerHorizontal=\"true\"/>\n<Button\nandroid:id=\"@+id/product_action\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\n- android:layout_marginTop=\"16dp\"\n- android:background=\"@android:color/holo_orange_light\"\n+ android:layout_marginTop=\"8dp\"\ntools:text=\"Buy Now\"\n+ android:layout_below=\"@id/product_price\"\n+ android:gravity=\"center\"\n+ android:layout_centerHorizontal=\"true\"\nandroid:textAppearance=\"@style/PushMessage\"/>\n+ </RelativeLayout>\n<LinearLayout\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n- android:layout_marginTop=\"16dp\"\n- android:orientation=\"horizontal\">\n+ android:orientation=\"horizontal\"\n+ android:visibility=\"visible\"\n+ android:weightSum=\"3\">\n<ImageView\nandroid:id=\"@+id/small_image1\"\nandroid:layout_height=\"match_parent\"\nandroid:layout_weight=\"1\"/>\n-\n<ImageView\nandroid:id=\"@+id/small_image2\"\nandroid:layout_width=\"0dp\"\nandroid:layout_height=\"match_parent\"\nandroid:layout_weight=\"1\"/>\n</LinearLayout>\n- </LinearLayout>\n</LinearLayout>\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
fix(SDK-2365) - Small imageviews visiblity fix added for all non-linear product display layouts
116,616
09.11.2022 12:02:19
-19,080
11d38fded996d41a6fdf4c6482c6692059b3601b
chore(SDK-2365) - Remove tools:text from all product display templates
[ { "change_type": "MODIFY", "old_path": "clevertap-pushtemplates/src/main/res/layout-v31/product_display_linear_expanded.xml", "new_path": "clevertap-pushtemplates/src/main/res/layout-v31/product_display_linear_expanded.xml", "diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n- xmlns:tools=\"http://schemas.android.com/tools\"\nandroid:id=\"@+id/content_view_big\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_height=\"match_parent\"\nandroid:layout_weight=\"2\"\nandroid:gravity=\"center\"\n- tools:text=\"1234567890123456\"\nandroid:textAppearance=\"@style/PushTitle\" />\n<Button\nandroid:layout_height=\"match_parent\"\nandroid:layout_weight=\"1\"\nandroid:background=\"@android:color/holo_red_dark\"\n- tools:text=\"Buy Now\"\nandroid:textAppearance=\"@style/PushMessage\"\nandroid:textColor=\"@android:color/white\" />\n" }, { "change_type": "MODIFY", "old_path": "clevertap-pushtemplates/src/main/res/layout-v31/product_display_template.xml", "new_path": "clevertap-pushtemplates/src/main/res/layout-v31/product_display_template.xml", "diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n- xmlns:tools=\"http://schemas.android.com/tools\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:orientation=\"vertical\"\nandroid:id=\"@+id/product_price\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- tools:text=\"Rs: 5,000,000\"\nandroid:textAppearance=\"@style/PushTitle\"\nandroid:textAlignment=\"center\"\nandroid:gravity=\"center_horizontal\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_marginTop=\"8dp\"\n- tools:text=\"Buy Now\"\nandroid:layout_below=\"@id/product_price\"\nandroid:gravity=\"center\"\nandroid:layout_centerHorizontal=\"true\"\n" }, { "change_type": "MODIFY", "old_path": "clevertap-pushtemplates/src/main/res/layout/product_display_linear_collapsed.xml", "new_path": "clevertap-pushtemplates/src/main/res/layout/product_display_linear_collapsed.xml", "diff": "android:layout_marginLeft=\"-85dp\"\nandroid:layout_toEndOf=\"@+id/large_icon\"\nandroid:layout_toRightOf=\"@id/large_icon\"\n- tools:text=\"message message \"\nandroid:textAppearance=\"@style/PushMessage\" />\n<LinearLayout\n" }, { "change_type": "MODIFY", "old_path": "clevertap-pushtemplates/src/main/res/layout/product_display_linear_expanded.xml", "new_path": "clevertap-pushtemplates/src/main/res/layout/product_display_linear_expanded.xml", "diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n- xmlns:tools=\"http://schemas.android.com/tools\"\nandroid:id=\"@+id/content_view_big\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_height=\"match_parent\"\nandroid:layout_weight=\"2\"\nandroid:gravity=\"center\"\n- tools:text=\"1234567890123456\"\nandroid:textAppearance=\"@style/PushTitle\" />\n<Button\nandroid:layout_height=\"match_parent\"\nandroid:layout_weight=\"1\"\nandroid:background=\"@android:color/holo_red_dark\"\n- tools:text=\"Buy Now\"\nandroid:textAppearance=\"@style/PushMessage\"\nandroid:textColor=\"@android:color/white\" />\n" }, { "change_type": "MODIFY", "old_path": "clevertap-pushtemplates/src/main/res/layout/product_display_template.xml", "new_path": "clevertap-pushtemplates/src/main/res/layout/product_display_template.xml", "diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n- xmlns:tools=\"http://schemas.android.com/tools\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\nandroid:orientation=\"vertical\"\nandroid:id=\"@+id/product_price\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- tools:text=\"Rs: 5,000,000\"\nandroid:textAppearance=\"@style/PushTitle\"\nandroid:textAlignment=\"center\"\nandroid:gravity=\"center_horizontal\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_marginTop=\"8dp\"\n- tools:text=\"Buy Now\"\nandroid:layout_below=\"@id/product_price\"\nandroid:gravity=\"center\"\nandroid:layout_centerHorizontal=\"true\"\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
chore(SDK-2365) - Remove tools:text from all product display templates
116,620
14.11.2022 14:13:21
-19,080
d7e89f83bbd40bdb26d7130c39f21007a5e51ca0
calling findCTPushProviders in async and findCustomEnabledPushTypes in async success callback
[ { "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": "@@ -144,9 +144,7 @@ public class PushProviders implements CTPushProviderListener {\n}\nif (config.isAnalyticsOnly()) {\n- config.getLogger()\n- .debug(config.getAccountId(),\n- \"Instance is set for Analytics only, cannot create notification\");\n+ config.getLogger().debug(config.getAccountId(), \"Instance is set for Analytics only, cannot create notification\");\nreturn;\n}\n@@ -158,19 +156,11 @@ public class PushProviders implements CTPushProviderListener {\n}\nString extrasFrom = extras.getString(Constants.EXTRAS_FROM);\nif (extrasFrom == null || !extrasFrom.equals(\"PTReceiver\")) {\n- config.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\",\n- \"source not available\"));\n+ config.getLogger().debug(config.getAccountId(), \"Handling notification: \" + extras);\n+ config.getLogger().debug(config.getAccountId(), \"Handling notification::nh_source = \" + extras.getString(\"nh_source\", \"source not available\"));\nif (extras.getString(Constants.WZRK_PUSH_ID) != null) {\n- if (baseDatabaseManager.loadDBAdapter(context)\n- .doesPushNotificationIdExist(\n- extras.getString(Constants.WZRK_PUSH_ID))) {\n- config.getLogger().debug(config.getAccountId(),\n- \"Push Notification already rendered, not showing again\");\n+ if (baseDatabaseManager.loadDBAdapter(context).doesPushNotificationIdExist(extras.getString(Constants.WZRK_PUSH_ID))) {\n+ config.getLogger().debug(config.getAccountId(), \"Push Notification already rendered, not showing again\");\nreturn;\n}\n}\n@@ -178,11 +168,8 @@ public class PushProviders implements CTPushProviderListener {\nnotifMessage = (notifMessage != null) ? notifMessage : \"\";\nif (notifMessage.isEmpty()) {\n//silent notification\n- config.getLogger()\n- .verbose(config.getAccountId(),\n- \"Push notification message is empty, not rendering\");\n- baseDatabaseManager.loadDBAdapter(context)\n- .storeUninstallTimestamp();\n+ config.getLogger().verbose(config.getAccountId(), \"Push notification message is empty, not rendering\");\n+ baseDatabaseManager.loadDBAdapter(context).storeUninstallTimestamp();\nString pingFreq = extras.getString(\"pf\", \"\");\nif (!TextUtils.isEmpty(pingFreq)) {\nupdatePingFrequencyIfNeeded(context, Integer.parseInt(pingFreq));\n@@ -199,8 +186,7 @@ public class PushProviders implements CTPushProviderListener {\n// Occurs if the notification image was null\n// Let's return, as we couldn't get a handle on the app's icon\n// Some devices throw a PackageManager* exception too\n- config.getLogger()\n- .debug(config.getAccountId(), \"Couldn't render notification: \", t);\n+ config.getLogger().debug(config.getAccountId(), \"Couldn't render notification: \", t);\n}\n}\n@@ -227,8 +213,7 @@ public class PushProviders implements CTPushProviderListener {\nif (TextUtils.isEmpty(key)) {\nreturn null;\n}\n- StorageHelper\n- .putStringImmediate(context, StorageHelper.storageKeyWithSuffix(config, key), token);\n+ StorageHelper.putStringImmediate(context, StorageHelper.storageKeyWithSuffix(config, key), token);\nconfig.log(PushConstants.LOG_TAG, pushType + \"Cached New Token successfully \" + token);\nreturn null;\n}\n@@ -371,8 +356,7 @@ public class PushProviders implements CTPushProviderListener {\nnotifMessage = (notifMessage != null) ? notifMessage : \"\";\nif (notifMessage.isEmpty()) {\n//silent notification\n- config.getLogger()\n- .verbose(config.getAccountId(), \"Push notification message is empty, not rendering\");\n+ config.getLogger().verbose(config.getAccountId(), \"Push notification message is empty, not rendering\");\nbaseDatabaseManager.loadDBAdapter(context).storeUninstallTimestamp();\nString pingFreq = extras.getString(\"pf\", \"\");\nif (!TextUtils.isEmpty(pingFreq)) {\n@@ -380,8 +364,7 @@ public class PushProviders implements CTPushProviderListener {\n}\n} else {\nString wzrk_pid = extras.getString(Constants.WZRK_PUSH_ID);\n- String ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE,\n- (System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL) / 1000 + \"\");\n+ String ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE, (System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL) / 1000 + \"\");\nlong wzrk_ttl = Long.parseLong(ttl);\nDBAdapter dbAdapter = baseDatabaseManager.loadDBAdapter(context);\nconfig.getLogger().verbose(\"Storing Push Notification...\" + wzrk_pid + \" - with ttl - \" + ttl);\n@@ -431,8 +414,7 @@ public class PushProviders implements CTPushProviderListener {\n}\nprivate boolean alreadyHaveToken(String newToken, PushType pushType) {\n- boolean alreadyAvailable = !TextUtils.isEmpty(newToken) && pushType != null && newToken\n- .equalsIgnoreCase(getCachedToken(pushType));\n+ boolean alreadyAvailable = !TextUtils.isEmpty(newToken) && pushType != null && newToken.equalsIgnoreCase(getCachedToken(pushType));\nif (pushType != null) {\nconfig.log(PushConstants.LOG_TAG, pushType + \"Token Already available value: \" + alreadyAvailable);\n}\n@@ -495,10 +477,7 @@ public class PushProviders implements CTPushProviderListener {\nflagsAlarmPendingIntent);\nif (alarmManager != null) {\nif (pingFrequency != -1) {\n- alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP,\n- SystemClock.elapsedRealtime() + (pingFrequency\n- * Constants.ONE_MIN_IN_MILLIS),\n- Constants.ONE_MIN_IN_MILLIS * pingFrequency, alarmServicePendingIntent);\n+ alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + (pingFrequency * Constants.ONE_MIN_IN_MILLIS), Constants.ONE_MIN_IN_MILLIS * pingFrequency, alarmServicePendingIntent);\n}\n}\n}\n@@ -551,8 +530,7 @@ public class PushProviders implements CTPushProviderListener {\n//running job, no hard cancel so check for diff in ping frequency and recreate if needed\nJobInfo existingJobInfo = getJobInfo(existingJobId, jobScheduler);\n- if (existingJobInfo != null\n- && existingJobInfo.getIntervalMillis() != pingFrequency * Constants.ONE_MIN_IN_MILLIS) {\n+ if (existingJobInfo != null && existingJobInfo.getIntervalMillis() != pingFrequency * Constants.ONE_MIN_IN_MILLIS) {\njobScheduler.cancel(existingJobId);\nStorageHelper.putInt(context, Constants.PF_JOB_ID, -1);\nneedsCreate = true;\n@@ -635,14 +613,11 @@ public class PushProviders implements CTPushProviderListener {\nClass<?> providerClass = Class.forName(className);\nif (isInit) {\n- Constructor<?> constructor = providerClass\n- .getConstructor(CTPushProviderListener.class, Context.class, CleverTapInstanceConfig.class);\n+ Constructor<?> constructor = providerClass.getConstructor(CTPushProviderListener.class, Context.class, CleverTapInstanceConfig.class);\npushProvider = (CTPushProvider) constructor.newInstance(this, context, config);\n} else {\n- Constructor<?> constructor = providerClass\n- .getConstructor(CTPushProviderListener.class, Context.class, CleverTapInstanceConfig.class,\n- Boolean.class);\n+ Constructor<?> constructor = providerClass.getConstructor(CTPushProviderListener.class, Context.class, CleverTapInstanceConfig.class, Boolean.class);\npushProvider = (CTPushProvider) constructor.newInstance(this, context, config, false);\n}\nconfig.log(PushConstants.LOG_TAG, \"Found provider:\" + className);\n@@ -653,8 +628,7 @@ public class PushProviders implements CTPushProviderListener {\n} catch (ClassNotFoundException e) {\nconfig.log(PushConstants.LOG_TAG, \"Unable to create provider ClassNotFoundException\" + className);\n} catch (Exception e) {\n- config.log(PushConstants.LOG_TAG,\n- \"Unable to create provider \" + className + \" Exception:\" + e.getClass().getName());\n+ config.log(PushConstants.LOG_TAG, \"Unable to create provider \" + className + \" Exception:\" + e.getClass().getName());\n}\nreturn pushProvider;\n}\n@@ -670,8 +644,7 @@ public class PushProviders implements CTPushProviderListener {\nprivate void findCTPushProviders(List<CTPushProvider> providers) {\nif (providers.isEmpty()) {\n- config.log(PushConstants.LOG_TAG,\n- \"No push providers found!. Make sure to install at least one push provider\");\n+ config.log(PushConstants.LOG_TAG, \"No push providers found!. Make sure to install at least one push provider\");\nreturn;\n}\n@@ -716,22 +689,19 @@ public class PushProviders implements CTPushProviderListener {\nif (pushType.getRunningDevices() == PushConstants.NO_DEVICES) {\nallEnabledPushTypes.remove(pushType);\nallDisabledPushTypes.add(pushType);\n- config.log(PushConstants.LOG_TAG,\n- \"disabling \" + pushType + \" due to flag set as PushConstants.NO_DEVICES\");\n+ config.log(PushConstants.LOG_TAG, \"disabling \" + pushType + \" due to flag set as PushConstants.NO_DEVICES\");\n}\n// if push is off for non-xiaomi devices then remove xps\nif (pushType.getRunningDevices() == PushConstants.XIAOMI_MIUI_DEVICES) {\nif (!PackageUtils.isXiaomiDeviceRunningMiui(context)) {\nallEnabledPushTypes.remove(pushType);\nallDisabledPushTypes.add(pushType);\n- config.log(PushConstants.LOG_TAG,\n- \"disabling \" + pushType + \" due to flag set as PushConstants.XIAOMI_MIUI_DEVICES\");\n+ config.log(PushConstants.LOG_TAG, \"disabling \" + pushType + \" due to flag set as PushConstants.XIAOMI_MIUI_DEVICES\");\n}\n}\n} catch (Exception e) {\n- config.log(PushConstants.LOG_TAG,\n- \"SDK class Not available \" + className + \" Exception:\" + e.getClass().getName());\n+ config.log(PushConstants.LOG_TAG, \"SDK class Not available \" + className + \" Exception:\" + e.getClass().getName());\n}\n}\n}\n@@ -750,14 +720,20 @@ public class PushProviders implements CTPushProviderListener {\nList<CTPushProvider> providers = createProviders();\n+\n+ Task<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n+\n+\n+ task.addOnSuccessListener(unused -> findCustomEnabledPushTypes());\n+ task.execute(\"asyncFindCTPushProviders\", () -> {\nfindCTPushProviders(providers);\n+ return null;\n+ });\n- findCustomEnabledPushTypes();\n}\nprivate void initPushAmp() {\n- if (config.isBackgroundSync() && !config\n- .isAnalyticsOnly()) {\n+ if (config.isBackgroundSync() && !config.isAnalyticsOnly()) {\nTask<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\ntask.execute(\"createOrResetJobScheduler\", new Callable<Void>() {\n@Override\n@@ -797,8 +773,7 @@ public class PushProviders implements CTPushProviderListener {\nprivate boolean isValid(CTPushProvider provider) {\nif (VERSION_CODE < provider.minSDKSupportVersionCode()) {\n- config.log(PushConstants.LOG_TAG,\n- \"Provider: %s version %s does not match the SDK version %s. Make sure all CleverTap dependencies are the same version.\");\n+ config.log(PushConstants.LOG_TAG, \"Provider: %s version %s does not match the SDK version %s. Make sure all CleverTap dependencies are the same version.\");\nreturn false;\n}\nswitch (provider.getPushType()) {\n@@ -807,16 +782,13 @@ public class PushProviders implements CTPushProviderListener {\ncase XPS:\ncase BPS:\nif (provider.getPlatform() != PushConstants.ANDROID_PLATFORM) {\n- config.log(PushConstants.LOG_TAG, \"Invalid Provider: \" + provider.getClass() +\n- \" delivery is only available for Android platforms.\" + provider.getPushType());\n+ config.log(PushConstants.LOG_TAG, \"Invalid Provider: \" + provider.getClass() + \" delivery is only available for Android platforms.\" + provider.getPushType());\nreturn false;\n}\nbreak;\ncase ADM:\nif (provider.getPlatform() != PushConstants.AMAZON_PLATFORM) {\n- config.log(PushConstants.LOG_TAG, \"Invalid Provider: \" +\n- provider.getClass() +\n- \" ADM delivery is only available for Amazon platforms.\" + provider.getPushType());\n+ config.log(PushConstants.LOG_TAG, \"Invalid Provider: \" + provider.getClass() + \" ADM delivery is only available for Amazon platforms.\" + provider.getPushType());\nreturn false;\n}\nbreak;\n@@ -934,12 +906,9 @@ public class PushProviders implements CTPushProviderListener {\nif (VERSION.SDK_INT >= VERSION_CODES.S) {\nflagsAlarmPendingIntent |= PendingIntent.FLAG_MUTABLE;\n}\n- PendingIntent alarmPendingIntent = PendingIntent\n- .getService(context, config.getAccountId().hashCode(), intent,\n- flagsAlarmPendingIntent);\n+ PendingIntent alarmPendingIntent = PendingIntent.getService(context, config.getAccountId().hashCode(), intent, flagsAlarmPendingIntent);\nif (alarmManager != null) {\n- alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime(),\n- Constants.ONE_MIN_IN_MILLIS * pingFrequency, alarmPendingIntent);\n+ alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime(), Constants.ONE_MIN_IN_MILLIS * pingFrequency, alarmPendingIntent);\n}\n}\n}\n@@ -952,23 +921,19 @@ public class PushProviders implements CTPushProviderListener {\nif (VERSION.SDK_INT >= VERSION_CODES.S) {\nflagsAlarmPendingIntent |= PendingIntent.FLAG_MUTABLE;\n}\n- PendingIntent alarmPendingIntent = PendingIntent\n- .getService(context, config.getAccountId().hashCode(), cancelIntent,\n- flagsAlarmPendingIntent);\n+ PendingIntent alarmPendingIntent = PendingIntent.getService(context, config.getAccountId().hashCode(), cancelIntent, flagsAlarmPendingIntent);\nif (alarmManager != null && alarmPendingIntent != null) {\nalarmManager.cancel(alarmPendingIntent);\n}\n}\n@RestrictTo(Scope.LIBRARY)\n- public @NonNull\n- INotificationRenderer getPushNotificationRenderer() {\n+ public @NonNull INotificationRenderer getPushNotificationRenderer() {\nreturn iNotificationRenderer;\n}\n@RestrictTo(Scope.LIBRARY)\n- public @NonNull\n- Object getPushRenderingLock() {\n+ public @NonNull Object getPushRenderingLock() {\nreturn pushRenderingLock;\n}\n@@ -988,8 +953,8 @@ public class PushProviders implements CTPushProviderListener {\n}\nprivate void triggerNotification(Context context, Bundle extras, int notificationId) {\n- NotificationManager notificationManager =\n- (NotificationManager) context.getSystemService(NOTIFICATION_SERVICE);\n+ Logger.v( \"triggerNotification() called with: context = [\" + context + \"], extras = [\" + extras + \"], notificationId = [\" + notificationId + \"]\");\n+ NotificationManager notificationManager = (NotificationManager) context.getSystemService(NOTIFICATION_SERVICE);\nif (notificationManager == null) {\nString notificationManagerError = \"Unable to render notification, Notification Manager is null.\";\n@@ -1056,27 +1021,20 @@ public class PushProviders implements CTPushProviderListener {\n} else if (collapse_key instanceof String) {\ntry {\nnotificationId = Integer.parseInt(collapse_key.toString());\n- config.getLogger().verbose(config.getAccountId(),\n- \"Converting collapse_key: \" + collapse_key + \" to notificationId int: \"\n- + notificationId);\n+ config.getLogger().verbose(config.getAccountId(), \"Converting collapse_key: \" + collapse_key + \" to notificationId int: \" + notificationId);\n} catch (NumberFormatException e) {\nnotificationId = (collapse_key.toString().hashCode());\n- config.getLogger().verbose(config.getAccountId(),\n- \"Converting collapse_key: \" + collapse_key + \" to notificationId int: \"\n- + notificationId);\n+ config.getLogger().verbose(config.getAccountId(), \"Converting collapse_key: \" + collapse_key + \" to notificationId int: \" + notificationId);\n}\n}\nnotificationId = Math.abs(notificationId); //Notification Id always needs to be positive\n- config.getLogger().debug(config.getAccountId(),\n- \"Creating the notification id: \" + notificationId + \" from collapse_key: \"\n- + collapse_key);\n+ config.getLogger().debug(config.getAccountId(), \"Creating the notification id: \" + notificationId + \" from collapse_key: \" + collapse_key);\n}\n} catch (NumberFormatException e) {\n// no-op\n}\n} else {\n- config.getLogger().debug(config.getAccountId(), \"Have user provided notificationId: \" + notificationId\n- + \" won't use collapse_key (if any) as basis for notificationId\");\n+ config.getLogger().debug(config.getAccountId(), \"Have user provided notificationId: \" + notificationId + \" won't use collapse_key (if any) as basis for notificationId\");\n}\n// if after trying collapse_key notification is still empty set to random int\n@@ -1090,8 +1048,7 @@ public class PushProviders implements CTPushProviderListener {\nnb = new NotificationCompat.Builder(context, channelId);\n// choices here are Notification.BADGE_ICON_NONE = 0, Notification.BADGE_ICON_SMALL = 1, Notification.BADGE_ICON_LARGE = 2. Default is Notification.BADGE_ICON_LARGE\n- String badgeIconParam = extras\n- .getString(Constants.WZRK_BADGE_ICON, null);\n+ String badgeIconParam = extras.getString(Constants.WZRK_BADGE_ICON, null);\nif (badgeIconParam != null) {\ntry {\nint badgeIconType = Integer.parseInt(badgeIconParam);\n@@ -1139,8 +1096,7 @@ public class PushProviders implements CTPushProviderListener {\nString extrasFrom = extras.getString(Constants.EXTRAS_FROM);\nif (extrasFrom == null || !extrasFrom.equals(\"PTReceiver\")) {\n- String ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE,\n- (System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL) / 1000 + \"\");\n+ String ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE, (System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL) / 1000 + \"\");\nlong wzrk_ttl = Long.parseLong(ttl);\nString wzrk_pid = extras.getString(Constants.WZRK_PUSH_ID);\nDBAdapter dbAdapter = baseDatabaseManager.loadDBAdapter(context);\n@@ -1149,17 +1105,14 @@ public class PushProviders implements CTPushProviderListener {\nboolean notificationViewedEnabled = \"true\".equals(extras.getString(Constants.WZRK_RNV, \"\"));\nif (!notificationViewedEnabled) {\n- ValidationResult notificationViewedError = ValidationResultFactory\n- .create(512, Constants.NOTIFICATION_VIEWED_DISABLED, extras.toString());\n+ ValidationResult notificationViewedError = ValidationResultFactory.create(512, Constants.NOTIFICATION_VIEWED_DISABLED, extras.toString());\nconfig.getLogger().debug(notificationViewedError.getErrorDesc());\nvalidationResultStack.pushValidationResult(notificationViewedError);\nreturn;\n}\nanalyticsManager.pushNotificationViewedEvent(extras);\n- config.getLogger()\n- .verbose(\"Rendered Push Notification... from nh_source = \" + extras.getString(\"nh_source\",\n- \"source not available\"));\n+ config.getLogger().verbose(\"Rendered Push Notification... from nh_source = \" + extras.getString(\"nh_source\", \"source not available\"));\n}\n}\n}\n\\ No newline at end of file\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
[SDK-2330] calling findCTPushProviders in async and findCustomEnabledPushTypes in async success callback
116,620
21.11.2022 11:46:11
-19,080
1f93950a9ae7e1ebfed22eec82327d143315722e
adding proguard rules to keep CREATOR instance for parcelable classes . fixes crash 3 Fatal Exception: java.lang.RuntimeException: Unable to start activity ComponentInfo{com.client.app_package/com.clevertap.android.sdk.InAppNotificationActivity}: android.os.BadParcelableException: ClassNotFoundException when unmarshalling: androidx.fragment.app.FragmentManagerState
[ { "change_type": "MODIFY", "old_path": "clevertap-core/consumer-rules.pro", "new_path": "clevertap-core/consumer-rules.pro", "diff": "-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+-keepnames class * implements android.os.Parcelable {\n+ public static final ** CREATOR;\n+}\n-keepattributes Exceptions,InnerClasses,Signature,Deprecated,\nSourceFile,LineNumberTable,*Annotation*,EnclosingMethod\n\\ No newline at end of file\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
[SDK-2293] adding proguard rules to keep CREATOR instance for parcelable classes . fixes crash 3 Fatal Exception: java.lang.RuntimeException: Unable to start activity ComponentInfo{com.client.app_package/com.clevertap.android.sdk.InAppNotificationActivity}: android.os.BadParcelableException: ClassNotFoundException when unmarshalling: androidx.fragment.app.FragmentManagerState
116,612
22.11.2022 16:29:47
-19,080
6e25bcacf63d5f7225e99e99d0e4858c8fd909af
fix(SDK-2328) : remove unused static constant initialization of SimpleDateFormat which is causing ANR
[ { "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": "@@ -5,10 +5,8 @@ import androidx.annotation.RestrictTo;\nimport androidx.annotation.StringDef;\nimport java.lang.annotation.Retention;\nimport java.lang.annotation.RetentionPolicy;\n-import java.text.SimpleDateFormat;\nimport java.util.Arrays;\nimport java.util.HashSet;\n-import java.util.Locale;\n@RestrictTo(RestrictTo.Scope.LIBRARY)\npublic interface Constants {\n@@ -49,7 +47,6 @@ public interface Constants {\nint SESSION_LENGTH_MINS = 20;\nString DEVICE_ID_TAG = \"deviceId\";\nString FALLBACK_ID_TAG = \"fallbackId\";\n- SimpleDateFormat FB_DOB_DATE_FORMAT = new SimpleDateFormat(\"MM/dd/yyyy\", Locale.US);\nint PAGE_EVENT = 1;\nint PING_EVENT = 2;\nint PROFILE_EVENT = 3;\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
fix(SDK-2328) : remove unused static constant initialization of SimpleDateFormat which is causing ANR
116,620
22.11.2022 17:07:13
-19,080
a086201fa3efce199488b4008d1b16c61e5f8a17
setting hashmap as concurrent to prevent ConcurrentModificationException Fatal Exception: java.util.ConcurrentModificationException at java.util.HashMap$HashIterator.nextNode(HashMap.java:1441) at java.util.HashMap$KeyIterator.next(HashMap.java:1465) at com.clevertap.android.sdk.CleverTapAPI.runJobWork(CleverTapAPI.java:961) at com.clevertap.android.sdk.pushnotification.amp.CTBackgroundJobService$1.run(CTBackgroundJobService.java:22) at java.lang.Thread.run(Thread.java:923)
[ { "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": "@@ -65,6 +65,7 @@ import java.util.Collections;\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.concurrent.Callable;\n+import java.util.concurrent.ConcurrentHashMap;\nimport java.util.concurrent.Future;\nimport org.json.JSONArray;\nimport org.json.JSONObject;\n@@ -127,7 +128,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nstatic CleverTapInstanceConfig defaultConfig;\n- private static HashMap<String, CleverTapAPI> instances;\n+ private static ConcurrentHashMap<String, CleverTapAPI> instances;\n@SuppressWarnings({\"FieldCanBeLocal\", \"unused\"})\nprivate static String sdkVersion; // For Google Play Store/Android Studio analytics\n@@ -770,11 +771,11 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn null;// failed to get instance\n}\n- public static HashMap<String, CleverTapAPI> getInstances() {\n+ public static ConcurrentHashMap<String, CleverTapAPI> getInstances() {\nreturn instances;\n}\n- public static void setInstances(final HashMap<String, CleverTapAPI> instances) {\n+ public static void setInstances(final ConcurrentHashMap<String, CleverTapAPI> instances) {\nCleverTapAPI.instances = instances;\n}\n@@ -860,7 +861,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\nreturn null;\n}\nif (instances == null) {\n- instances = new HashMap<>();\n+ instances = new ConcurrentHashMap<>();\n}\nCleverTapAPI instance = instances.get(config.getAccountId());\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
[SDK-2293] setting hashmap as concurrent to prevent ConcurrentModificationException Fatal Exception: java.util.ConcurrentModificationException at java.util.HashMap$HashIterator.nextNode(HashMap.java:1441) at java.util.HashMap$KeyIterator.next(HashMap.java:1465) at com.clevertap.android.sdk.CleverTapAPI.runJobWork(CleverTapAPI.java:961) at com.clevertap.android.sdk.pushnotification.amp.CTBackgroundJobService$1.run(CTBackgroundJobService.java:22) at java.lang.Thread.run(Thread.java:923)
116,618
24.11.2022 12:32:21
-19,080
737af6067b84bdbf65865a60d48422338f6e29f7
fix(SDK-2293): fix anr issue while getting ReferrerDetails instance
[ { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifeCycleManager.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifeCycleManager.java", "diff": "@@ -158,9 +158,22 @@ class ActivityLifeCycleManager {\nswitch (responseCode) {\ncase InstallReferrerClient.InstallReferrerResponse.OK:\n// Connection established.\n- ReferrerDetails response;\n+ Task<ReferrerDetails> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n+ task.execute(\"ActivityLifeCycleManager#getInstallReferrer\", () -> {\n+ ReferrerDetails response = null;\ntry {\nresponse = referrerClient.getInstallReferrer();\n+ } catch (RemoteException e) {\n+ config.getLogger().debug(config.getAccountId(),\n+ \"Remote exception caused by Google Play Install Referrer library - \" + e\n+ .getMessage());\n+ referrerClient.endConnection();\n+ coreMetaData.setInstallReferrerDataSent(false);\n+ }\n+ return response;\n+ });\n+ task.addOnSuccessListener(response -> {\n+ try {\nString referrerUrl = response.getInstallReferrer();\ncoreMetaData\n.setReferrerClickTime(response.getReferrerClickTimestampSeconds());\n@@ -170,12 +183,6 @@ class ActivityLifeCycleManager {\ncoreMetaData.setInstallReferrerDataSent(true);\nconfig.getLogger().debug(config.getAccountId(),\n\"Install Referrer data set [Referrer URL-\" + referrerUrl + \"]\");\n- } catch (RemoteException e) {\n- config.getLogger().debug(config.getAccountId(),\n- \"Remote exception caused by Google Play Install Referrer library - \" + e\n- .getMessage());\n- referrerClient.endConnection();\n- coreMetaData.setInstallReferrerDataSent(false);\n} catch (NullPointerException npe) {\nconfig.getLogger().debug(config.getAccountId(),\n\"Install referrer client null pointer exception caused by Google Play Install Referrer library - \" + npe\n@@ -183,6 +190,7 @@ class ActivityLifeCycleManager {\nreferrerClient.endConnection();\ncoreMetaData.setInstallReferrerDataSent(false);\n}\n+ });\nbreak;\ncase InstallReferrerClient.InstallReferrerResponse.FEATURE_NOT_SUPPORTED:\n// API not available on the current Play Store app.\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
fix(SDK-2293): fix anr issue while getting ReferrerDetails instance
116,620
24.11.2022 16:15:57
-19,080
0ca8018c6846b5f5ba2ca6b971c6b0be3153978d
removed non essential changes
[ { "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": "@@ -144,7 +144,9 @@ public class PushProviders implements CTPushProviderListener {\n}\nif (config.isAnalyticsOnly()) {\n- config.getLogger().debug(config.getAccountId(), \"Instance is set for Analytics only, cannot create notification\");\n+ config.getLogger()\n+ .debug(config.getAccountId(),\n+ \"Instance is set for Analytics only, cannot create notification\");\nreturn;\n}\n@@ -156,11 +158,19 @@ public class PushProviders implements CTPushProviderListener {\n}\nString extrasFrom = extras.getString(Constants.EXTRAS_FROM);\nif (extrasFrom == null || !extrasFrom.equals(\"PTReceiver\")) {\n- config.getLogger().debug(config.getAccountId(), \"Handling notification: \" + extras);\n- config.getLogger().debug(config.getAccountId(), \"Handling notification::nh_source = \" + extras.getString(\"nh_source\", \"source not available\"));\n+ config.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\",\n+ \"source not available\"));\nif (extras.getString(Constants.WZRK_PUSH_ID) != null) {\n- if (baseDatabaseManager.loadDBAdapter(context).doesPushNotificationIdExist(extras.getString(Constants.WZRK_PUSH_ID))) {\n- config.getLogger().debug(config.getAccountId(), \"Push Notification already rendered, not showing again\");\n+ if (baseDatabaseManager.loadDBAdapter(context)\n+ .doesPushNotificationIdExist(\n+ extras.getString(Constants.WZRK_PUSH_ID))) {\n+ config.getLogger().debug(config.getAccountId(),\n+ \"Push Notification already rendered, not showing again\");\nreturn;\n}\n}\n@@ -168,8 +178,11 @@ public class PushProviders implements CTPushProviderListener {\nnotifMessage = (notifMessage != null) ? notifMessage : \"\";\nif (notifMessage.isEmpty()) {\n//silent notification\n- config.getLogger().verbose(config.getAccountId(), \"Push notification message is empty, not rendering\");\n- baseDatabaseManager.loadDBAdapter(context).storeUninstallTimestamp();\n+ config.getLogger()\n+ .verbose(config.getAccountId(),\n+ \"Push notification message is empty, not rendering\");\n+ baseDatabaseManager.loadDBAdapter(context)\n+ .storeUninstallTimestamp();\nString pingFreq = extras.getString(\"pf\", \"\");\nif (!TextUtils.isEmpty(pingFreq)) {\nupdatePingFrequencyIfNeeded(context, Integer.parseInt(pingFreq));\n@@ -186,7 +199,8 @@ public class PushProviders implements CTPushProviderListener {\n// Occurs if the notification image was null\n// Let's return, as we couldn't get a handle on the app's icon\n// Some devices throw a PackageManager* exception too\n- config.getLogger().debug(config.getAccountId(), \"Couldn't render notification: \", t);\n+ config.getLogger()\n+ .debug(config.getAccountId(), \"Couldn't render notification: \", t);\n}\n}\n@@ -213,7 +227,8 @@ public class PushProviders implements CTPushProviderListener {\nif (TextUtils.isEmpty(key)) {\nreturn null;\n}\n- StorageHelper.putStringImmediate(context, StorageHelper.storageKeyWithSuffix(config, key), token);\n+ StorageHelper\n+ .putStringImmediate(context, StorageHelper.storageKeyWithSuffix(config, key), token);\nconfig.log(PushConstants.LOG_TAG, pushType + \"Cached New Token successfully \" + token);\nreturn null;\n}\n@@ -356,7 +371,8 @@ public class PushProviders implements CTPushProviderListener {\nnotifMessage = (notifMessage != null) ? notifMessage : \"\";\nif (notifMessage.isEmpty()) {\n//silent notification\n- config.getLogger().verbose(config.getAccountId(), \"Push notification message is empty, not rendering\");\n+ config.getLogger()\n+ .verbose(config.getAccountId(), \"Push notification message is empty, not rendering\");\nbaseDatabaseManager.loadDBAdapter(context).storeUninstallTimestamp();\nString pingFreq = extras.getString(\"pf\", \"\");\nif (!TextUtils.isEmpty(pingFreq)) {\n@@ -364,7 +380,8 @@ public class PushProviders implements CTPushProviderListener {\n}\n} else {\nString wzrk_pid = extras.getString(Constants.WZRK_PUSH_ID);\n- String ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE, (System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL) / 1000 + \"\");\n+ String ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE,\n+ (System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL) / 1000 + \"\");\nlong wzrk_ttl = Long.parseLong(ttl);\nDBAdapter dbAdapter = baseDatabaseManager.loadDBAdapter(context);\nconfig.getLogger().verbose(\"Storing Push Notification...\" + wzrk_pid + \" - with ttl - \" + ttl);\n@@ -414,7 +431,8 @@ public class PushProviders implements CTPushProviderListener {\n}\nprivate boolean alreadyHaveToken(String newToken, PushType pushType) {\n- boolean alreadyAvailable = !TextUtils.isEmpty(newToken) && pushType != null && newToken.equalsIgnoreCase(getCachedToken(pushType));\n+ boolean alreadyAvailable = !TextUtils.isEmpty(newToken) && pushType != null && newToken\n+ .equalsIgnoreCase(getCachedToken(pushType));\nif (pushType != null) {\nconfig.log(PushConstants.LOG_TAG, pushType + \"Token Already available value: \" + alreadyAvailable);\n}\n@@ -477,7 +495,10 @@ public class PushProviders implements CTPushProviderListener {\nflagsAlarmPendingIntent);\nif (alarmManager != null) {\nif (pingFrequency != -1) {\n- alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + (pingFrequency * Constants.ONE_MIN_IN_MILLIS), Constants.ONE_MIN_IN_MILLIS * pingFrequency, alarmServicePendingIntent);\n+ alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP,\n+ SystemClock.elapsedRealtime() + (pingFrequency\n+ * Constants.ONE_MIN_IN_MILLIS),\n+ Constants.ONE_MIN_IN_MILLIS * pingFrequency, alarmServicePendingIntent);\n}\n}\n}\n@@ -530,7 +551,8 @@ public class PushProviders implements CTPushProviderListener {\n//running job, no hard cancel so check for diff in ping frequency and recreate if needed\nJobInfo existingJobInfo = getJobInfo(existingJobId, jobScheduler);\n- if (existingJobInfo != null && existingJobInfo.getIntervalMillis() != pingFrequency * Constants.ONE_MIN_IN_MILLIS) {\n+ if (existingJobInfo != null\n+ && existingJobInfo.getIntervalMillis() != pingFrequency * Constants.ONE_MIN_IN_MILLIS) {\njobScheduler.cancel(existingJobId);\nStorageHelper.putInt(context, Constants.PF_JOB_ID, -1);\nneedsCreate = true;\n@@ -613,11 +635,14 @@ public class PushProviders implements CTPushProviderListener {\nClass<?> providerClass = Class.forName(className);\nif (isInit) {\n- Constructor<?> constructor = providerClass.getConstructor(CTPushProviderListener.class, Context.class, CleverTapInstanceConfig.class);\n+ Constructor<?> constructor = providerClass\n+ .getConstructor(CTPushProviderListener.class, Context.class, CleverTapInstanceConfig.class);\npushProvider = (CTPushProvider) constructor.newInstance(this, context, config);\n} else {\n- Constructor<?> constructor = providerClass.getConstructor(CTPushProviderListener.class, Context.class, CleverTapInstanceConfig.class, Boolean.class);\n+ Constructor<?> constructor = providerClass\n+ .getConstructor(CTPushProviderListener.class, Context.class, CleverTapInstanceConfig.class,\n+ Boolean.class);\npushProvider = (CTPushProvider) constructor.newInstance(this, context, config, false);\n}\nconfig.log(PushConstants.LOG_TAG, \"Found provider:\" + className);\n@@ -628,7 +653,8 @@ public class PushProviders implements CTPushProviderListener {\n} catch (ClassNotFoundException e) {\nconfig.log(PushConstants.LOG_TAG, \"Unable to create provider ClassNotFoundException\" + className);\n} catch (Exception e) {\n- config.log(PushConstants.LOG_TAG, \"Unable to create provider \" + className + \" Exception:\" + e.getClass().getName());\n+ config.log(PushConstants.LOG_TAG,\n+ \"Unable to create provider \" + className + \" Exception:\" + e.getClass().getName());\n}\nreturn pushProvider;\n}\n@@ -644,7 +670,8 @@ public class PushProviders implements CTPushProviderListener {\nprivate void findCTPushProviders(List<CTPushProvider> providers) {\nif (providers.isEmpty()) {\n- config.log(PushConstants.LOG_TAG, \"No push providers found!. Make sure to install at least one push provider\");\n+ config.log(PushConstants.LOG_TAG,\n+ \"No push providers found!. Make sure to install at least one push provider\");\nreturn;\n}\n@@ -689,19 +716,22 @@ public class PushProviders implements CTPushProviderListener {\nif (pushType.getRunningDevices() == PushConstants.NO_DEVICES) {\nallEnabledPushTypes.remove(pushType);\nallDisabledPushTypes.add(pushType);\n- config.log(PushConstants.LOG_TAG, \"disabling \" + pushType + \" due to flag set as PushConstants.NO_DEVICES\");\n+ config.log(PushConstants.LOG_TAG,\n+ \"disabling \" + pushType + \" due to flag set as PushConstants.NO_DEVICES\");\n}\n// if push is off for non-xiaomi devices then remove xps\nif (pushType.getRunningDevices() == PushConstants.XIAOMI_MIUI_DEVICES) {\nif (!PackageUtils.isXiaomiDeviceRunningMiui(context)) {\nallEnabledPushTypes.remove(pushType);\nallDisabledPushTypes.add(pushType);\n- config.log(PushConstants.LOG_TAG, \"disabling \" + pushType + \" due to flag set as PushConstants.XIAOMI_MIUI_DEVICES\");\n+ config.log(PushConstants.LOG_TAG,\n+ \"disabling \" + pushType + \" due to flag set as PushConstants.XIAOMI_MIUI_DEVICES\");\n}\n}\n} catch (Exception e) {\n- config.log(PushConstants.LOG_TAG, \"SDK class Not available \" + className + \" Exception:\" + e.getClass().getName());\n+ config.log(PushConstants.LOG_TAG,\n+ \"SDK class Not available \" + className + \" Exception:\" + e.getClass().getName());\n}\n}\n}\n@@ -733,7 +763,8 @@ public class PushProviders implements CTPushProviderListener {\n}\nprivate void initPushAmp() {\n- if (config.isBackgroundSync() && !config.isAnalyticsOnly()) {\n+ if (config.isBackgroundSync() && !config\n+ .isAnalyticsOnly()) {\nTask<Void> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\ntask.execute(\"createOrResetJobScheduler\", new Callable<Void>() {\n@Override\n@@ -773,7 +804,8 @@ public class PushProviders implements CTPushProviderListener {\nprivate boolean isValid(CTPushProvider provider) {\nif (VERSION_CODE < provider.minSDKSupportVersionCode()) {\n- config.log(PushConstants.LOG_TAG, \"Provider: %s version %s does not match the SDK version %s. Make sure all CleverTap dependencies are the same version.\");\n+ config.log(PushConstants.LOG_TAG,\n+ \"Provider: %s version %s does not match the SDK version %s. Make sure all CleverTap dependencies are the same version.\");\nreturn false;\n}\nswitch (provider.getPushType()) {\n@@ -782,13 +814,16 @@ public class PushProviders implements CTPushProviderListener {\ncase XPS:\ncase BPS:\nif (provider.getPlatform() != PushConstants.ANDROID_PLATFORM) {\n- config.log(PushConstants.LOG_TAG, \"Invalid Provider: \" + provider.getClass() + \" delivery is only available for Android platforms.\" + provider.getPushType());\n+ config.log(PushConstants.LOG_TAG, \"Invalid Provider: \" + provider.getClass() +\n+ \" delivery is only available for Android platforms.\" + provider.getPushType());\nreturn false;\n}\nbreak;\ncase ADM:\nif (provider.getPlatform() != PushConstants.AMAZON_PLATFORM) {\n- config.log(PushConstants.LOG_TAG, \"Invalid Provider: \" + provider.getClass() + \" ADM delivery is only available for Amazon platforms.\" + provider.getPushType());\n+ config.log(PushConstants.LOG_TAG, \"Invalid Provider: \" +\n+ provider.getClass() +\n+ \" ADM delivery is only available for Amazon platforms.\" + provider.getPushType());\nreturn false;\n}\nbreak;\n@@ -906,9 +941,12 @@ public class PushProviders implements CTPushProviderListener {\nif (VERSION.SDK_INT >= VERSION_CODES.S) {\nflagsAlarmPendingIntent |= PendingIntent.FLAG_MUTABLE;\n}\n- PendingIntent alarmPendingIntent = PendingIntent.getService(context, config.getAccountId().hashCode(), intent, flagsAlarmPendingIntent);\n+ PendingIntent alarmPendingIntent = PendingIntent\n+ .getService(context, config.getAccountId().hashCode(), intent,\n+ flagsAlarmPendingIntent);\nif (alarmManager != null) {\n- alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime(), Constants.ONE_MIN_IN_MILLIS * pingFrequency, alarmPendingIntent);\n+ alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime(),\n+ Constants.ONE_MIN_IN_MILLIS * pingFrequency, alarmPendingIntent);\n}\n}\n}\n@@ -921,19 +959,23 @@ public class PushProviders implements CTPushProviderListener {\nif (VERSION.SDK_INT >= VERSION_CODES.S) {\nflagsAlarmPendingIntent |= PendingIntent.FLAG_MUTABLE;\n}\n- PendingIntent alarmPendingIntent = PendingIntent.getService(context, config.getAccountId().hashCode(), cancelIntent, flagsAlarmPendingIntent);\n+ PendingIntent alarmPendingIntent = PendingIntent\n+ .getService(context, config.getAccountId().hashCode(), cancelIntent,\n+ flagsAlarmPendingIntent);\nif (alarmManager != null && alarmPendingIntent != null) {\nalarmManager.cancel(alarmPendingIntent);\n}\n}\n@RestrictTo(Scope.LIBRARY)\n- public @NonNull INotificationRenderer getPushNotificationRenderer() {\n+ public @NonNull\n+ INotificationRenderer getPushNotificationRenderer() {\nreturn iNotificationRenderer;\n}\n@RestrictTo(Scope.LIBRARY)\n- public @NonNull Object getPushRenderingLock() {\n+ public @NonNull\n+ Object getPushRenderingLock() {\nreturn pushRenderingLock;\n}\n@@ -953,8 +995,8 @@ public class PushProviders implements CTPushProviderListener {\n}\nprivate void triggerNotification(Context context, Bundle extras, int notificationId) {\n- Logger.v( \"triggerNotification() called with: context = [\" + context + \"], extras = [\" + extras + \"], notificationId = [\" + notificationId + \"]\");\n- NotificationManager notificationManager = (NotificationManager) context.getSystemService(NOTIFICATION_SERVICE);\n+ NotificationManager notificationManager =\n+ (NotificationManager) context.getSystemService(NOTIFICATION_SERVICE);\nif (notificationManager == null) {\nString notificationManagerError = \"Unable to render notification, Notification Manager is null.\";\n@@ -1021,20 +1063,27 @@ public class PushProviders implements CTPushProviderListener {\n} else if (collapse_key instanceof String) {\ntry {\nnotificationId = Integer.parseInt(collapse_key.toString());\n- config.getLogger().verbose(config.getAccountId(), \"Converting collapse_key: \" + collapse_key + \" to notificationId int: \" + notificationId);\n+ config.getLogger().verbose(config.getAccountId(),\n+ \"Converting collapse_key: \" + collapse_key + \" to notificationId int: \"\n+ + notificationId);\n} catch (NumberFormatException e) {\nnotificationId = (collapse_key.toString().hashCode());\n- config.getLogger().verbose(config.getAccountId(), \"Converting collapse_key: \" + collapse_key + \" to notificationId int: \" + notificationId);\n+ config.getLogger().verbose(config.getAccountId(),\n+ \"Converting collapse_key: \" + collapse_key + \" to notificationId int: \"\n+ + notificationId);\n}\n}\nnotificationId = Math.abs(notificationId); //Notification Id always needs to be positive\n- config.getLogger().debug(config.getAccountId(), \"Creating the notification id: \" + notificationId + \" from collapse_key: \" + collapse_key);\n+ config.getLogger().debug(config.getAccountId(),\n+ \"Creating the notification id: \" + notificationId + \" from collapse_key: \"\n+ + collapse_key);\n}\n} catch (NumberFormatException e) {\n// no-op\n}\n} else {\n- config.getLogger().debug(config.getAccountId(), \"Have user provided notificationId: \" + notificationId + \" won't use collapse_key (if any) as basis for notificationId\");\n+ config.getLogger().debug(config.getAccountId(), \"Have user provided notificationId: \" + notificationId\n+ + \" won't use collapse_key (if any) as basis for notificationId\");\n}\n// if after trying collapse_key notification is still empty set to random int\n@@ -1048,7 +1097,8 @@ public class PushProviders implements CTPushProviderListener {\nnb = new NotificationCompat.Builder(context, channelId);\n// choices here are Notification.BADGE_ICON_NONE = 0, Notification.BADGE_ICON_SMALL = 1, Notification.BADGE_ICON_LARGE = 2. Default is Notification.BADGE_ICON_LARGE\n- String badgeIconParam = extras.getString(Constants.WZRK_BADGE_ICON, null);\n+ String badgeIconParam = extras\n+ .getString(Constants.WZRK_BADGE_ICON, null);\nif (badgeIconParam != null) {\ntry {\nint badgeIconType = Integer.parseInt(badgeIconParam);\n@@ -1096,7 +1146,8 @@ public class PushProviders implements CTPushProviderListener {\nString extrasFrom = extras.getString(Constants.EXTRAS_FROM);\nif (extrasFrom == null || !extrasFrom.equals(\"PTReceiver\")) {\n- String ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE, (System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL) / 1000 + \"\");\n+ String ttl = extras.getString(Constants.WZRK_TIME_TO_LIVE,\n+ (System.currentTimeMillis() + Constants.DEFAULT_PUSH_TTL) / 1000 + \"\");\nlong wzrk_ttl = Long.parseLong(ttl);\nString wzrk_pid = extras.getString(Constants.WZRK_PUSH_ID);\nDBAdapter dbAdapter = baseDatabaseManager.loadDBAdapter(context);\n@@ -1105,14 +1156,17 @@ public class PushProviders implements CTPushProviderListener {\nboolean notificationViewedEnabled = \"true\".equals(extras.getString(Constants.WZRK_RNV, \"\"));\nif (!notificationViewedEnabled) {\n- ValidationResult notificationViewedError = ValidationResultFactory.create(512, Constants.NOTIFICATION_VIEWED_DISABLED, extras.toString());\n+ ValidationResult notificationViewedError = ValidationResultFactory\n+ .create(512, Constants.NOTIFICATION_VIEWED_DISABLED, extras.toString());\nconfig.getLogger().debug(notificationViewedError.getErrorDesc());\nvalidationResultStack.pushValidationResult(notificationViewedError);\nreturn;\n}\nanalyticsManager.pushNotificationViewedEvent(extras);\n- config.getLogger().verbose(\"Rendered Push Notification... from nh_source = \" + extras.getString(\"nh_source\", \"source not available\"));\n+ config.getLogger()\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" } ]
Java
MIT License
clevertap/clevertap-android-sdk
[SDK-2380] removed non essential changes
116,620
28.11.2022 10:37:00
-19,080
0a810ccd764ec6b1376c826e3828c2e7a400c508
fix test part 1
[ { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifeCycleManager.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifeCycleManager.java", "diff": "@@ -157,7 +157,7 @@ class ActivityLifeCycleManager {\npublic void onInstallReferrerSetupFinished(int responseCode) {\nswitch (responseCode) {\ncase InstallReferrerClient.InstallReferrerResponse.OK:\n- // Connection established.\n+ // Connection established\nTask<ReferrerDetails> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\ntask.execute(\"ActivityLifeCycleManager#getInstallReferrer\", () -> {\nReferrerDetails response = null;\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
[SDK-2293] fix test part 1
116,612
29.11.2022 16:26:19
-19,080
dee7528ae74ce5ae66ca732ed07a402d8a746fe3
fix(SDK-2293) fix unit test for handleInstallReferrerOnFirstInstall
[ { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifeCycleManager.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/ActivityLifeCycleManager.java", "diff": "@@ -159,19 +159,7 @@ class ActivityLifeCycleManager {\ncase InstallReferrerClient.InstallReferrerResponse.OK:\n// Connection established\nTask<ReferrerDetails> task = CTExecutorFactory.executors(config).postAsyncSafelyTask();\n- task.execute(\"ActivityLifeCycleManager#getInstallReferrer\", () -> {\n- ReferrerDetails response = null;\n- try {\n- response = referrerClient.getInstallReferrer();\n- } catch (RemoteException e) {\n- config.getLogger().debug(config.getAccountId(),\n- \"Remote exception caused by Google Play Install Referrer library - \" + e\n- .getMessage());\n- referrerClient.endConnection();\n- coreMetaData.setInstallReferrerDataSent(false);\n- }\n- return response;\n- });\n+\ntask.addOnSuccessListener(response -> {\ntry {\nString referrerUrl = response.getInstallReferrer();\n@@ -185,12 +173,28 @@ class ActivityLifeCycleManager {\n\"Install Referrer data set [Referrer URL-\" + referrerUrl + \"]\");\n} catch (NullPointerException npe) {\nconfig.getLogger().debug(config.getAccountId(),\n- \"Install referrer client null pointer exception caused by Google Play Install Referrer library - \" + npe\n+ \"Install referrer client null pointer exception caused by Google Play Install Referrer library - \"\n+ + npe\n.getMessage());\nreferrerClient.endConnection();\ncoreMetaData.setInstallReferrerDataSent(false);\n}\n});\n+\n+ task.execute(\"ActivityLifeCycleManager#getInstallReferrer\", () -> {\n+ ReferrerDetails response = null;\n+ try {\n+ response = referrerClient.getInstallReferrer();\n+ } catch (RemoteException e) {\n+ config.getLogger().debug(config.getAccountId(),\n+ \"Remote exception caused by Google Play Install Referrer library - \" + e\n+ .getMessage());\n+ referrerClient.endConnection();\n+ coreMetaData.setInstallReferrerDataSent(false);\n+ }\n+ return response;\n+ });\n+\nbreak;\ncase InstallReferrerClient.InstallReferrerResponse.FEATURE_NOT_SUPPORTED:\n// API not available on the current Play Store app.\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
fix(SDK-2293) fix unit test for handleInstallReferrerOnFirstInstall
116,618
01.12.2022 20:53:25
-19,080
73bbab95201fac40a92305efab1f658b32dac38c
task(SDK-2445): add support to register multiple push primer listeners
[ { "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": "@@ -9,6 +9,7 @@ import com.clevertap.android.sdk.product_config.CTProductConfigListener;\nimport com.clevertap.android.sdk.pushnotification.CTPushNotificationListener;\nimport com.clevertap.android.sdk.pushnotification.amp.CTPushAmpListener;\nimport java.util.ArrayList;\n+import java.util.List;\npublic abstract class BaseCallbackManager {\n@@ -28,7 +29,7 @@ public abstract class BaseCallbackManager {\npublic abstract InAppNotificationListener getInAppNotificationListener();\n- public abstract PushPermissionResponseListener getPushPermissionResponseListener();\n+ public abstract List<PushPermissionResponseListener> getPushPermissionResponseListener();\npublic abstract CTInboxListener getInboxListener();\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": "@@ -14,6 +14,7 @@ import com.clevertap.android.sdk.pushnotification.CTPushNotificationListener;\nimport com.clevertap.android.sdk.pushnotification.amp.CTPushAmpListener;\nimport java.lang.ref.WeakReference;\nimport java.util.ArrayList;\n+import java.util.List;\n@RestrictTo(Scope.LIBRARY)\npublic class CallbackManager extends BaseCallbackManager {\n@@ -28,7 +29,7 @@ public class CallbackManager extends BaseCallbackManager {\nprivate InAppNotificationListener inAppNotificationListener;\n- private PushPermissionResponseListener pushPermissionResponseListener;\n+ private final List<PushPermissionResponseListener> pushPermissionResponseListener = new ArrayList<>();\nprivate CTInboxListener inboxListener;\n@@ -134,7 +135,7 @@ public class CallbackManager extends BaseCallbackManager {\n}\n@Override\n- public PushPermissionResponseListener getPushPermissionResponseListener() {\n+ public List<PushPermissionResponseListener> getPushPermissionResponseListener() {\nreturn pushPermissionResponseListener;\n}\n@@ -145,7 +146,7 @@ public class CallbackManager extends BaseCallbackManager {\n@Override\npublic void setPushPermissionResponseListener(PushPermissionResponseListener pushPermissionResponseListener) {\n- this.pushPermissionResponseListener = pushPermissionResponseListener;\n+ this.pushPermissionResponseListener.add(pushPermissionResponseListener);\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": "@@ -63,6 +63,7 @@ import java.lang.ref.WeakReference;\nimport java.util.ArrayList;\nimport java.util.Collections;\nimport java.util.HashMap;\n+import java.util.List;\nimport java.util.Map;\nimport java.util.concurrent.Callable;\nimport java.util.concurrent.Future;\n@@ -1637,12 +1638,12 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n/**\n- * Returns the PushPermissionNotificationResponseListener object\n+ * Returns the list of PushPermissionNotificationResponseListener\n*\n* @return An {@link PushPermissionResponseListener} object\n*/\n@SuppressWarnings({\"unused\", \"WeakerAccess\"})\n- public PushPermissionResponseListener getPushPermissionNotificationResponseListener() {\n+ public List<PushPermissionResponseListener> getPushPermissionNotificationResponseListener() {\nreturn coreState.getCallbackManager().getPushPermissionResponseListener();\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": "@@ -193,8 +193,6 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n@RequiresApi(api = 33)\npublic void promptPushPrimer(JSONObject jsonObject){\n- PushPermissionResponseListener listener = callbackManager.\n- getPushPermissionResponseListener();\nint permissionStatus = ContextCompat.checkSelfPermission(context,\nManifest.permission.POST_NOTIFICATIONS);\n@@ -210,9 +208,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nif (!jsonObject.optBoolean(FALLBACK_TO_NOTIFICATION_SETTINGS, false)) {\nLogger.v(\"Notification permission is denied. Please grant notification permission access\" +\n\" in your app's settings to send notifications\");\n- if (listener != null) {\n- listener.onPushPermissionResponse(false);\n- }\n+ notifyPushPermissionResult(false);\n} else {\nshowSoftOrHardPrompt(jsonObject);\n}\n@@ -220,10 +216,7 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n}\nshowSoftOrHardPrompt(jsonObject);\n} else {\n- //Notification permission is granted\n- if (listener != null) {\n- listener.onPushPermissionResponse(true);\n- }\n+ notifyPushPermissionResult(true);\n}\n}\n@@ -377,17 +370,20 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\n@Override\npublic void onPushPermissionAccept() {\n- final PushPermissionResponseListener listener = callbackManager.getPushPermissionResponseListener();\n- if (listener != null){\n- listener.onPushPermissionResponse(true);\n- }\n+ notifyPushPermissionResult(true);\n}\n@Override\npublic void onPushPermissionDeny() {\n- final PushPermissionResponseListener listener = callbackManager.getPushPermissionResponseListener();\n+ notifyPushPermissionResult(false);\n+ }\n+\n+ //iterates over list of PushPermissionResponseListener to notify the result\n+ public void notifyPushPermissionResult(boolean result) {\n+ for (final PushPermissionResponseListener listener: callbackManager.getPushPermissionResponseListener()) {\nif (listener != null){\n- listener.onPushPermissionResponse(false);\n+ listener.onPushPermissionResponse(result);\n+ }\n}\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": "@@ -148,8 +148,7 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\ninAppNotificationListener = this@HomeScreenActivity\n- pushPermissionNotificationResponseListener = this@HomeScreenActivity\n-\n+ setPushPermissionNotificationResponseListener(this@HomeScreenActivity)\n}\n//With CleverTap Android SDK v3.2.0 you can create additional instances to send data to multiple CleverTap accounts\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-2445): add support to register multiple push primer listeners
116,618
02.12.2022 13:08:00
-19,080
5fabf1139fc8616e12d43c631b4bc978638a6f07
task(SDK-2445): rename internal methods of push primer
[ { "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": "@@ -29,7 +29,7 @@ public abstract class BaseCallbackManager {\npublic abstract InAppNotificationListener getInAppNotificationListener();\n- public abstract List<PushPermissionResponseListener> getPushPermissionResponseListener();\n+ public abstract List<PushPermissionResponseListener> getPushPermissionResponseListenerList();\npublic abstract CTInboxListener getInboxListener();\n@@ -63,7 +63,7 @@ public abstract class BaseCallbackManager {\npublic abstract void setInAppNotificationListener(InAppNotificationListener inAppNotificationListener);\n- public abstract void setPushPermissionResponseListener(PushPermissionResponseListener pushPermissionResponseListener);\n+ public abstract void registerPushPermissionResponseListener(PushPermissionResponseListener pushPermissionResponseListener);\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 final List<PushPermissionResponseListener> pushPermissionResponseListener = new ArrayList<>();\n+ private final List<PushPermissionResponseListener> pushPermissionResponseListenerList = new ArrayList<>();\nprivate CTInboxListener inboxListener;\n@@ -135,8 +135,8 @@ public class CallbackManager extends BaseCallbackManager {\n}\n@Override\n- public List<PushPermissionResponseListener> getPushPermissionResponseListener() {\n- return pushPermissionResponseListener;\n+ public List<PushPermissionResponseListener> getPushPermissionResponseListenerList() {\n+ return pushPermissionResponseListenerList;\n}\n@Override\n@@ -145,8 +145,8 @@ public class CallbackManager extends BaseCallbackManager {\n}\n@Override\n- public void setPushPermissionResponseListener(PushPermissionResponseListener pushPermissionResponseListener) {\n- this.pushPermissionResponseListener.add(pushPermissionResponseListener);\n+ public void registerPushPermissionResponseListener(PushPermissionResponseListener pushPermissionResponseListener) {\n+ this.pushPermissionResponseListenerList.add(pushPermissionResponseListener);\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": "@@ -1637,16 +1637,6 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getCallbackManager().setInAppNotificationListener(inAppNotificationListener);\n}\n- /**\n- * Returns the list of PushPermissionNotificationResponseListener\n- *\n- * @return An {@link PushPermissionResponseListener} object\n- */\n- @SuppressWarnings({\"unused\", \"WeakerAccess\"})\n- public List<PushPermissionResponseListener> getPushPermissionNotificationResponseListener() {\n- return coreState.getCallbackManager().getPushPermissionResponseListener();\n- }\n-\n/**\n* This method sets the PushPermissionNotificationResponseListener\n*\n@@ -1656,7 +1646,7 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\npublic void setPushPermissionNotificationResponseListener(PushPermissionResponseListener\npushPermissionResponseListener) {\ncoreState.getCallbackManager().\n- setPushPermissionResponseListener(pushPermissionResponseListener);\n+ registerPushPermissionResponseListener(pushPermissionResponseListener);\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": "@@ -378,9 +378,9 @@ public class InAppController implements CTInAppNotification.CTInAppNotificationL\nnotifyPushPermissionResult(false);\n}\n- //iterates over list of PushPermissionResponseListener to notify the result\n+ //iterates over the PushPermissionResponseListenerList to notify the result\npublic void notifyPushPermissionResult(boolean result) {\n- for (final PushPermissionResponseListener listener: callbackManager.getPushPermissionResponseListener()) {\n+ for (final PushPermissionResponseListener listener: callbackManager.getPushPermissionResponseListenerList()) {\nif (listener != null){\nlistener.onPushPermissionResponse(result);\n}\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-2445): rename internal methods of push primer
116,618
05.12.2022 09:28:53
-19,080
20202417716de01bf1f1855c25f2ce01025aebc5
task(SDK-2445): expose method to unregister the push primer 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": "@@ -63,6 +63,8 @@ public abstract class BaseCallbackManager {\npublic abstract void setInAppNotificationListener(InAppNotificationListener inAppNotificationListener);\n+ public abstract void unregisterPushPermissionResponseListener(PushPermissionResponseListener pushPermissionResponseListener);\n+\npublic abstract void registerPushPermissionResponseListener(PushPermissionResponseListener pushPermissionResponseListener);\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": "@@ -149,6 +149,11 @@ public class CallbackManager extends BaseCallbackManager {\nthis.pushPermissionResponseListenerList.add(pushPermissionResponseListener);\n}\n+ @Override\n+ public void unregisterPushPermissionResponseListener(PushPermissionResponseListener pushPermissionResponseListener) {\n+ this.pushPermissionResponseListenerList.remove(pushPermissionResponseListener);\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": "@@ -1637,13 +1637,20 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getCallbackManager().setInAppNotificationListener(inAppNotificationListener);\n}\n+ @SuppressWarnings({\"unused\"})\n+ public void unregisterPushPermissionNotificationResponseListener(PushPermissionResponseListener\n+ pushPermissionResponseListener) {\n+ coreState.getCallbackManager().\n+ unregisterPushPermissionResponseListener(pushPermissionResponseListener);\n+ }\n+\n/**\n* This method sets the PushPermissionNotificationResponseListener\n*\n* @param pushPermissionResponseListener An {@link PushPermissionResponseListener} object\n*/\n@SuppressWarnings({\"unused\"})\n- public void setPushPermissionNotificationResponseListener(PushPermissionResponseListener\n+ public void registerPushPermissionNotificationResponseListener(PushPermissionResponseListener\npushPermissionResponseListener) {\ncoreState.getCallbackManager().\nregisterPushPermissionResponseListener(pushPermissionResponseListener);\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-2445): expose method to unregister the push primer listener
116,618
05.12.2022 13:32:56
-19,080
c60b8bffb446ecf942c6901a161c228e068aa3c5
task(SDK-2445): add javadoc comments
[ { "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": "@@ -1637,6 +1637,14 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\ncoreState.getCallbackManager().setInAppNotificationListener(inAppNotificationListener);\n}\n+ /**\n+ * This method unregisters the given instance of the PushPermissionResponseListener if\n+ * previously registered.\n+ * <p>\n+ * Use this method to stop observing the push permission result.\n+ *\n+ * @param pushPermissionResponseListener An {@link PushPermissionResponseListener} object\n+ */\n@SuppressWarnings({\"unused\"})\npublic void unregisterPushPermissionNotificationResponseListener(PushPermissionResponseListener\npushPermissionResponseListener) {\n@@ -1645,7 +1653,13 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n}\n/**\n- * This method sets the PushPermissionNotificationResponseListener\n+ * This method registers the PushPermissionNotificationResponseListener.\n+ * <p>\n+ * Make sure to unregister the listener in onDestroy() or onPause() of the activity/fragment if the\n+ * listener is registered in onCreate() or onResume() respectively.\n+ *<p>\n+ * Use {@link #unregisterPushPermissionNotificationResponseListener(PushPermissionResponseListener)} to unregister\n+ * the listener.\n*\n* @param pushPermissionResponseListener An {@link PushPermissionResponseListener} object\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": "@@ -148,7 +148,7 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\ninAppNotificationListener = this@HomeScreenActivity\n- setPushPermissionNotificationResponseListener(this@HomeScreenActivity)\n+ registerPushPermissionNotificationResponseListener(this@HomeScreenActivity)\n}\n//With CleverTap Android SDK v3.2.0 you can create additional instances to send data to multiple CleverTap accounts\n@@ -281,4 +281,9 @@ class HomeScreenActivity : AppCompatActivity(), CTInboxListener, DisplayUnitList\noverride fun onInAppButtonClick(payload: HashMap<String, String>?) {\nLog.i(TAG, \"onInAppButtonClick() called\")\n}\n+\n+ override fun onDestroy() {\n+ super.onDestroy()\n+ cleverTapDefaultInstance?.unregisterPushPermissionNotificationResponseListener(this)\n+ }\n}\n\\ No newline at end of file\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-2445): add javadoc comments
116,618
05.12.2022 14:04:43
-19,080
e1a7a6365649402388ba43ee8781ed5889146bd2
task(SDK-2445): update javadoc comment
[ { "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": "@@ -1655,11 +1655,9 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n/**\n* This method registers the PushPermissionNotificationResponseListener.\n* <p>\n- * Make sure to unregister the listener in onDestroy() or onPause() of the activity/fragment if the\n- * listener is registered in onCreate() or onResume() respectively.\n- *<p>\n- * Use {@link #unregisterPushPermissionNotificationResponseListener(PushPermissionResponseListener)} to unregister\n- * the listener.\n+ * Use this method only from the onCreate() of the activity/fragment and unregister the\n+ * listener from the the onDestroy() method using the\n+ * {@link #unregisterPushPermissionNotificationResponseListener(PushPermissionResponseListener)}\n*\n* @param pushPermissionResponseListener An {@link PushPermissionResponseListener} object\n*/\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-2445): update javadoc comment
116,618
05.12.2022 14:06:44
-19,080
89e01fddfb18632a1babd4ebec18d2b09df99f88
task(SDK-2445): fix typo in comment
[ { "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": "@@ -1655,8 +1655,8 @@ public class CleverTapAPI implements CTInboxActivity.InboxActivityListener {\n/**\n* This method registers the PushPermissionNotificationResponseListener.\n* <p>\n- * Use this method only from the onCreate() of the activity/fragment and unregister the\n- * listener from the the onDestroy() method using the\n+ * Call this method only from the onCreate() of the activity/fragment and unregister the\n+ * listener from the onDestroy() method using the\n* {@link #unregisterPushPermissionNotificationResponseListener(PushPermissionResponseListener)}\n*\n* @param pushPermissionResponseListener An {@link PushPermissionResponseListener} object\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
task(SDK-2445): fix typo in comment
116,612
05.12.2022 14:43:29
-19,080
64a395f3d0ab6c0a30c63b3c0cbe046c98340cb2
release(SDK-2453) - update changelog and core release version
[ { "change_type": "MODIFY", "old_path": "CHANGELOG.md", "new_path": "CHANGELOG.md", "diff": "## CHANGE LOG.\n+### December 5, 2022\n+* [CleverTap Android SDK v4.7.1](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n+* [CleverTap Push Templates SDK v1.0.7](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTPUSHTEMPLATESCHANGELOG.md)\n+\n### November 1, 2022\n* [CleverTap Android SDK v4.7.0](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n* [CleverTap Geofence SDK v1.2.0](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTGEOFENCECHANGELOG.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.7.0\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.7.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.7.0\", ext: 'aar')\n+ implementation (name: \"clevertap-android-sdk-4.7.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.7.0\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.7.1\"\nimplementation \"androidx.core:core:1.9.0\"\nimplementation \"com.google.firebase:firebase-messaging:23.0.6\"\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.7.1 (December 5, 2022)\n+* Bug fixes and improvements\n+\n### Version 4.7.0 (November 1, 2022)\n* Adds below new public APIs for supporting [Android 13 notification runtime permission](https://developer.android.com/develop/ui/views/notifications/notification-permission)\n* `isPushPermissionGranted()` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#check-the-status-of-notification-permission-whether-its-granted-or-denied)\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.2.0\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.7.0\" // 3.9.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.7.1\" // 3.9.0 and above\nimplementation \"com.google.android.gms:play-services-location:21.0.0\"\nimplementation \"androidx.work:work-runtime:2.7.1\" // 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.7\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.7.0\" // 4.4.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.7.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": "templates/CTCORECHANGELOG.md", "new_path": "templates/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.7.1 (December 5, 2022)\n+* Bug fixes and improvements\n+\n### Version 4.7.0 (November 1, 2022)\n* Adds below new public APIs for supporting [Android 13 notification runtime permission](https://developer.android.com/develop/ui/views/notifications/notification-permission)\n* `isPushPermissionGranted()` [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#check-the-status-of-notification-permission-whether-its-granted-or-denied)\n" }, { "change_type": "MODIFY", "old_path": "versions.properties", "new_path": "versions.properties", "diff": "@@ -285,7 +285,7 @@ version.androidx.work=2.7.1\nversion.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.7.0\n+version.com.clevertap.android..clevertap-android-sdk=4.7.1\nversion.com.clevertap.android..clevertap-geofence-sdk=1.2.0\nversion.com.clevertap.android..clevertap-hms-sdk=1.3.2\nversion.com.clevertap.android..clevertap-xiaomi-sdk=1.5.2\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
release(SDK-2453) - update changelog and core release version
116,616
15.12.2022 11:44:48
-19,080
dff2df0419f2c8cbf66b5c0bdb8efe8d1978b5fd
fix(SDK-2486) - Add activity cast check for `DidClickForHardPermissionListener` initialization
[ { "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": "@@ -6,11 +6,13 @@ import android.net.Uri;\nimport android.os.Bundle;\nimport android.util.TypedValue;\nimport android.view.View;\n+import androidx.annotation.NonNull;\nimport androidx.annotation.Nullable;\nimport androidx.fragment.app.Fragment;\nimport com.clevertap.android.sdk.CleverTapInstanceConfig;\nimport com.clevertap.android.sdk.Constants;\nimport com.clevertap.android.sdk.DidClickForHardPermissionListener;\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@@ -54,9 +56,13 @@ public abstract class CTInAppBaseFragment extends Fragment {\nconfig = bundle.getParcelable(Constants.KEY_CONFIG);\ncurrentOrientation = getResources().getConfiguration().orientation;\ngenerateListener();\n+ /*Initialize the below listener only when in app has InAppNotification activity as their host activity\n+ when requesting permission for notification.*/\n+ if (context instanceof InAppNotificationActivity) {\ndidClickForHardPermissionListener = (DidClickForHardPermissionListener) getActivity();\n}\n}\n+ }\n@Override\npublic void onViewCreated(View view, @Nullable Bundle savedInstanceState) {\n@@ -146,7 +152,8 @@ public abstract class CTInAppBaseFragment extends Fragment {\ndidClick(data, button.getKeyValues());\n- if (index == 0 && inAppNotification.isLocalInApp()) {\n+ if (index == 0 && inAppNotification.isLocalInApp() &&\n+ didClickForHardPermissionListener != null) {\ndidClickForHardPermissionListener.didClickForHardPermissionWithFallbackSettings(\ninAppNotification.fallBackToNotificationSettings());\nreturn;\n@@ -156,7 +163,8 @@ public abstract class CTInAppBaseFragment extends Fragment {\n}\nif (button.getType() != null && button.getType().contains(\n- Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)){\n+ Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)\n+ && didClickForHardPermissionListener != null){\ndidClickForHardPermissionListener.\ndidClickForHardPermissionWithFallbackSettings(button.isFallbackToSettings());\nreturn;\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": "@@ -83,10 +83,12 @@ public class CTInboxListViewFragment extends Fragment {\nupdateInboxMessages();\nif (context instanceof CTInboxActivity) {\nsetListener((CTInboxListViewFragment.InboxListener) getActivity());\n- }\n+ /*Initializes the below listener only when inbox payload has CTInbox activity as their host activity\n+ when requesting permission for notification.*/\ndidClickForHardPermissionListener = (DidClickForHardPermissionListener) getActivity();\n}\n}\n+ }\nprivate void updateInboxMessages(){\nBundle bundle = getArguments();\nif(bundle==null) return;\n@@ -288,7 +290,8 @@ public class CTInboxListViewFragment extends Fragment {\nString isRequestForPermissionStr = inboxMessages.get(position).getInboxMessageContents().\nget(0).getLinktype(jsonObject);\n- if (isRequestForPermissionStr.contains(Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)){\n+ if (isRequestForPermissionStr.contains(Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)\n+ && didClickForHardPermissionListener != null){\nboolean isFallbackSettings = inboxMessages.get(position).\ngetInboxMessageContents().get(0).isFallbackSettingsEnabled(jsonObject);\ndidClickForHardPermissionListener.didClickForHardPermissionWithFallbackSettings(isFallbackSettings);\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
fix(SDK-2486) - Add activity cast check for `DidClickForHardPermissionListener` initialization
116,616
15.12.2022 19:22:27
-19,080
d095665087b9fdb6c12e12f7f69a88c14fcaeacb
chore(SDK-2486) - Update changelogs for release
[ { "change_type": "MODIFY", "old_path": "CHANGELOG.md", "new_path": "CHANGELOG.md", "diff": "## CHANGE LOG.\n+### December 16, 2022\n+* [CleverTap Android SDK v4.7.2](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n+\n### December 5, 2022\n* [CleverTap Android SDK v4.7.1](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n* [CleverTap Push Templates SDK v1.0.7](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTPUSHTEMPLATESCHANGELOG.md)\n" }, { "change_type": "MODIFY", "old_path": "docs/CTCORECHANGELOG.md", "new_path": "docs/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.7.2 (December 16, 2022)\n+* Fixes a crash (`ClassCastException`) in header/footer InApp templates.\n+\n### Version 4.7.1 (December 5, 2022)\n* Fixes ANR on main thread for static initialization of `SimpleDateFormat()`.\n* Add Proguard rules to keep `CREATOR` instance for Parcelable classes to prevent `ClassNotFoundException` when unmarshalling: `androidx.fragment.app.FragmentManagerState`\n* Made calls to `findCTPushProvider()` and `findCustomEnabledPushTypes()` async to prevent ANR when called on main thread.\n* Renames `setPushPermissionNotificationResponseListener(PushPermissionResponseListener)` to `registerPushPermissionNotificationResponseListener(PushPermissionResponseListener)` . Each `PushPermissionResponseListener` instance passed in this method is now maintained in a list of the `PushPermissionResponseListener` type and the Push Primer result is notified to all the elements of this list.\n* Adds `unregisterPushPermissionNotificationResponseListener(PushPermissionResponseListener)` method in `CleverTapAPI` class to unregister the `PushPermissionResponseListener` instance to stop observing the Push Primer result.\n+* Use v4.7.2, this version contains a bug which causes a crash (`ClassCastException`) in header/footer InApp templates.\n### Version 4.7.0 (November 1, 2022)\n* New callback `PushPermissionResponseListener` available which returns after user Allows/Denies notification permission [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#available-callbacks-for-push-primer)\n* From 4.7.0+ existing callback `InAppNotificationListener` will now have `onShow(CTInAppNotification)` method which needs to implemented\n* Minimum Android SDK version bumped to API 19 (Android 4.4)\n+* Use v4.7.2, this version contains a bug which causes a crash (`ClassCastException`) in header/footer InApp templates.\n### Version 4.6.6 (October 31, 2022)\n* Fixes App Inbox bug where an Inbox message's video would not play when new Inbox messages were available\n" }, { "change_type": "MODIFY", "old_path": "docs/CTPUSHTEMPLATESCHANGELOG.md", "new_path": "docs/CTPUSHTEMPLATESCHANGELOG.md", "diff": "### Version 1.0.7 (December 5, 2022)\n* UI bug fixes for Non-linear Product Catalogue template.\n+* Supports CleverTap Android SDK v4.7.2.\n### Version 1.0.6 (November 1, 2022)\n* Targets Android 13\n" }, { "change_type": "MODIFY", "old_path": "templates/CTCORECHANGELOG.md", "new_path": "templates/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.7.2 (December 16, 2022)\n+* Fixes a crash (`ClassCastException`) in header/footer InApp templates.\n+\n### Version 4.7.1 (December 5, 2022)\n* Fixes ANR on main thread for static initialization of `SimpleDateFormat()`.\n* Add Proguard rules to keep `CREATOR` instance for Parcelable classes to prevent `ClassNotFoundException` when unmarshalling: `androidx.fragment.app.FragmentManagerState`\n* Made calls to `findCTPushProvider()` and `findCustomEnabledPushTypes()` async to prevent ANR when called on main thread.\n* Renames `setPushPermissionNotificationResponseListener(PushPermissionResponseListener)` to `registerPushPermissionNotificationResponseListener(PushPermissionResponseListener)` . Each `PushPermissionResponseListener` instance passed in this method is now maintained in a list of the `PushPermissionResponseListener` type and the Push Primer result is notified to all the elements of this list.\n* Adds `unregisterPushPermissionNotificationResponseListener(PushPermissionResponseListener)` method in `CleverTapAPI` class to unregister the `PushPermissionResponseListener` instance to stop observing the Push Primer result.\n+* Use v4.7.2, this version contains a bug which causes a crash (`ClassCastException`) in header/footer InApp templates.\n### Version 4.7.0 (November 1, 2022)\n* New callback `PushPermissionResponseListener` available which returns after user Allows/Denies notification permission [Usage can be found here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/EXAMPLES.md#available-callbacks-for-push-primer)\n* From 4.7.0+ existing callback `InAppNotificationListener` will now have `onShow(CTInAppNotification)` method which needs to implemented\n* Minimum Android SDK version bumped to API 19 (Android 4.4)\n+* Use v4.7.2, this version contains a bug which causes a crash (`ClassCastException`) in header/footer InApp templates.\n### Version 4.6.6 (October 31, 2022)\n* Fixes App Inbox bug where an Inbox message's video would not play when new Inbox messages were available\n" }, { "change_type": "MODIFY", "old_path": "templates/CTPUSHTEMPLATESCHANGELOG.md", "new_path": "templates/CTPUSHTEMPLATESCHANGELOG.md", "diff": "### Version 1.0.7 (December 5, 2022)\n* UI bug fixes for Non-linear Product Catalogue template.\n+* Supports CleverTap Android SDK v4.7.2.\n### Version 1.0.6 (November 1, 2022)\n* Targets Android 13\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
chore(SDK-2486) - Update changelogs for release
116,616
16.12.2022 12:52:05
-19,080
6835ab288481803f7409ddf5f347861236b631d6
fix(SDK-2486) - Add `context` instead of `getActivity()` for `DidClickForHardPermissionListener` initialisation, replace `activity` cast with `DidClickForHardPermissionListener`
[ { "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": "@@ -58,8 +58,8 @@ public abstract class CTInAppBaseFragment extends Fragment {\ngenerateListener();\n/*Initialize the below listener only when in app has InAppNotification activity as their host activity\nwhen requesting permission for notification.*/\n- if (context instanceof InAppNotificationActivity) {\n- didClickForHardPermissionListener = (DidClickForHardPermissionListener) getActivity();\n+ if (context instanceof DidClickForHardPermissionListener) {\n+ didClickForHardPermissionListener = (DidClickForHardPermissionListener) context;\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": "@@ -83,9 +83,11 @@ public class CTInboxListViewFragment extends Fragment {\nupdateInboxMessages();\nif (context instanceof CTInboxActivity) {\nsetListener((CTInboxListViewFragment.InboxListener) getActivity());\n+ }\n/*Initializes the below listener only when inbox payload has CTInbox activity as their host activity\nwhen requesting permission for notification.*/\n- didClickForHardPermissionListener = (DidClickForHardPermissionListener) getActivity();\n+ if (context instanceof DidClickForHardPermissionListener) {\n+ didClickForHardPermissionListener = (DidClickForHardPermissionListener) context;\n}\n}\n}\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
fix(SDK-2486) - Add `context` instead of `getActivity()` for `DidClickForHardPermissionListener` initialisation, replace `activity` cast with `DidClickForHardPermissionListener`
116,616
16.12.2022 12:54:23
-19,080
c26e5747556865527664c461e6de288be9dd6b5f
chore(SDK-2486) - Update core version to 4.7.2
[ { "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.7.1\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.7.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.7.1\", ext: 'aar')\n+ implementation (name: \"clevertap-android-sdk-4.7.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.7.1\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.7.2\"\nimplementation \"androidx.core:core:1.9.0\"\nimplementation \"com.google.firebase:firebase-messaging:23.0.6\"\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/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.2.0\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.7.1\" // 3.9.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.7.2\" // 3.9.0 and above\nimplementation \"com.google.android.gms:play-services-location:21.0.0\"\nimplementation \"androidx.work:work-runtime:2.7.1\" // 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.7\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.7.1\" // 4.4.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.7.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": "versions.properties", "new_path": "versions.properties", "diff": "@@ -285,7 +285,7 @@ version.androidx.work=2.7.1\nversion.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.7.1\n+version.com.clevertap.android..clevertap-android-sdk=4.7.2\nversion.com.clevertap.android..clevertap-geofence-sdk=1.2.0\nversion.com.clevertap.android..clevertap-hms-sdk=1.3.2\nversion.com.clevertap.android..clevertap-xiaomi-sdk=1.5.2\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
chore(SDK-2486) - Update core version to 4.7.2
116,612
20.12.2022 13:40:12
-19,080
78405514fb20db9153e07b7d311178b54aafdbdb
fix(push) - add utility to check if notification channel is enabled
[ { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTXtensions.kt", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/CTXtensions.kt", "diff": "package com.clevertap.android.sdk\n+import android.app.NotificationManager\nimport android.content.Context\n+import android.content.Context.NOTIFICATION_SERVICE\nimport android.os.Build.VERSION\n+import android.os.Build.VERSION_CODES\n+import androidx.core.app.NotificationManagerCompat\nfun Context.isPackageAndOsTargetsAbove(apiLevel: Int) =\nVERSION.SDK_INT > apiLevel && targetSdkVersion > apiLevel\nval Context.targetSdkVersion\nget() = applicationContext.applicationInfo.targetSdkVersion\n+\n+fun Context.isNotificationChannelEnabled(channelId: String): Boolean =\n+ if (VERSION.SDK_INT >= VERSION_CODES.O) {\n+ areAppNotificationsEnabled() && try {\n+ val nm = getSystemService(NOTIFICATION_SERVICE) as NotificationManager\n+ nm.getNotificationChannel(channelId).importance != NotificationManager.IMPORTANCE_NONE\n+ } catch (e: Exception) {\n+ Logger.d(\"Unable to find notification channel with id = $channelId\")\n+ false\n+ }\n+ } else {\n+ areAppNotificationsEnabled()\n+ }\n+\n+fun Context.areAppNotificationsEnabled() = NotificationManagerCompat.from(this).areNotificationsEnabled()\n\\ No newline at end of file\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
fix(push) - add utility to check if notification channel is enabled SDK-2444
116,612
20.12.2022 13:50:35
-19,080
fba15866055a7009a20ef45ff38c2eca5bbc5cb1
fix(push) - avoid triggerNotification() if channel is disabled
[ { "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": "@@ -3,6 +3,7 @@ package com.clevertap.android.sdk.pushnotification;\nimport static android.content.Context.JOB_SCHEDULER_SERVICE;\nimport static android.content.Context.NOTIFICATION_SERVICE;\nimport static com.clevertap.android.sdk.BuildConfig.VERSION_CODE;\n+import static com.clevertap.android.sdk.CTXtensions.isNotificationChannelEnabled;\nimport static com.clevertap.android.sdk.pushnotification.PushNotificationUtil.getPushTypes;\nimport android.annotation.SuppressLint;\n@@ -88,6 +89,7 @@ public class PushProviders implements CTPushProviderListener {\nprivate final ValidationResultStack validationResultStack;\nprivate final Object tokenLock = new Object();\n+\nprivate final Object pushRenderingLock = new Object();\nprivate DevicePushTokenRefreshListener tokenRefreshListener;\n@@ -190,6 +192,13 @@ public class PushProviders implements CTPushProviderListener {\nreturn;\n}\n}\n+ if (!isNotificationChannelEnabled(context, extras.getString(Constants.WZRK_CHANNEL_ID, \"\"))) {\n+ config.getLogger()\n+ .verbose(config.getAccountId(),\n+ \"Not rendering push notification as channel = \" + extras.getString(\n+ Constants.WZRK_CHANNEL_ID, \"\") + \" is blocked by user\");\n+ return;\n+ }\nString notifTitle = iNotificationRenderer.getTitle(extras,\ncontext);//extras.getString(Constants.NOTIF_TITLE, \"\");// uncommon - getTitle()\nnotifTitle = notifTitle.isEmpty() ? context.getApplicationInfo().name\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
fix(push) - avoid triggerNotification() if channel is disabled SDK-2444
116,612
20.12.2022 13:54:18
-19,080
01f57d0b393b4630395aee660d99885b6aa09769
fix(push) - add unit tests for isNotificationChannelEnabled()
[ { "change_type": "MODIFY", "old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CTXtensionsTest.kt", "new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/CTXtensionsTest.kt", "diff": "package com.clevertap.android.sdk\n+import android.app.NotificationChannel\n+import android.app.NotificationManager\n+import android.content.Context\nimport android.os.Build.VERSION\nimport com.clevertap.android.shared.test.BaseTestCase\nimport org.junit.*\nimport org.junit.runner.*\n+import org.mockito.Mockito.*\nimport org.robolectric.RobolectricTestRunner\n+import org.robolectric.Shadows.shadowOf\nimport org.robolectric.util.ReflectionHelpers\nimport kotlin.test.assertFalse\nimport kotlin.test.assertTrue\n@@ -47,4 +52,66 @@ class CTXtensionsTest : BaseTestCase() {\nassertFalse { application.isPackageAndOsTargetsAbove(32) }\n}\n+\n+ @Test\n+ fun test_isNotificationChannelEnabled_when_sdkInt_is_30_and_notificationsAreEnabled_and_channelImportanceIsNone_should_return_false() {\n+\n+ configureTestNotificationChannel(NotificationManager.IMPORTANCE_NONE, true, 30)\n+ val actual = application.isNotificationChannelEnabled(\"BlockedBRTesting\")\n+ assertFalse { actual }\n+ }\n+\n+ @Test\n+ fun test_isNotificationChannelEnabled_when_sdkInt_is_30_and_notificationsAreEnabled_and_channelImportanceIsMAX_should_return_true() {\n+\n+ configureTestNotificationChannel(NotificationManager.IMPORTANCE_MAX, true, 30)\n+ val actual = application.isNotificationChannelEnabled(\"BlockedBRTesting\")\n+ assertTrue { actual }\n+ }\n+\n+ @Test\n+ fun test_isNotificationChannelEnabled_when_sdkInt_is_30_and_notificationsAreDisabled_and_channelImportanceIsNone_should_return_false() {\n+ configureTestNotificationChannel(NotificationManager.IMPORTANCE_NONE, false, 30)\n+\n+ val actual = application.isNotificationChannelEnabled(\"BlockedBRTesting\")\n+ assertFalse { actual }\n+ }\n+\n+ @Test\n+ fun test_isNotificationChannelEnabled_when_sdkInt_is_30_and_notificationsAreDisabled_and_channelImportanceIsMAX_should_return_false() {\n+ configureTestNotificationChannel(NotificationManager.IMPORTANCE_MAX, false, 30)\n+\n+ val actual = application.isNotificationChannelEnabled(\"BlockedBRTesting\")\n+ assertFalse { actual }\n+ }\n+\n+ @Test\n+ fun test_isNotificationChannelEnabled_when_sdkInt_is_25_and_notificationsAreDisabled_should_return_false() {\n+ configureTestNotificationChannel(NotificationManager.IMPORTANCE_MAX, false, 25)\n+\n+ val actual = application.isNotificationChannelEnabled(\"BlockedBRTesting\")\n+ assertFalse { actual }\n+ }\n+\n+ @Test\n+ fun test_isNotificationChannelEnabled_when_sdkInt_is_25_and_notificationsAreEnabled_should_return_true() {\n+ configureTestNotificationChannel(NotificationManager.IMPORTANCE_MAX, true, 25)\n+\n+ val actual = application.isNotificationChannelEnabled(\"BlockedBRTesting\")\n+ assertTrue { actual }\n+ }\n+\n+ private fun configureTestNotificationChannel(importance: Int, areChannelsEnabled: Boolean, SDK_INT: Int) {\n+ val nm = application.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager\n+ val shadowNotificationManager = shadowOf(nm)\n+ shadowNotificationManager.setNotificationsEnabled(areChannelsEnabled)\n+ val notificationChannel = NotificationChannel(\n+ \"BlockedBRTesting\",\n+ \"BlockedBRTesting\",\n+ importance\n+ )\n+ notificationChannel.description = \"channelDescription\"\n+ nm.createNotificationChannel(notificationChannel)\n+ ReflectionHelpers.setStaticField(VERSION::class.java, \"SDK_INT\", SDK_INT)\n+ }\n}\n\\ No newline at end of file\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
fix(push) - add unit tests for isNotificationChannelEnabled() SDK-2444
116,612
20.12.2022 13:56:26
-19,080
578fb8d681fde26da48f7887340133f0a4ab03bb
fix(push) - update sample for automation testing
[ { "change_type": "MODIFY", "old_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt", "new_path": "sample/src/main/java/com/clevertap/demo/MyApplication.kt", "diff": "@@ -98,6 +98,10 @@ class MyApplication : MultiDexApplication(), CTPushNotificationListener, Activit\nthis, \"PTTesting\", \"Push templates\",\n\"All push templates\", NotificationManager.IMPORTANCE_MAX, true\n)\n+ CleverTapAPI.createNotificationChannel(\n+ this, \"BlockBRTesting\", \"Blocked Core\",\n+ \"Blocked Core notifications\", NotificationManager.IMPORTANCE_NONE, true\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": "@@ -8,7 +8,7 @@ import com.clevertap.android.sdk.CTInboxStyleConfig\nimport com.clevertap.android.sdk.CleverTapAPI\nimport com.clevertap.android.sdk.Constants\nimport com.clevertap.android.sdk.inapp.CTLocalInApp\n-import java.util.*\n+import java.util.Date\nclass HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel() {\n@@ -23,6 +23,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nwhen (commandPosition) {\n\"00\" -> {\ncleverTapAPI?.pushEvent(\"testEventPushAmp\")\n+ cleverTapAPI?.pushEvent(\"BlockBRTesting\")\n}\n\"01\" -> {\n//Record an event with properties\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
fix(push) - update sample for automation testing SDK-2444
116,616
23.01.2023 11:10:35
-19,080
8765f5a70bafc9f342bf5cd3b3f3a4a284fcc242
fix(SDK-2603) - Add fix for `jsonObj` NPE on inbox list message click.
[ { "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": "@@ -66,11 +66,11 @@ class CTInboxButtonClickListener implements View.OnClickListener {\n}\n}\n- fragment.handleClick(this.position, buttonText, buttonObject, getKeyValues(inboxMessage),isBodyClick);\n+ fragment.handleClick(this.position, buttonText, buttonObject, getKeyValues(inboxMessage));\n}\n} else {\nif (fragment != null) {\n- fragment.handleClick(this.position, null, null, null,isBodyClick);\n+ fragment.handleClick(this.position, null, null, null);\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": "@@ -273,7 +273,9 @@ public class CTInboxListViewFragment extends Fragment {\nthis.mediaRecyclerView = mediaRecyclerView;\n}\n- void handleClick(int position, String buttonText, JSONObject jsonObject, HashMap<String, String> keyValuePayload, boolean isInboxMessageBodyClick) {\n+ void handleClick(int position, String buttonText, JSONObject jsonObject, HashMap<String, String> keyValuePayload) {\n+ boolean isInboxMessageBodyClick = jsonObject != null;\n+\ntry {\nBundle data = new Bundle();\nJSONObject wzrkParams = inboxMessages.get(position).getWzrkParams();\n@@ -290,6 +292,8 @@ public class CTInboxListViewFragment extends Fragment {\n}\ndidClick(data, position, keyValuePayload,isInboxMessageBodyClick);\n+ boolean isKVButton = keyValuePayload != null && !keyValuePayload.isEmpty();\n+ if (isInboxMessageBodyClick) {\nString isRequestForPermissionStr = inboxMessages.get(position).getInboxMessageContents().\nget(0).getLinktype(jsonObject);\nif (isRequestForPermissionStr.contains(Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)\n@@ -300,8 +304,6 @@ public class CTInboxListViewFragment extends Fragment {\nreturn;\n}\n- boolean isKVButton = keyValuePayload != null && !keyValuePayload.isEmpty();\n- if (jsonObject != null) {\nif (isKVButton || inboxMessages.get(position).getInboxMessageContents().get(0).getLinktype(jsonObject)\n.equalsIgnoreCase(Constants.COPY_TYPE)) {\n//noinspection UnnecessaryReturnStatement\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
fix(SDK-2603) - Add fix for `jsonObj` NPE on inbox list message click.
116,612
23.01.2023 16:27:01
-19,080
01dcb347648072444f6b999470aa21ee7ea2486d
chore(SDK-2615) - add docs and changelog for renderMAX
[ { "change_type": "MODIFY", "old_path": "build.gradle", "new_path": "build.gradle", "diff": "@@ -55,6 +55,7 @@ task copyTemplates {\nfile(\"versions.properties\").withInputStream { props.load(it) }\noutputs.upToDateWhen { false }\nprops.put(\"clevertap_android_sdk\",Libs.clevertap_android_sdk.dropRight(1))\n+ props.put(\"clevertap_rendermax_sdk\", Libs.clevertap_rendermax_sdk.dropRight(1))\nprops.put(\"clevertap_geofence_sdk\",Libs.clevertap_geofence_sdk.dropRight(1))\nprops.put(\"clevertap_hms_sdk\",Libs.clevertap_hms_sdk.dropRight(1))\nprops.put(\"clevertap_xiaomi_sdk\",Libs.clevertap_xiaomi_sdk.dropRight(1))\n" }, { "change_type": "MODIFY", "old_path": "buildSrc/src/main/kotlin/Libs.kt", "new_path": "buildSrc/src/main/kotlin/Libs.kt", "diff": "@@ -75,6 +75,8 @@ object Libs {\nconst val clevertap_android_sdk: String = \"com.clevertap.android:clevertap-android-sdk:_\"\n+ const val clevertap_rendermax_sdk: String = \"com.clevertap.android:clevertap-rendermax-sdk:_\"\n+\nconst val clevertap_geofence_sdk: String = \"com.clevertap.android:clevertap-geofence-sdk:_\"\nconst val clevertap_hms_sdk: String = \"com.clevertap.android:clevertap-hms-sdk:_\"\n" }, { "change_type": "ADD", "old_path": null, "new_path": "docs/CTRENDERMAX.md", "diff": "+<p align=\"center\">\n+ <img src=\"https://github.com/CleverTap/clevertap-ios-sdk/blob/master/docs/images/clevertap-logo.png\" height=\"220\"/>\n+</p>\n+\n+# RenderMax by CleverTap\n+\n+RenderMax Push Delivery delivers and renders notifications on the user's device even if the FCM delivery fails or the device is optimized for battery consumption.\n+\n+# Table of contents\n+\n+- [Installation](#installation)\n+- [Developer Notes](#developer-notes)\n+- [Proguard](#proguard)\n+- [Changelog](#changelog)\n+\n+# Installation\n+\n+[(Back to top)](#table-of-contents)\n+\n+To use CleverTap's RenderMax Push Delivery with your app, add the following code snippet in the `build.gradle` of the app.\n+\n+```groovy\n+ dependencies {\n+ implementation \"com.clevertap.android:clevertap-rendermax-sdk:1.0.2\"\n+ }\n+```\n+\n+# Developer Notes\n+\n+[(Back to top)](#table-of-contents)\n+\n+* The RenderMax Push SDK is supported for Android SDK `v4.6.6`, React Native SDK `v0.9.3`, and above.\n+* If the app is custom rendering the push notification and not passing the payload to CleverTap SDK, add the following code before you render the notification:\n+\n+ ```\n+ CleverTapAPI.processPushNotification(getApplicationContext(),extras);\n+ ```\n+\n+# Proguard\n+\n+[(Back to top)](#table-of-contents)\n+\n+RenderMax push SDK is distributed as obfuscated package and for it's smooth working with proguard you must add necessary rules.\n+The Good News is that, Proguard rules for renderMAX is provided out of the box through `consumer-rules.pro` which gets merged with App's proguard rule so you don't have to do anything here.\n+Thanks to `consumer-rules.pro`. You can check renderMAX proguard rules in your `/build/outputs/mapping/configuration.txt` by searching rendermax keyword.\n+\n+# Changelog\n+\n+[(Back to top)](#table-of-contents)\n+\n+ChangeLog can be found [here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTRENDERMAXCHANGELOG.md)\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "templates/CTRENDERMAX.md", "diff": "+<p align=\"center\">\n+ <img src=\"https://github.com/CleverTap/clevertap-ios-sdk/blob/master/docs/images/clevertap-logo.png\" height=\"220\"/>\n+</p>\n+\n+# RenderMax by CleverTap\n+\n+RenderMax Push Delivery delivers and renders notifications on the user's device even if the FCM delivery fails or the device is optimized for battery consumption.\n+\n+# Table of contents\n+\n+- [Installation](#installation)\n+- [Developer Notes](#developer-notes)\n+- [Proguard](#proguard)\n+- [Changelog](#changelog)\n+\n+# Installation\n+\n+[(Back to top)](#table-of-contents)\n+\n+To use CleverTap's RenderMax Push Delivery with your app, add the following code snippet in the `build.gradle` of the app.\n+\n+```groovy\n+ dependencies {\n+ implementation \"${ext.clevertap_rendermax_sdk}${ext['version.com.clevertap.android..clevertap-rendermax-sdk']}\"\n+ }\n+```\n+\n+# Developer Notes\n+\n+[(Back to top)](#table-of-contents)\n+\n+* The RenderMax Push SDK is supported for Android SDK `v4.6.6`, React Native SDK `v0.9.3`, and above.\n+* If the app is custom rendering the push notification and not passing the payload to CleverTap SDK, add the following code before you render the notification:\n+\n+ ```\n+ CleverTapAPI.processPushNotification(getApplicationContext(),extras);\n+ ```\n+\n+# Proguard\n+\n+[(Back to top)](#table-of-contents)\n+\n+RenderMax push SDK is distributed as obfuscated package and for it's smooth working with proguard you must add necessary rules.\n+The Good News is that, Proguard rules for renderMAX is provided out of the box through `consumer-rules.pro` which gets merged with App's proguard rule so you don't have to do anything here.\n+Thanks to `consumer-rules.pro`. You can check renderMAX proguard rules in your `/build/outputs/mapping/configuration.txt` by searching rendermax keyword.\n+\n+# Changelog\n+\n+[(Back to top)](#table-of-contents)\n+\n+ChangeLog can be found [here](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTRENDERMAXCHANGELOG.md)\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "versions.properties", "new_path": "versions.properties", "diff": "@@ -286,6 +286,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\nversion.com.clevertap.android..clevertap-android-sdk=4.7.2\n+version.com.clevertap.android..clevertap-rendermax-sdk=1.0.2\nversion.com.clevertap.android..clevertap-geofence-sdk=1.2.0\nversion.com.clevertap.android..clevertap-hms-sdk=1.3.2\nversion.com.clevertap.android..clevertap-xiaomi-sdk=1.5.2\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
chore(SDK-2615) - add docs and changelog for renderMAX
116,616
23.01.2023 19:04:50
-19,080
1c3192b6822202abc8e4dcbf1af6a8545f020489
chore(SDK-2603) - Refactor `handleClick()` method
[ { "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": "@@ -274,7 +274,7 @@ public class CTInboxListViewFragment extends Fragment {\n}\nvoid handleClick(int position, String buttonText, JSONObject jsonObject, HashMap<String, String> keyValuePayload) {\n- boolean isInboxMessageBodyClick = jsonObject != null;\n+ boolean isInboxMessageButtonClick = jsonObject != null;\ntry {\nBundle data = new Bundle();\n@@ -290,10 +290,10 @@ public class CTInboxListViewFragment extends Fragment {\nif (buttonText != null && !buttonText.isEmpty()) {\ndata.putString(\"wzrk_c2a\", buttonText);\n}\n- didClick(data, position, keyValuePayload,isInboxMessageBodyClick);\n+ didClick(data, position, keyValuePayload,isInboxMessageButtonClick);\nboolean isKVButton = keyValuePayload != null && !keyValuePayload.isEmpty();\n- if (isInboxMessageBodyClick) {\n+ if (isInboxMessageButtonClick) {\nString isRequestForPermissionStr = inboxMessages.get(position).getInboxMessageContents().\nget(0).getLinktype(jsonObject);\nif (isRequestForPermissionStr.contains(Constants.KEY_REQUEST_FOR_NOTIFICATION_PERMISSION)\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
chore(SDK-2603) - Refactor `handleClick()` method
116,616
23.01.2023 19:05:23
-19,080
18cdcf276aed5815c320099bb6939d6ca68d40ce
fix(SDK-2603) - Add unit tests for `handleClick()`
[ { "change_type": "ADD", "old_path": null, "new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/inbox/CTInboxListViewFragmentTest.kt", "diff": "+package com.clevertap.android.sdk.inbox\n+\n+import com.clevertap.android.shared.test.BaseTestCase\n+import org.json.JSONObject\n+import org.junit.Test\n+import org.junit.runner.RunWith\n+import org.mockito.Mockito\n+import org.mockito.Mockito.verify\n+import org.robolectric.RobolectricTestRunner\n+\n+@RunWith(RobolectricTestRunner::class)\n+class CTInboxListViewFragmentTest : BaseTestCase() {\n+\n+ private lateinit var ctInboxListViewFragment: CTInboxListViewFragment\n+ private lateinit var ctInboxListViewFragmentSpy: CTInboxListViewFragment\n+\n+ @Throws(Exception::class)\n+ override fun setUp() {\n+ super.setUp()\n+\n+ ctInboxListViewFragment = CTInboxListViewFragment()\n+ ctInboxListViewFragmentSpy = Mockito.spy(ctInboxListViewFragment)\n+ }\n+\n+ @Test\n+ fun test_handleClick_when_buttonText_is_empty_fires_url_through_intent(){\n+\n+ val position = 0\n+ val buttonTxt = \"\"\n+ val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n+ \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n+ \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n+ \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n+ \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n+ \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n+ \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n+ \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n+ \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n+ \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\n+\n+ val buttonJsonObj = JSONObject(\"{\\\"type\\\":\\\"url\\\",\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\" +\n+ \"\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}\")\n+\n+ val keyValuePayload = HashMap<String,String>()\n+ ctInboxListViewFragmentSpy.inboxMessages.add(CTInboxMessage(jsonObj))\n+\n+ //Act\n+ ctInboxListViewFragmentSpy.handleClick(position,buttonTxt,buttonJsonObj,keyValuePayload)\n+\n+ //Assert\n+ verify(ctInboxListViewFragmentSpy,Mockito.atLeastOnce()).\n+ fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ }\n+\n+ @Test\n+ fun test_handleClick_when_buttonText_is_null_fires_url_through_intent(){\n+\n+ val position = 0\n+ val buttonTxt = null\n+ val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n+ \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n+ \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n+ \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n+ \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n+ \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n+ \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n+ \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n+ \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n+ \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\n+\n+ val buttonJsonObj = JSONObject(\"{\\\"type\\\":\\\"url\\\",\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\" +\n+ \"\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}\")\n+\n+ val keyValuePayload = HashMap<String,String>()\n+ ctInboxListViewFragmentSpy.inboxMessages.add(CTInboxMessage(jsonObj))\n+\n+ //Act\n+ ctInboxListViewFragmentSpy.handleClick(position,buttonTxt,buttonJsonObj,keyValuePayload)\n+\n+ //Assert\n+ verify(ctInboxListViewFragmentSpy,Mockito.atLeastOnce()).\n+ fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ }\n+\n+ @Test\n+ fun test_handleClick_when_buttonText_is_present_fires_url_through_intent(){\n+\n+ val position = 0\n+ val buttonTxt = \"ClickHere\"\n+ val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n+ \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n+ \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n+ \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n+ \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n+ \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n+ \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n+ \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n+ \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n+ \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\n+\n+ val buttonJsonObj = JSONObject(\"{\\\"type\\\":\\\"url\\\",\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\" +\n+ \"\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}\")\n+\n+ val keyValuePayload = HashMap<String,String>()\n+ ctInboxListViewFragmentSpy.inboxMessages.add(CTInboxMessage(jsonObj))\n+\n+ //Act\n+ ctInboxListViewFragmentSpy.handleClick(position,buttonTxt,buttonJsonObj,keyValuePayload)\n+\n+ //Assert\n+ verify(ctInboxListViewFragmentSpy,Mockito.atLeastOnce()).\n+ fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ }\n+\n+ @Test\n+ fun test_handleClick_when_buttonJsonObj_is_null_fires_url_through_intent(){\n+\n+ val position = 0\n+ val buttonTxt = \"ClickHere\"\n+ val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n+ \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n+ \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n+ \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n+ \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n+ \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n+ \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n+ \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n+ \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n+ \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\n+\n+ val buttonJsonObj = null\n+\n+ val keyValuePayload = HashMap<String,String>()\n+ ctInboxListViewFragmentSpy.inboxMessages.add(CTInboxMessage(jsonObj))\n+\n+ //Act\n+ ctInboxListViewFragmentSpy.handleClick(position,buttonTxt,buttonJsonObj,keyValuePayload)\n+\n+ //Assert\n+ verify(ctInboxListViewFragmentSpy,Mockito.atLeastOnce()).\n+ fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ }\n+\n+ @Test\n+ fun test_handleClick_when_buttonJsonObj_is_present_fires_url_through_intent(){\n+\n+ val position = 0\n+ val buttonTxt = \"ClickHere\"\n+ val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n+ \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n+ \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n+ \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n+ \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n+ \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n+ \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n+ \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n+ \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n+ \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\n+\n+ val buttonJsonObj = JSONObject(\"{\\\"type\\\":\\\"url\\\",\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\" +\n+ \"\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}\")\n+\n+ val keyValuePayload = HashMap<String,String>()\n+ ctInboxListViewFragmentSpy.inboxMessages.add(CTInboxMessage(jsonObj))\n+\n+ //Act\n+ ctInboxListViewFragmentSpy.handleClick(position,buttonTxt,buttonJsonObj,keyValuePayload)\n+\n+ //Assert\n+ verify(ctInboxListViewFragmentSpy,Mockito.atLeastOnce()).\n+ fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ }\n+\n+ @Test\n+ fun test_handleClick_when_keyValuePayload_is_empty_fires_url_through_intent(){\n+\n+ val position = 0\n+ val buttonTxt = \"ClickHere\"\n+ val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n+ \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n+ \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n+ \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n+ \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n+ \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n+ \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n+ \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n+ \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n+ \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\n+\n+ val buttonJsonObj = JSONObject(\"{\\\"type\\\":\\\"url\\\",\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\" +\n+ \"\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}\")\n+\n+ val keyValuePayload = HashMap<String,String>()\n+ ctInboxListViewFragmentSpy.inboxMessages.add(CTInboxMessage(jsonObj))\n+\n+ //Act\n+ ctInboxListViewFragmentSpy.handleClick(position,buttonTxt,buttonJsonObj,keyValuePayload)\n+\n+ //Assert\n+ verify(ctInboxListViewFragmentSpy,Mockito.atLeastOnce()).\n+ fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ }\n+\n+ @Test\n+ fun test_handleClick_when_keyValuePayload_is_null_fires_url_through_intent(){\n+\n+ val position = 0\n+ val buttonTxt = \"ClickHere\"\n+ val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n+ \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n+ \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n+ \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n+ \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n+ \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n+ \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n+ \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n+ \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n+ \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\n+\n+ val buttonJsonObj = JSONObject(\"{\\\"type\\\":\\\"url\\\",\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\" +\n+ \"\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}\")\n+\n+ val keyValuePayload = null\n+ ctInboxListViewFragmentSpy.inboxMessages.add(CTInboxMessage(jsonObj))\n+\n+ //Act\n+ ctInboxListViewFragmentSpy.handleClick(position,buttonTxt,buttonJsonObj,keyValuePayload)\n+\n+ //Assert\n+ verify(ctInboxListViewFragmentSpy,Mockito.atLeastOnce()).\n+ fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ }\n+\n+ @Test\n+ fun test_handleClick_when_keyValuePayload_is_present_do_nothing(){\n+\n+ val position = 0\n+ val buttonTxt = \"ClickHere\"\n+ val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n+ \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n+ \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n+ \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n+ \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n+ \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n+ \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n+ \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n+ \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n+ \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\n+\n+ val buttonJsonObj = JSONObject(\"{\\\"type\\\":\\\"url\\\",\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\" +\n+ \"\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n+ \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n+ \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}\")\n+\n+ val keyValuePayload = HashMap<String,String>()\n+ keyValuePayload[\"id\"] = \"123456\"\n+ ctInboxListViewFragmentSpy.inboxMessages.add(CTInboxMessage(jsonObj))\n+\n+ //Act\n+ ctInboxListViewFragmentSpy.handleClick(position,buttonTxt,buttonJsonObj,keyValuePayload)\n+\n+ //Assert\n+ verify(ctInboxListViewFragmentSpy,Mockito.never()).\n+ fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ }\n+}\n\\ No newline at end of file\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
fix(SDK-2603) - Add unit tests for `handleClick()`
116,616
23.01.2023 19:14:57
-19,080
cc1f544587421b245bed63c6bd1c2a763e6fce65
chore(SDK-2603) - Update CTCORECHANGELOG.md
[ { "change_type": "MODIFY", "old_path": "docs/CTCORECHANGELOG.md", "new_path": "docs/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.7.3 (xx, 2023)\n+* Fixes NPE when clicked on body of InboxMessage with deep link in `CTInboxListFragment`\n+\n### Version 4.7.2 (December 16, 2022)\n* Fixes a crash (`ClassCastException`) in header/footer InApp templates.\n" }, { "change_type": "MODIFY", "old_path": "templates/CTCORECHANGELOG.md", "new_path": "templates/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.7.3 (xx, 2023)\n+* Fixes NPE when clicked on body of InboxMessage with deep link in `CTInboxListFragment`\n+\n### Version 4.7.2 (December 16, 2022)\n* Fixes a crash (`ClassCastException`) in header/footer InApp templates.\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
chore(SDK-2603) - Update CTCORECHANGELOG.md
116,616
25.01.2023 15:30:19
-19,080
96015d4cc6fcb179f976323d7a1f15d5ad35c085
chore(SDK-2603) - Update CTCORECHANGELOG.md and CHANGELOG.md
[ { "change_type": "MODIFY", "old_path": "CHANGELOG.md", "new_path": "CHANGELOG.md", "diff": "## CHANGE LOG.\n+### January 23, 2023\n+* [CleverTap Android SDK v4.7.3](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n+*\n### December 16, 2022\n* [CleverTap Android SDK v4.7.2](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.7.3 (xx, 2023)\n+### Version 4.7.3 (January 23, 2023)\n+* Fixes message UI for footer in-app.\n* Fixes NPE when clicked on body of InboxMessage with deep link in `CTInboxListFragment`\n+* Other bug fixes and performance improvements.\n### Version 4.7.2 (December 16, 2022)\n* Fixes a crash (`ClassCastException`) in header/footer InApp templates.\n" }, { "change_type": "MODIFY", "old_path": "templates/CTCORECHANGELOG.md", "new_path": "templates/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n-### Version 4.7.3 (xx, 2023)\n+### Version 4.7.3 (January 23, 2023)\n+* Fixes message UI for footer in-app.\n* Fixes NPE when clicked on body of InboxMessage with deep link in `CTInboxListFragment`\n+* Other bug fixes and performance improvements.\n### Version 4.7.2 (December 16, 2022)\n* Fixes a crash (`ClassCastException`) in header/footer InApp templates.\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
chore(SDK-2603) - Update CTCORECHANGELOG.md and CHANGELOG.md
116,612
25.01.2023 15:39:49
-19,080
cfe652442ca2fc235e994815122305870087f87c
fix(SDK-2542) - fix responsiveness of content part of footer in-app
[ { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBasePartialFragment.java", "new_path": "clevertap-core/src/main/java/com/clevertap/android/sdk/inapp/CTInAppBasePartialFragment.java", "diff": "@@ -24,7 +24,6 @@ public abstract class CTInAppBasePartialFragment extends CTInAppBaseFragment {\n@Override\npublic void onDestroy() {\nsuper.onDestroy();\n- didDismiss(null);\n}\n@Override\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/res/layout-land/inapp_footer.xml", "new_path": "clevertap-core/src/main/res/layout-land/inapp_footer.xml", "diff": "android:id=\"@+id/footer_linear_layout_2\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"118dp\"\n+ android:paddingStart=\"20dp\"\n+ android:paddingEnd=\"20dp\"\nandroid:orientation=\"vertical\">\n<TextView\nandroid:id=\"@+id/footer_title\"\n- android:layout_width=\"208dp\"\n+ android:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:layout_marginLeft=\"20dp\"\n- android:layout_marginStart=\"20dp\"\nandroid:layout_marginTop=\"20dp\"\n- android:textSize=\"16sp\"\n+ android:textSize=\"@dimen/txt_size_inapp_footer_title\"\nandroid:textStyle=\"bold\" />\n<TextView\nandroid:id=\"@+id/footer_message\"\n- android:layout_width=\"208dp\"\n+ android:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:layout_marginLeft=\"20dp\"\n- android:layout_marginStart=\"20dp\"\nandroid:layout_marginTop=\"10dp\"\nandroid:maxLines=\"3\"\n- android:textSize=\"12sp\" />\n+ android:textSize=\"@dimen/txt_size_inapp_footer_message\" />\n</LinearLayout>\n</LinearLayout>\nandroid:layout_width=\"0dp\"\nandroid:layout_height=\"match_parent\"\nandroid:layout_weight=\"1\"\n- android:textSize=\"14sp\"\n+ android:textSize=\"@dimen/txt_size_inapp_footer_button\"\nandroid:visibility=\"gone\" />\n<Button\nandroid:layout_width=\"0dp\"\nandroid:layout_height=\"match_parent\"\nandroid:layout_weight=\"1\"\n- android:textSize=\"14sp\"\n+ android:textSize=\"@dimen/txt_size_inapp_footer_button\"\nandroid:visibility=\"gone\" />\n</LinearLayout>\n</RelativeLayout>\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/res/layout/inapp_footer.xml", "new_path": "clevertap-core/src/main/res/layout/inapp_footer.xml", "diff": "android:id=\"@+id/footer_linear_layout_2\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"118dp\"\n+ android:paddingStart=\"20dp\"\n+ android:paddingEnd=\"20dp\"\nandroid:orientation=\"vertical\">\n<TextView\nandroid:id=\"@+id/footer_title\"\n- android:layout_width=\"208dp\"\n+ android:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:layout_marginLeft=\"20dp\"\n- android:layout_marginStart=\"20dp\"\nandroid:layout_marginTop=\"20dp\"\n- android:textSize=\"16sp\"\n+ android:textSize=\"@dimen/txt_size_inapp_footer_title\"\nandroid:textStyle=\"bold\" />\n<TextView\nandroid:id=\"@+id/footer_message\"\n- android:layout_width=\"208dp\"\n+ android:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:layout_marginLeft=\"20dp\"\n- android:layout_marginStart=\"20dp\"\nandroid:layout_marginTop=\"10dp\"\nandroid:maxLines=\"3\"\n- android:textSize=\"12sp\" />\n+ android:textSize=\"@dimen/txt_size_inapp_footer_message\" />\n</LinearLayout>\n</LinearLayout>\nandroid:layout_width=\"0dp\"\nandroid:layout_height=\"match_parent\"\nandroid:layout_weight=\"1\"\n- android:textSize=\"14sp\"\n+ android:textSize=\"@dimen/txt_size_inapp_footer_button\"\nandroid:visibility=\"gone\" />\n<Button\nandroid:layout_width=\"0dp\"\nandroid:layout_height=\"match_parent\"\nandroid:layout_weight=\"1\"\n- android:textSize=\"14sp\"\n+ android:textSize=\"@dimen/txt_size_inapp_footer_button\"\nandroid:visibility=\"gone\" />\n</LinearLayout>\n</RelativeLayout>\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/res/values-land/dimens.xml", "new_path": "clevertap-core/src/main/res/values-land/dimens.xml", "diff": "<dimen name=\"txt_size_inapp_title\">24sp</dimen>\n<dimen name=\"txt_size_inapp_message\">18sp</dimen>\n<dimen name=\"txt_size_inapp_button\">16sp</dimen>\n+\n+ <dimen name=\"txt_size_inapp_footer_title\">18sp</dimen>\n+ <dimen name=\"txt_size_inapp_footer_message\">14sp</dimen>\n+ <dimen name=\"txt_size_inapp_footer_button\">16sp</dimen>\n</resources>\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/res/values-sw600dp-land/dimens.xml", "new_path": "clevertap-core/src/main/res/values-sw600dp-land/dimens.xml", "diff": "<dimen name=\"txt_size_inapp_title\">22sp</dimen>\n<dimen name=\"txt_size_inapp_message\">18sp</dimen>\n<dimen name=\"txt_size_inapp_button\">16sp</dimen>\n+\n+ <dimen name=\"txt_size_inapp_footer_title\">18sp</dimen>\n+ <dimen name=\"txt_size_inapp_footer_message\">14sp</dimen>\n+ <dimen name=\"txt_size_inapp_footer_button\">16sp</dimen>\n</resources>\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/res/values-sw600dp/dimens.xml", "new_path": "clevertap-core/src/main/res/values-sw600dp/dimens.xml", "diff": "<dimen name=\"txt_size_inapp_title\">22sp</dimen>\n<dimen name=\"txt_size_inapp_message\">18sp</dimen>\n<dimen name=\"txt_size_inapp_button\">16sp</dimen>\n+\n+ <dimen name=\"txt_size_inapp_footer_title\">18sp</dimen>\n+ <dimen name=\"txt_size_inapp_footer_message\">14sp</dimen>\n+ <dimen name=\"txt_size_inapp_footer_button\">16sp</dimen>\n</resources>\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/res/values-sw720dp-land/dimens.xml", "new_path": "clevertap-core/src/main/res/values-sw720dp-land/dimens.xml", "diff": "<dimen name=\"txt_size_inapp_message\">24sp</dimen>\n<dimen name=\"txt_size_inapp_button\">22sp</dimen>\n-\n+ <dimen name=\"txt_size_inapp_footer_title\">24sp</dimen>\n+ <dimen name=\"txt_size_inapp_footer_message\">20sp</dimen>\n+ <dimen name=\"txt_size_inapp_footer_button\">22sp</dimen>\n</resources>\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/res/values-sw720dp/dimens.xml", "new_path": "clevertap-core/src/main/res/values-sw720dp/dimens.xml", "diff": "<dimen name=\"txt_size_inapp_title\">36sp</dimen>\n<dimen name=\"txt_size_inapp_message\">24sp</dimen>\n<dimen name=\"txt_size_inapp_button\">22sp</dimen>\n+\n+ <dimen name=\"txt_size_inapp_footer_title\">24sp</dimen>\n+ <dimen name=\"txt_size_inapp_footer_message\">20sp</dimen>\n+ <dimen name=\"txt_size_inapp_footer_button\">22sp</dimen>\n</resources>\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "clevertap-core/src/main/res/values/dimens.xml", "new_path": "clevertap-core/src/main/res/values/dimens.xml", "diff": "<dimen name=\"txt_size_inapp_title\">22sp</dimen>\n<dimen name=\"txt_size_inapp_message\">18sp</dimen>\n<dimen name=\"txt_size_inapp_button\">16sp</dimen>\n+\n+ <dimen name=\"txt_size_inapp_footer_title\">16sp</dimen>\n+ <dimen name=\"txt_size_inapp_footer_message\">12sp</dimen>\n+ <dimen name=\"txt_size_inapp_footer_button\">14sp</dimen>\n</resources>\n\\ No newline at end of file\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": "@@ -70,8 +70,8 @@ class HomeScreenFragment : Fragment() {\nviewModel.clickCommand.observe(viewLifecycleOwner, Observer<String> { commandPosition ->\nwhen (commandPosition) {\n- \"60\" -> startActivity(Intent(activity, WebViewActivity::class.java))\n- \"70\" -> { // init Geofence API\n+ \"6-0\" -> startActivity(Intent(activity, WebViewActivity::class.java))\n+ \"7-0\" -> { // init Geofence API\nwhen {\n// proceed only if cleverTap instance is not null\ncleverTapInstance == null -> println(\"cleverTapInstance is null\")\n@@ -79,7 +79,7 @@ class HomeScreenFragment : Fragment() {\nelse -> initCTGeofenceApi(cleverTapInstance)\n}\n}\n- \"71\" -> { // trigger location\n+ \"7-1\" -> { // trigger location\ntry {\nCTGeofenceAPI.getInstance(context).triggerLocation()\n} catch (e: IllegalStateException) {\n@@ -89,7 +89,7 @@ class HomeScreenFragment : Fragment() {\ninitCTGeofenceApi(cleverTapInstance!!)\n}\n}\n- \"72\" -> CTGeofenceAPI.getInstance(context).deactivate() // deactivate geofence\n+ \"7-2\" -> CTGeofenceAPI.getInstance(context).deactivate() // deactivate geofence\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": "@@ -73,7 +73,8 @@ object HomeScreenModel {\n\"Alert Local IAM with fallbackToSettings - true\",\n\"Hard permission dialog with fallbackToSettings - false\",\n\"Hard permission dialog with fallbackToSettings - true\"\n- )\n+ ),\n+ \"INAPP\" to listOf(\"Footer InApp\", \"Footer InApp without image\")\n)\n}\n}\n\\ No newline at end of file\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": "@@ -8,7 +8,7 @@ import com.clevertap.android.sdk.CTInboxStyleConfig\nimport com.clevertap.android.sdk.CleverTapAPI\nimport com.clevertap.android.sdk.Constants\nimport com.clevertap.android.sdk.inapp.CTLocalInApp\n-import java.util.*\n+import java.util.Date\nclass HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel() {\n@@ -18,13 +18,13 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nfun onChildClick(groupPosition: Int = 0, childPosition: Int = 0) {\nLog.i(\"HomeScreenViewModel\", \"child click $groupPosition $childPosition\")\n- val commandPosition = \"$groupPosition$childPosition\"\n+ val commandPosition = \"$groupPosition-$childPosition\"\nclickCommand.value = commandPosition\nwhen (commandPosition) {\n- \"00\" -> {\n+ \"0-0\" -> {\ncleverTapAPI?.pushEvent(\"testEventPushAmp\")\n}\n- \"01\" -> {\n+ \"0-1\" -> {\n//Record an event with properties\nval prodViewedAction = mapOf(\n\"Product Name\" to \"Casio Chronograph Watch\",\n@@ -36,7 +36,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.pushEvent(\"caurousel-inapp\")\ncleverTapAPI?.pushEvent(\"icon-inbox\")\n}\n- \"02\" -> {\n+ \"0-2\" -> {\n//Record a Charged (Transactional) event\nval chargeDetails = hashMapOf<String, Any>(\n\"Amount\" to 300, \"Payment Mode\" to \"Credit card\",\n@@ -63,8 +63,8 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.pushChargedEvent(chargeDetails, items)\n}\n- \"03\" -> cleverTapAPI?.recordScreen(\"Cart Screen Viewed\")\n- \"10\" -> {\n+ \"0-3\" -> cleverTapAPI?.recordScreen(\"Cart Screen Viewed\")\n+ \"1-0\" -> {\n//Record a profile\nval profileUpdate = HashMap<String, Any>()\nprofileUpdate[\"Name\"] = \"User Name\" // String\n@@ -85,7 +85,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.pushProfile(profileUpdate)\n}\n- \"11\" -> {\n+ \"1-1\" -> {\n//Update(Replace) Single-Value User Profile Properties\nval profileUpdate = HashMap<String, Any>()\nprofileUpdate[\"Name\"] = \"Updated User Name\" // String\n@@ -98,12 +98,12 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.pushProfile(profileUpdate)\n}\n- \"12\" -> {\n+ \"1-2\" -> {\n//Update(Add) Single-Value User Profile Properties\nval profileUpdate = mapOf(\"Customer Type\" to \"Silver\", \"Preferred Language\" to \"English\")\ncleverTapAPI?.pushProfile(profileUpdate)\n}\n- \"13\" -> {\n+ \"1-3\" -> {\n//Update(Remove) Single-Value User Profile Properties or\n//Update(Remove) Can be used to remove PII data(for eg. Email,Phone,Name), locally\ncleverTapAPI?.removeValueForKey(\"Customer Type\")\n@@ -111,41 +111,41 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\n// cleverTapAPI?.removeValueForKey(\"Phone\")\n// cleverTapAPI?.removeValueForKey(\"Name\")\n}\n- \"14\" -> {\n+ \"1-4\" -> {\n// Update(Replace) Multi-Value property\ncleverTapAPI?.setMultiValuesForKey(\"MyStuffList\", arrayListOf(\"Updated Bag\", \"Updated Shoes\"))\n}\n- \"15\" -> {\n+ \"1-5\" -> {\n// Update(Add) Multi-Value property\ncleverTapAPI?.addMultiValueForKey(\"MyStuffList\", \"Coat\")\n// or\ncleverTapAPI?.addMultiValuesForKey(\"MyStuffList\", arrayListOf(\"Socks\", \"Scarf\"))\n}\n- \"16\" -> {\n+ \"1-6\" -> {\n// Update(Remove) Multi-Value property\ncleverTapAPI?.removeMultiValueForKey(\"MyStuffList\", \"Coat\")\n// or\ncleverTapAPI?.removeMultiValuesForKey(\"MyStuffList\", arrayListOf(\"Socks\", \"Scarf\"))\n}\n- \"17\" -> {\n+ \"1-7\" -> {\n//Update(Add) Increment Value\ncleverTapAPI?.incrementValue(\"score\", 50)\n}\n- \"18\" -> {\n+ \"1-8\" -> {\n// Update(Add) Decrement Value\ncleverTapAPI?.decrementValue(\"score\", 30)\n}\n- \"19\" -> {\n+ \"1-9\" -> {\n// Profile location\ncleverTapAPI?.location = cleverTapAPI?.location\n}\n- \"110\" -> {\n+ \"1-10\" -> {\n// Get Profile Info\nprintln(\"Profile Name = ${cleverTapAPI?.getProperty(\"Name\")}\")\nprintln(\"Profile CleverTapId = ${cleverTapAPI?.cleverTapID}\")\nprintln(\"Profile CleverTap AttributionIdentifier = ${cleverTapAPI?.cleverTapAttributionIdentifier}\")\n}\n- \"111\" -> {\n+ \"1-11\" -> {\n// onUserLogin\nval newProfile = HashMap<String, Any>()\nval n = (0..10_000).random()\n@@ -157,7 +157,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\n// add any other key value pairs.....\ncleverTapAPI?.onUserLogin(newProfile)\n}\n- \"20\" -> {\n+ \"2-0\" -> {\n// Open Inbox(Customised, with tabs)\nval inboxTabs =\narrayListOf(\"Promotions\", \"Offers\", \"Others\")//Anything after the first 2 will be ignored\n@@ -176,7 +176,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.showAppInbox(this) //Opens activity With Tabs\n}\n}\n- \"21\" -> {\n+ \"2-1\" -> {\n// Open Inbox(Customised, without tabs)\nCTInboxStyleConfig().apply {\ntabBackgroundColor = \"#FF0000\"\n@@ -192,19 +192,18 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\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\n+ \"2-2\" -> println(\"Total inbox message count = ${cleverTapAPI?.inboxMessageCount}\") // show total inbox message count\n+ \"2-3\" -> println(\"Unread inbox message count = ${cleverTapAPI?.inboxMessageUnreadCount}\") // show unread inbox message count\n+ \"2-4\" -> // All inbox messages\ncleverTapAPI?.allInboxMessages?.forEach {\nprintln(\"All inbox messages ID = ${it.messageId}\")\n}\n- \"25\" -> // All unread inbox messages\n+ \"2-5\" -> // All unread inbox messages\ncleverTapAPI?.unreadInboxMessages?.forEach {\nprintln(\"All unread inbox messages ID = ${it.messageId}\")\n}\n- \"26\" -> {\n+ \"2-6\" -> {\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@@ -212,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- \"27\" -> {\n+ \"2-7\" -> {\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@@ -220,7 +219,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nprintln(\"Deleted inboxMessage For Id = $it\")\n} ?: println(\"inboxMessage Id is null\")\n}\n- \"28\" -> {\n+ \"2-8\" -> {\nval firstMessage = cleverTapAPI?.allInboxMessages?.firstOrNull()\n//Delete message object belonging to the given CTInboxMessage.\nfirstMessage?.also {\n@@ -228,7 +227,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nprintln(\"Deleted inboxMessage = ${it.messageId}\")\n} ?: println(\"inboxMessage is null\")\n}\n- \"29\" -> {\n+ \"2-9\" -> {\nval firstMessageId = cleverTapAPI?.unreadInboxMessages?.firstOrNull()?.messageId\n//Mark Message as Read. Message id should be a String\nfirstMessageId?.also {\n@@ -236,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- \"210\" -> {\n+ \"2-10\" -> {\nval firstMessage = cleverTapAPI?.unreadInboxMessages?.firstOrNull()\n//Mark message as Read. Message should object of CTInboxMessage\nfirstMessage?.also {\n@@ -244,7 +243,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nprintln(\"Marked Message as Read = ${it.messageId}\")\n} ?: println(\"inboxMessage is null\")\n}\n- \"211\" -> {\n+ \"2-11\" -> {\nval firstMessageId = cleverTapAPI?.allInboxMessages?.firstOrNull()?.messageId\n//Raise Notification Viewed event for Inbox Message. Message id should be a String\nfirstMessageId?.also {\n@@ -252,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- \"212\" -> {\n+ \"2-12\" -> {\nval firstMessageId = cleverTapAPI?.allInboxMessages?.firstOrNull()?.messageId\n//Raise Notification Clicked event for Inbox Message. Message id should be a String\nfirstMessageId?.also {\n@@ -260,7 +259,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nprintln(\"Raised Notification Clicked event For Id = $it\")\n} ?: println(\"inboxMessage Id is null\")\n}\n- \"30\" -> {\n+ \"3-0\" -> {\nval displayUnitID = cleverTapAPI?.allDisplayUnits?.firstOrNull()?.unitID\n//Get DisplayUnit by unit id. unit id should be a String\ndisplayUnitID?.also {\n@@ -268,8 +267,8 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nprintln(\"DisplayUnit for Id $it = $displayUnitForId\")\n} ?: println(\"DisplayUnit Id is null\")\n}\n- \"31\" -> println(\"All Display Units = ${cleverTapAPI?.allDisplayUnits}\") // get all display units\n- \"32\" -> {\n+ \"3-1\" -> println(\"All Display Units = ${cleverTapAPI?.allDisplayUnits}\") // get all display units\n+ \"3-2\" -> {\nval displayUnitID = cleverTapAPI?.allDisplayUnits?.firstOrNull()?.unitID\n//Raise Notification Viewed event for DisplayUnit. Message id should be a String\ndisplayUnitID?.also {\n@@ -277,7 +276,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nprintln(\"Raised Notification Viewed event For DisplayUnit Id = $it\")\n} ?: println(\"DisplayUnit Id is null\")\n}\n- \"33\" -> {\n+ \"3-3\" -> {\nval displayUnitID = cleverTapAPI?.allDisplayUnits?.firstOrNull()?.unitID\n//Raise Notification Clicked event for DisplayUnit. Message id should be a String\ndisplayUnitID?.also {\n@@ -285,19 +284,19 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nprintln(\"Raised Notification Clicked event For DisplayUnit Id = $it\")\n} ?: println(\"DisplayUnit Id is null\")\n}\n- \"40\" -> {\n+ \"4-0\" -> {\nval hashMap = hashMapOf<String, Any>(\n\"text color\" to \"red\", \"msg count\" to 100, \"price\" to 100.50, \"is shown\" to true,\n\"json\" to \"\"\"{\"key\":\"val\",\"key2\":50}\"\"\"\n)\ncleverTapAPI?.productConfig()?.setDefaults(hashMap)\n}\n- \"41\" -> cleverTapAPI?.productConfig()?.fetch()\n- \"42\" -> cleverTapAPI?.productConfig()?.activate()\n- \"43\" -> cleverTapAPI?.productConfig()?.fetchAndActivate()\n- \"44\" -> cleverTapAPI?.productConfig()?.reset()\n- \"45\" -> cleverTapAPI?.productConfig()?.fetch(60)\n- \"46\" -> //get all product config values\n+ \"4-1\" -> cleverTapAPI?.productConfig()?.fetch()\n+ \"4-2\" -> cleverTapAPI?.productConfig()?.activate()\n+ \"4-3\" -> cleverTapAPI?.productConfig()?.fetchAndActivate()\n+ \"4-4\" -> cleverTapAPI?.productConfig()?.reset()\n+ \"4-5\" -> cleverTapAPI?.productConfig()?.fetch(60)\n+ \"4-6\" -> //get all product config values\ncleverTapAPI?.productConfig()?.apply {\nprintln(\"Product Config text color val in string : ${getString(\"text color\")}\")\nprintln(\"Product Config is shown val in boolean : ${getBoolean(\"is shown\")}\")\n@@ -305,14 +304,14 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\nprintln(\"Product Config price val in double : ${getDouble(\"price\")}\")\nprintln(\"Product Config json val in string : ${getString(\"json\")}\")\n}\n- \"47\" -> println(\"Product Config lastFetchTimeStampInMillis = ${cleverTapAPI?.productConfig()?.lastFetchTimeStampInMillis}\")\n- \"50\" -> println(\n+ \"4-7\" -> println(\"Product Config lastFetchTimeStampInMillis = ${cleverTapAPI?.productConfig()?.lastFetchTimeStampInMillis}\")\n+ \"5-0\" -> println(\n\"Feature Flags is shown val in boolean = ${\ncleverTapAPI?.featureFlag()?.get(\"is shown\", true)\n}\"\n)\n- \"80\" -> println(\"CleverTapAttribution Identifier = ${cleverTapAPI?.cleverTapAttributionIdentifier}\")\n- \"81\" -> cleverTapAPI?.getCleverTapID {\n+ \"8-0\" -> println(\"CleverTapAttribution Identifier = ${cleverTapAPI?.cleverTapAttributionIdentifier}\")\n+ \"8-1\" -> cleverTapAPI?.getCleverTapID {\nprintln(\n\"CleverTap DeviceID from Application class= $it, thread=${\nif (Looper.myLooper() == Looper.getMainLooper()) \"mainthread\" else \"bg thread\"\n@@ -320,27 +319,27 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\n}\"\n)\n}\n- \"90\"-> cleverTapAPI?.pushEvent(\"Send Basic Push\")\n- \"91\"-> cleverTapAPI?.pushEvent(\"Send Carousel Push\")\n- \"92\"-> cleverTapAPI?.pushEvent(\"Send Manual Carousel Push\")\n- \"93\"-> cleverTapAPI?.pushEvent(\"Send Filmstrip Carousel Push\")\n- \"94\"-> cleverTapAPI?.pushEvent(\"Send Rating Push\")\n- \"95\"-> cleverTapAPI?.pushEvent(\"Send Product Display Notification\")\n- \"96\"-> cleverTapAPI?.pushEvent(\"Send Linear Product Display Push\")\n- \"97\"-> cleverTapAPI?.pushEvent(\"Send CTA Notification\")\n- \"98\"-> cleverTapAPI?.pushEvent(\"Send Zero Bezel Notification\")\n- \"99\"-> cleverTapAPI?.pushEvent(\"Send Zero Bezel Text Only Notification\")\n- \"910\"-> cleverTapAPI?.pushEvent(\"Send Timer Notification\")\n- \"911\"-> cleverTapAPI?.pushEvent(\"Send Input Box Notification\")\n- \"912\"-> cleverTapAPI?.pushEvent(\"Send Input Box Reply with Event Notification\")\n- \"913\"-> cleverTapAPI?.pushEvent(\"Send Input Box Reply with Auto Open Notification\")\n- \"914\"-> cleverTapAPI?.pushEvent(\"Send Input Box Remind Notification DOC FALSE\")\n- \"915\"-> cleverTapAPI?.pushEvent(\"Send Input Box CTA DOC true\")\n- \"916\"-> cleverTapAPI?.pushEvent(\"Send Input Box CTA DOC false\")\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+ \"9-0\" -> cleverTapAPI?.pushEvent(\"Send Basic Push\")\n+ \"9-1\" -> cleverTapAPI?.pushEvent(\"Send Carousel Push\")\n+ \"9-2\" -> cleverTapAPI?.pushEvent(\"Send Manual Carousel Push\")\n+ \"9-3\" -> cleverTapAPI?.pushEvent(\"Send Filmstrip Carousel Push\")\n+ \"9-4\" -> cleverTapAPI?.pushEvent(\"Send Rating Push\")\n+ \"9-5\" -> cleverTapAPI?.pushEvent(\"Send Product Display Notification\")\n+ \"9-6\" -> cleverTapAPI?.pushEvent(\"Send Linear Product Display Push\")\n+ \"9-7\" -> cleverTapAPI?.pushEvent(\"Send CTA Notification\")\n+ \"9-8\" -> cleverTapAPI?.pushEvent(\"Send Zero Bezel Notification\")\n+ \"9-9\" -> cleverTapAPI?.pushEvent(\"Send Zero Bezel Text Only Notification\")\n+ \"9-10\" -> cleverTapAPI?.pushEvent(\"Send Timer Notification\")\n+ \"9-11\" -> cleverTapAPI?.pushEvent(\"Send Input Box Notification\")\n+ \"9-12\" -> cleverTapAPI?.pushEvent(\"Send Input Box Reply with Event Notification\")\n+ \"9-13\" -> cleverTapAPI?.pushEvent(\"Send Input Box Reply with Auto Open Notification\")\n+ \"9-14\" -> cleverTapAPI?.pushEvent(\"Send Input Box Remind Notification DOC FALSE\")\n+ \"9-15\" -> cleverTapAPI?.pushEvent(\"Send Input Box CTA DOC true\")\n+ \"9-16\" -> cleverTapAPI?.pushEvent(\"Send Input Box CTA DOC false\")\n+ \"9-17\" -> cleverTapAPI?.pushEvent(\"Send Input Box Reminder DOC true\")\n+ \"9-18\" -> cleverTapAPI?.pushEvent(\"Send Input Box Reminder DOC false\")\n+ \"9-19\" -> cleverTapAPI?.pushEvent(\"Send Three CTA Notification\")\n+ \"10-0\" -> {\nval builder = CTLocalInApp.builder()\n.setInAppType(CTLocalInApp.InAppType.HALF_INTERSTITIAL)\n.setTitleText(\"Get Notified\")\n@@ -358,7 +357,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.promptPushPrimer(builder)\n}\n- \"101\"->{\n+ \"10-1\" -> {\nval builder = CTLocalInApp.builder()\n.setInAppType(CTLocalInApp.InAppType.HALF_INTERSTITIAL)\n.setTitleText(\"Get Notified\")\n@@ -377,7 +376,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.promptPushPrimer(builder)\n}\n- \"102\"->{\n+ \"10-2\" -> {\nval builder = CTLocalInApp.builder()\n.setInAppType(CTLocalInApp.InAppType.HALF_INTERSTITIAL)\n.setTitleText(\"Get Notified\")\n@@ -397,7 +396,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\n}\n- \"103\"->{\n+ \"10-3\" -> {\nval builder = CTLocalInApp.builder()\n.setInAppType(CTLocalInApp.InAppType.ALERT)\n.setTitleText(\"Get Notified\")\n@@ -409,7 +408,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.promptPushPrimer(builder)\n}\n- \"104\"->{\n+ \"10-4\" -> {\nval builder = CTLocalInApp.builder()\n.setInAppType(CTLocalInApp.InAppType.ALERT)\n.setTitleText(\"Get Notified\")\n@@ -421,7 +420,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.promptPushPrimer(builder)\n}\n- \"105\"->{\n+ \"10-5\" -> {\nval builder = CTLocalInApp.builder()\n.setInAppType(CTLocalInApp.InAppType.ALERT)\n.setTitleText(\"Get Notified\")\n@@ -434,7 +433,7 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\ncleverTapAPI?.promptPushPrimer(builder)\n}\n- \"106\"->{\n+ \"10-6\" -> {\nif (cleverTapAPI?.isPushPermissionGranted == false) {\ncleverTapAPI.promptForPushPermission(false)\n} else {\n@@ -442,13 +441,19 @@ class HomeScreenViewModel(private val cleverTapAPI: CleverTapAPI?) : ViewModel()\n}\n}\n- \"107\"->{\n+ \"10-7\" -> {\nif (cleverTapAPI?.isPushPermissionGranted == false) {\ncleverTapAPI.promptForPushPermission(true)\n} else {\nLog.v(\"HomeScreenViewModel\", \"Notification permission is already granted.\")\n}\n}\n+ \"11-0\" -> {\n+ cleverTapAPI?.pushEvent(\"Footer InApp\")\n+ }\n+ \"11-1\" -> {\n+ cleverTapAPI?.pushEvent(\"Footer InApp without image\")\n+ }\n//\"60\" -> webViewClickListener?.onWebViewClick()\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
fix(SDK-2542) - fix responsiveness of content part of footer in-app
116,616
25.01.2023 15:42:02
-19,080
8fc8b3cf51cd8cb91a6d6f8402a2e920caa7fe95
chore(SDK-2603) - Update version name for release
[ { "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.7.2\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.7.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.7.2\", ext: 'aar')\n+ implementation (name: \"clevertap-android-sdk-4.7.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.7.2\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.7.3\"\nimplementation \"androidx.core:core:1.9.0\"\nimplementation \"com.google.firebase:firebase-messaging:23.0.6\"\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/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.2.0\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.7.2\" // 3.9.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.7.3\" // 3.9.0 and above\nimplementation \"com.google.android.gms:play-services-location:21.0.0\"\nimplementation \"androidx.work:work-runtime:2.7.1\" // 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.7\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.7.2\" // 4.4.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.7.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": "versions.properties", "new_path": "versions.properties", "diff": "@@ -285,7 +285,7 @@ version.androidx.work=2.7.1\nversion.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.7.2\n+version.com.clevertap.android..clevertap-android-sdk=4.7.3\nversion.com.clevertap.android..clevertap-geofence-sdk=1.2.0\nversion.com.clevertap.android..clevertap-hms-sdk=1.3.2\nversion.com.clevertap.android..clevertap-xiaomi-sdk=1.5.2\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
chore(SDK-2603) - Update version name for release
116,616
25.01.2023 15:58:28
-19,080
a4636572a0f7e76df5f2a1b4431c23a6a34bca92
chore(SDK-2603) - Update CHANGELOG.md, CTCORECHANGELOG.md and deps in sample app.
[ { "change_type": "MODIFY", "old_path": "CHANGELOG.md", "new_path": "CHANGELOG.md", "diff": "## CHANGE LOG.\n-### January 23, 2023\n+### January 25, 2023\n* [CleverTap Android SDK v4.7.3](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n-*\n+* [CleverTap RenderMax SDK v1.0.2](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTRENDERMAXCHANGELOG.md)\n+\n### December 16, 2022\n* [CleverTap Android SDK v4.7.2](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.7.3 (January 23, 2023)\n+### Version 4.7.3 (January 25, 2023)\n* Fixes message UI for footer in-app.\n* Fixes NPE when clicked on body of InboxMessage with deep link in `CTInboxListFragment`\n* Other bug fixes and performance improvements.\n" }, { "change_type": "MODIFY", "old_path": "sample/build.gradle", "new_path": "sample/build.gradle", "diff": "@@ -72,20 +72,25 @@ dependencies {\nimplementation project(':clevertap-core')\nimplementation fileTree(include: ['*.aar'], dir: 'libs')\n- //implementation \"com.clevertap.android:clevertap-android-sdk:4.6.6\"\n+ //implementation \"com.clevertap.android:clevertap-android-sdk:4.7.3\"\nimplementation project(':clevertap-geofence')\n- //implementation \"com.clevertap.android:clevertap-geofence-sdk:1.1.0\"\n- implementation project(':clevertap-xps')\n+ //implementation \"com.clevertap.android:clevertap-geofence-sdk:1.2.0\"\n+\n// For Xiaomi Push use\n- //implementation 'com.clevertap.android:clevertap-xiaomi-sdk:1.5.0'\n- implementation project(':clevertap-hms')\n+ implementation project(':clevertap-xps')\n+ //implementation 'com.clevertap.android:clevertap-xiaomi-sdk:1.5.2'\n+\nimplementation project(':clevertap-pushtemplates')\n-// implementation \"com.clevertap.android:push-templates:1.0.4\"\n+// implementation \"com.clevertap.android:push-templates:1.0.7\"\n+\n// For Huawei Push use\n- //implementation 'com.clevertap.android:clevertap-hms-sdk:1.3.1'\n+ implementation project(':clevertap-hms')\n+ //implementation 'com.clevertap.android:clevertap-hms-sdk:1.3.2'\n//implementation 'com.huawei.hms:push:6.5.0.300'\n+ implementation \"com.clevertap.android:clevertap-rendermax-sdk:1.0.2\"//Add for renderMax SDK support\n+\nimplementation 'com.google.android.gms:play-services-location:21.0.0'// Needed for geofence\nimplementation 'androidx.work:work-runtime:2.7.1'// Needed for geofence\nimplementation 'androidx.concurrent:concurrent-futures:1.1.0'// Needed for geofence\n" }, { "change_type": "MODIFY", "old_path": "templates/CTCORECHANGELOG.md", "new_path": "templates/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n-### Version 4.7.3 (January 23, 2023)\n+### Version 4.7.3 (January 25, 2023)\n* Fixes message UI for footer in-app.\n* Fixes NPE when clicked on body of InboxMessage with deep link in `CTInboxListFragment`\n* Other bug fixes and performance improvements.\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
chore(SDK-2603) - Update CHANGELOG.md, CTCORECHANGELOG.md and deps in sample app.
116,612
25.01.2023 16:27:45
-19,080
96d35789ecbee04b52824378f50398d9db808858
chore(SDK-2603) - refactor test properties
[ { "change_type": "MODIFY", "old_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/inbox/CTInboxListViewFragmentTest.kt", "new_path": "clevertap-core/src/test/java/com/clevertap/android/sdk/inbox/CTInboxListViewFragmentTest.kt", "diff": "@@ -2,22 +2,46 @@ package com.clevertap.android.sdk.inbox\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.mockito.Mockito.verify\n+import org.junit.*\n+import org.junit.runner.*\n+import org.mockito.*\n+import org.mockito.Mockito.*\nimport org.robolectric.RobolectricTestRunner\n@RunWith(RobolectricTestRunner::class)\nclass CTInboxListViewFragmentTest : BaseTestCase() {\n+ private lateinit var buttonJsonObj: JSONObject\n+ private lateinit var jsonObj: JSONObject\nprivate lateinit var ctInboxListViewFragment: CTInboxListViewFragment\nprivate lateinit var ctInboxListViewFragmentSpy: CTInboxListViewFragment\n+ @Before\n@Throws(Exception::class)\noverride fun setUp() {\nsuper.setUp()\n-\n+ jsonObj = JSONObject(\n+ \"\"\"{\"id\":\"1674122920_1674457409\",\"msg\":{\"bg\":\"#ECEDF2\",\"orientation\":\"l\",\"content\":[{\"key\":5385896764,\n+ |\"message\":{\"replacements\":\"SampleMessage\",\"text\":\"SampleMessage\",\"color\":\"#434761\"},\n+ |\"title\":{\"replacements\":\"SampleTitle\",\"text\":\"SampleTitle\",\"color\":\"#434761\"},\"action\":{\"hasUrl\":true,\n+ |\"hasLinks\":true,\"url\":{\"android\":{\"text\":\"ctdemo:\\/\\/com.clevertap.demo\\/WebViewActivity\",\n+ |\"replacements\":\"ctdemo:\\/\\/com.clevertap.demo\\/WebViewActivity\",\"og\":\"\"},\n+ |\"ios\":{\"text\":\"\",\"replacements\":\"\",\"og\":\"\"}},\"links\":[{\"type\":\"url\",\"text\":\"ClickHere\",\n+ |\"color\":\"#000000\",\"bg\":\"#ffffff\",\"copyText\":{\"text\":\"\",\"replacements\":\"\",\"og\":\"\"},\n+ |\"url\":{\"android\":{\"text\":\"ctdemo:\\/\\/com.clevertap.demo\\/WebViewActivity\",\n+ |\"replacements\":\"ctdemo:\\/\\/com.clevertap.demo\\/WebViewActivity\",\"og\":\"\"},\n+ |\"ios\":{\"text\":\"\",\"replacements\":\"\",\"og\":\"\"}},\"kv\":{}}]},\"media\":{},\"icon\":{}}],\n+ |\"type\":\"simple\",\"tags\":[],\"enableTags\":false},\"isRead\":true,\"date\":1674457409,\"wzrk_ttl\":1675062209,\n+ |\"tags\":[\"\"],\"wzrk_id\":\"1674122920_20230123\",\"wzrkParams\":{\"wzrk_ttl\":1675062209,\n+ |\"wzrk_id\":\"1674122920_20230123\",\"wzrk_pivot\":\"wzrk_default\"}}\"\"\".trimMargin()\n+ )\n+ buttonJsonObj =\n+ JSONObject(\n+ \"\"\"{\"type\":\"url\",\"text\":\"ClickHere\",\"color\":\"#000000\",\"bg\":\"#ffffff\",\"copyText\":{\"text\":\"\",\n+ |\"replacements\":\"\",\"og\":\"\"},\"url\":{\"android\":{\"text\":\"ctdemo:\\/\\/com.clevertap.demo\\/WebViewActivity\",\n+ |\"replacements\":\"ctdemo:\\/\\/com.clevertap.demo\\/WebViewActivity\",\"og\":\"\"},\n+ |\"ios\":{\"text\":\"\",\"replacements\":\"\",\"og\":\"\"}},\"kv\":{}}\"\"\".trimMargin()\n+ )\nctInboxListViewFragment = CTInboxListViewFragment()\nctInboxListViewFragmentSpy = Mockito.spy(ctInboxListViewFragment)\n}\n@@ -27,26 +51,6 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nval position = 0\nval buttonTxt = \"\"\n- val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n- \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n- \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n- \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n- \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n- \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n- \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n- \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n- \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n- \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\n-\n- val buttonJsonObj = JSONObject(\"{\\\"type\\\":\\\"url\\\",\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\" +\n- \"\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}\")\nval keyValuePayload = HashMap<String, String>()\nctInboxListViewFragmentSpy.inboxMessages.add(CTInboxMessage(jsonObj))\n@@ -55,8 +59,10 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nctInboxListViewFragmentSpy.handleClick(position, buttonTxt, buttonJsonObj, keyValuePayload)\n//Assert\n- verify(ctInboxListViewFragmentSpy,Mockito.atLeastOnce()).\n- fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ verify(\n+ ctInboxListViewFragmentSpy,\n+ Mockito.atLeastOnce()\n+ ).fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n}\n@Test\n@@ -64,26 +70,6 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nval position = 0\nval buttonTxt = null\n- val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n- \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n- \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n- \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n- \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n- \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n- \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n- \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n- \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n- \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\n-\n- val buttonJsonObj = JSONObject(\"{\\\"type\\\":\\\"url\\\",\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\" +\n- \"\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}\")\nval keyValuePayload = HashMap<String, String>()\nctInboxListViewFragmentSpy.inboxMessages.add(CTInboxMessage(jsonObj))\n@@ -92,8 +78,10 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nctInboxListViewFragmentSpy.handleClick(position, buttonTxt, buttonJsonObj, keyValuePayload)\n//Assert\n- verify(ctInboxListViewFragmentSpy,Mockito.atLeastOnce()).\n- fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ verify(\n+ ctInboxListViewFragmentSpy,\n+ Mockito.atLeastOnce()\n+ ).fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n}\n@Test\n@@ -101,26 +89,6 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nval position = 0\nval buttonTxt = \"ClickHere\"\n- val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n- \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n- \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n- \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n- \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n- \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n- \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n- \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n- \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n- \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\n-\n- val buttonJsonObj = JSONObject(\"{\\\"type\\\":\\\"url\\\",\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\" +\n- \"\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}\")\nval keyValuePayload = HashMap<String, String>()\nctInboxListViewFragmentSpy.inboxMessages.add(CTInboxMessage(jsonObj))\n@@ -129,8 +97,10 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nctInboxListViewFragmentSpy.handleClick(position, buttonTxt, buttonJsonObj, keyValuePayload)\n//Assert\n- verify(ctInboxListViewFragmentSpy,Mockito.atLeastOnce()).\n- fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ verify(\n+ ctInboxListViewFragmentSpy,\n+ Mockito.atLeastOnce()\n+ ).fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n}\n@Test\n@@ -138,20 +108,6 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nval position = 0\nval buttonTxt = \"ClickHere\"\n- val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n- \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n- \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n- \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n- \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n- \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n- \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n- \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n- \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n- \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\nval buttonJsonObj = null\n@@ -162,8 +118,10 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nctInboxListViewFragmentSpy.handleClick(position, buttonTxt, buttonJsonObj, keyValuePayload)\n//Assert\n- verify(ctInboxListViewFragmentSpy,Mockito.atLeastOnce()).\n- fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ verify(\n+ ctInboxListViewFragmentSpy,\n+ Mockito.atLeastOnce()\n+ ).fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n}\n@Test\n@@ -171,26 +129,6 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nval position = 0\nval buttonTxt = \"ClickHere\"\n- val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n- \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n- \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n- \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n- \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n- \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n- \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n- \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n- \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n- \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\n-\n- val buttonJsonObj = JSONObject(\"{\\\"type\\\":\\\"url\\\",\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\" +\n- \"\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}\")\nval keyValuePayload = HashMap<String, String>()\nctInboxListViewFragmentSpy.inboxMessages.add(CTInboxMessage(jsonObj))\n@@ -199,8 +137,10 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nctInboxListViewFragmentSpy.handleClick(position, buttonTxt, buttonJsonObj, keyValuePayload)\n//Assert\n- verify(ctInboxListViewFragmentSpy,Mockito.atLeastOnce()).\n- fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ verify(\n+ ctInboxListViewFragmentSpy,\n+ Mockito.atLeastOnce()\n+ ).fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n}\n@Test\n@@ -208,26 +148,6 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nval position = 0\nval buttonTxt = \"ClickHere\"\n- val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n- \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n- \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n- \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n- \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n- \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n- \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n- \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n- \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n- \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\n-\n- val buttonJsonObj = JSONObject(\"{\\\"type\\\":\\\"url\\\",\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\" +\n- \"\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}\")\nval keyValuePayload = HashMap<String, String>()\nctInboxListViewFragmentSpy.inboxMessages.add(CTInboxMessage(jsonObj))\n@@ -236,8 +156,10 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nctInboxListViewFragmentSpy.handleClick(position, buttonTxt, buttonJsonObj, keyValuePayload)\n//Assert\n- verify(ctInboxListViewFragmentSpy,Mockito.atLeastOnce()).\n- fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ verify(\n+ ctInboxListViewFragmentSpy,\n+ Mockito.atLeastOnce()\n+ ).fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n}\n@Test\n@@ -245,26 +167,6 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nval position = 0\nval buttonTxt = \"ClickHere\"\n- val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n- \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n- \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n- \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n- \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n- \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n- \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n- \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n- \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n- \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\n-\n- val buttonJsonObj = JSONObject(\"{\\\"type\\\":\\\"url\\\",\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\" +\n- \"\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}\")\nval keyValuePayload = null\nctInboxListViewFragmentSpy.inboxMessages.add(CTInboxMessage(jsonObj))\n@@ -273,8 +175,10 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nctInboxListViewFragmentSpy.handleClick(position, buttonTxt, buttonJsonObj, keyValuePayload)\n//Assert\n- verify(ctInboxListViewFragmentSpy,Mockito.atLeastOnce()).\n- fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ verify(\n+ ctInboxListViewFragmentSpy,\n+ Mockito.atLeastOnce()\n+ ).fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n}\n@Test\n@@ -282,26 +186,6 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nval position = 0\nval buttonTxt = \"ClickHere\"\n- val jsonObj = JSONObject(\"{\\\"id\\\":\\\"1674122920_1674457409\\\",\\\"msg\\\":{\\\"bg\\\":\\\"#ECEDF2\\\",\" +\n- \"\\\"orientation\\\":\\\"l\\\",\\\"content\\\":[{\\\"key\\\":5385896764,\\\"message\\\":{\\\"replacements\\\":\\\"SampleMessage\\\",\" +\n- \"\\\"text\\\":\\\"SampleMessage\\\",\\\"color\\\":\\\"#434761\\\"},\\\"title\\\":{\\\"replacements\\\":\\\"SampleTitle\\\",\" +\n- \"\\\"text\\\":\\\"SampleTitle\\\",\\\"color\\\":\\\"#434761\\\"},\\\"action\\\":{\\\"hasUrl\\\":true,\\\"hasLinks\\\":true,\" +\n- \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"links\\\":[{\\\"type\\\":\\\"url\\\",\" +\n- \"\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\" +\n- \"\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}]},\\\"media\\\":{},\" +\n- \"\\\"icon\\\":{}}],\\\"type\\\":\\\"simple\\\",\\\"tags\\\":[],\\\"enableTags\\\":false},\\\"isRead\\\":true,\" +\n- \"\\\"date\\\":1674457409,\\\"wzrk_ttl\\\":1675062209,\\\"tags\\\":[\\\"\\\"],\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\" +\n- \"\\\"wzrkParams\\\":{\\\"wzrk_ttl\\\":1675062209,\\\"wzrk_id\\\":\\\"1674122920_20230123\\\",\\\"wzrk_pivot\\\":\\\"wzrk_default\\\"}}\")\n-\n- val buttonJsonObj = JSONObject(\"{\\\"type\\\":\\\"url\\\",\\\"text\\\":\\\"ClickHere\\\",\\\"color\\\":\\\"#000000\\\",\" +\n- \"\\\"bg\\\":\\\"#ffffff\\\",\\\"copyText\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"url\\\":{\\\"android\\\":{\\\"text\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\" +\n- \"\\\"replacements\\\":\\\"ctdemo:\\\\/\\\\/com.clevertap.demo\\\\/WebViewActivity\\\",\\\"og\\\":\\\"\\\"},\" +\n- \"\\\"ios\\\":{\\\"text\\\":\\\"\\\",\\\"replacements\\\":\\\"\\\",\\\"og\\\":\\\"\\\"}},\\\"kv\\\":{}}\")\nval keyValuePayload = HashMap<String, String>()\nkeyValuePayload[\"id\"] = \"123456\"\n@@ -311,7 +195,9 @@ class CTInboxListViewFragmentTest : BaseTestCase() {\nctInboxListViewFragmentSpy.handleClick(position, buttonTxt, buttonJsonObj, keyValuePayload)\n//Assert\n- verify(ctInboxListViewFragmentSpy,Mockito.never()).\n- fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n+ verify(\n+ ctInboxListViewFragmentSpy,\n+ Mockito.never()\n+ ).fireUrlThroughIntent(\"ctdemo://com.clevertap.demo/WebViewActivity\")\n}\n}\n\\ No newline at end of file\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
chore(SDK-2603) - refactor test properties
116,612
27.01.2023 12:49:35
-19,080
146aa6f903320c042eed3f169b4e7118df78d1a4
chore(push) - update changelog and core version
[ { "change_type": "MODIFY", "old_path": "CHANGELOG.md", "new_path": "CHANGELOG.md", "diff": "## CHANGE LOG.\n+### January 27, 2023\n+* [CleverTap Android SDK v4.7.4](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n+\n### January 25, 2023\n* [CleverTap Android SDK v4.7.3](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md)\n* [CleverTap RenderMax SDK v1.0.2](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTRENDERMAXCHANGELOG.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.7.3\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.7.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.7.3\", ext: 'aar')\n+ implementation (name: \"clevertap-android-sdk-4.7.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.7.3\"\n+ implementation \"com.clevertap.android:clevertap-android-sdk:4.7.4\"\nimplementation \"androidx.core:core:1.9.0\"\nimplementation \"com.google.firebase:firebase-messaging:23.0.6\"\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.7.4 (January 27, 2023)\n+* Bug fixes and performance improvements.\n+\n### Version 4.7.3 (January 25, 2023)\n* Fixes message UI for footer in-app.\n* Fixes NPE when clicked on body of InboxMessage with deep link in `CTInboxListFragment`\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.2.0\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.7.3\" // 3.9.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.7.4\" // 3.9.0 and above\nimplementation \"com.google.android.gms:play-services-location:21.0.0\"\nimplementation \"androidx.work:work-runtime:2.7.1\" // 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.7\"\n-implementation \"com.clevertap.android:clevertap-android-sdk:4.7.3\" // 4.4.0 and above\n+implementation \"com.clevertap.android:clevertap-android-sdk:4.7.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": "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.7.3\"\n+ //implementation \"com.clevertap.android:clevertap-android-sdk:4.7.4\"\nimplementation project(':clevertap-geofence')\n//implementation \"com.clevertap.android:clevertap-geofence-sdk:1.2.0\"\n" }, { "change_type": "MODIFY", "old_path": "templates/CTCORECHANGELOG.md", "new_path": "templates/CTCORECHANGELOG.md", "diff": "## CleverTap Android SDK CHANGE LOG\n+### Version 4.7.4 (January 27, 2023)\n+* Bug fixes and performance improvements.\n+\n### Version 4.7.3 (January 25, 2023)\n* Fixes message UI for footer in-app.\n* Fixes NPE when clicked on body of InboxMessage with deep link in `CTInboxListFragment`\n" }, { "change_type": "MODIFY", "old_path": "versions.properties", "new_path": "versions.properties", "diff": "@@ -286,7 +286,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.7.3\n+version.com.clevertap.android..clevertap-android-sdk=4.7.4\nversion.com.clevertap.android..clevertap-rendermax-sdk=1.0.2\nversion.com.clevertap.android..clevertap-geofence-sdk=1.2.0\nversion.com.clevertap.android..clevertap-hms-sdk=1.3.2\n" } ]
Java
MIT License
clevertap/clevertap-android-sdk
chore(push) - update changelog and core version SDK-2444
36,271
30.09.2019 16:37:39
-28,800
855c75a1f36119e5847f94a8e8c3c2bfad2108f6
update the close time on blog
[ { "change_type": "MODIFY", "old_path": "blog/en-us/meetup_2019_10_26.md", "new_path": "blog/en-us/meetup_2019_10_26.md", "diff": "Apache Dolphin Scheduler(Incubating) will organize a meetup in Shanghai 2019.10.26. Welcome to rigister online:\nhttps://www.huodongxing.com/event/6510540610400\n+The meetup will begin at 2:00 pm, and close at about 6:00 pm.\n+\n+\nThe Agenda is as following, and welcome new speaker to join us:\n* Introduction/overview of DolphinScheduler (William-GuoWei 14:00-14:20).\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
update the close time on blog (#10)
36,261
14.10.2019 10:59:45
-28,800
0fa20ee8a4e324e40bdc64d7f0b7066086e8bce7
New Note Page for Version Publishing Module
[ { "change_type": "ADD", "old_path": null, "new_path": "docs/en-us/release/note.md", "diff": "+Note\n+===\n+Both Easy Scheduler 1.1.0 and pre-1.1.0 versions are not Apache versions.\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "md_json/docs.json", "new_path": "md_json/docs.json", "diff": "\"link\": \"/en-us/docs/release/1.1.0-release.html\",\n\"meta\": {}\n},\n+ {\n+ \"filename\": \"note.md\",\n+ \"link\": \"/en-us/docs/release/note.html\",\n+ \"meta\": {}\n+ },\n{\n\"filename\": \"upgrade.md\",\n\"link\": \"/en-us/docs/release/upgrade.html\",\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
New Note Page for Version Publishing Module
36,276
30.10.2019 11:50:45
-28,800
edc226741c605b9aee8aa4b2f14ea5fb54cdf75b
2019-10-26 meetup
[ { "change_type": "DELETE", "old_path": ".github/workflows/ci.yml", "new_path": null, "diff": "-name: CI\n-\n-on: [push]\n-\n-jobs:\n- build:\n-\n- runs-on: ubuntu-latest\n-\n- steps:\n- - uses: actions/checkout@v1\n- - name: Run a one-line script\n- run: echo Hello, world!\n- - name: Run a multi-line script\n- run: |\n- echo Add other actions to build,\n- echo test, and deploy your project.\n" }, { "change_type": "MODIFY", "old_path": ".github/workflows/website.yml", "new_path": ".github/workflows/website.yml", "diff": "@@ -16,4 +16,4 @@ jobs:\nBASE_BRANCH: master # The branch the action should deploy from.\nBRANCH: asf-site # The branch the action should deploy to.\nFOLDER: dist # The folder the action should deploy.\n- BUILD_SCRIPT: mkdir dist && npm install && npm i docsite && node_modules/docsite/bin/docsite.js build && cp -r 404.html index.html en-us zh-cn build img dist/ # The build script the action should run prior to deploying.\n+ BUILD_SCRIPT: mkdir dist && npm install && npm i docsite && node_modules/docsite/bin/docsite.js build && cp -r 404.html index.html en-us zh-cn build img download dist/ # The build script the action should run prior to deploying.\n" }, { "change_type": "ADD", "old_path": "download/2019-10-26/DolphinScheduler_dailidong.pptx", "new_path": "download/2019-10-26/DolphinScheduler_dailidong.pptx", "diff": "Binary files /dev/null and b/download/2019-10-26/DolphinScheduler_dailidong.pptx differ\n" }, { "change_type": "ADD", "old_path": "download/2019-10-26/DolphinScheduler_guowei.pptx", "new_path": "download/2019-10-26/DolphinScheduler_guowei.pptx", "diff": "Binary files /dev/null and b/download/2019-10-26/DolphinScheduler_guowei.pptx differ\n" }, { "change_type": "ADD", "old_path": "download/2019-10-26/DolphinScheduler_qiaozhanwei.pptx", "new_path": "download/2019-10-26/DolphinScheduler_qiaozhanwei.pptx", "diff": "Binary files /dev/null and b/download/2019-10-26/DolphinScheduler_qiaozhanwei.pptx differ\n" }, { "change_type": "ADD", "old_path": "download/2019-10-26/DolphinScheduler_zhangzongyao.pptx", "new_path": "download/2019-10-26/DolphinScheduler_zhangzongyao.pptx", "diff": "Binary files /dev/null and b/download/2019-10-26/DolphinScheduler_zhangzongyao.pptx differ\n" }, { "change_type": "ADD", "old_path": "download/2019-10-26/Dolphinescheduler_baoqiwu.pptx", "new_path": "download/2019-10-26/Dolphinescheduler_baoqiwu.pptx", "diff": "Binary files /dev/null and b/download/2019-10-26/Dolphinescheduler_baoqiwu.pptx differ\n" }, { "change_type": "ADD", "old_path": "img/2019-10-26-discussion.jpg", "new_path": "img/2019-10-26-discussion.jpg", "diff": "Binary files /dev/null and b/img/2019-10-26-discussion.jpg differ\n" }, { "change_type": "ADD", "old_path": "img/2019-10-26-user.jpg", "new_path": "img/2019-10-26-user.jpg", "diff": "Binary files /dev/null and b/img/2019-10-26-user.jpg differ\n" }, { "change_type": "ADD", "old_path": "img/meetup_20191026.jpg", "new_path": "img/meetup_20191026.jpg", "diff": "Binary files /dev/null and b/img/meetup_20191026.jpg differ\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
2019-10-26 meetup (#19)
36,276
01.11.2019 00:13:32
-28,800
bb5607483094f919e27450357fbd61f09f0c2ad0
modify auto deploy
[ { "change_type": "MODIFY", "old_path": ".github/workflows/website.yml", "new_path": ".github/workflows/website.yml", "diff": "@@ -9,11 +9,19 @@ jobs:\n- name: Checkout\nuses: actions/checkout@master\n- - name: Build and Deploy\n- uses: JamesIves/github-pages-deploy-action@master\n+ - name: Use Node.js\n+ uses: actions/setup-node@v1\n+ with:\n+ node-version: 8.16.2\n+ - name: Build\n+ run: |\n+ mkdir dist && npm install && npm i docsite && node_modules/docsite/bin/docsite.js build && cp -r 404.html index.html en-us zh-cn build img download dist/\n+\n+ - name: Deploy\n+ uses: peaceiris/[email protected]\nenv:\n- ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}\n- BASE_BRANCH: master # The branch the action should deploy from.\n- BRANCH: asf-site # The branch the action should deploy to.\n- FOLDER: dist # The folder the action should deploy.\n- BUILD_SCRIPT: mkdir dist && npm install && npm i docsite && node_modules/docsite/bin/docsite.js build && cp -r 404.html index.html en-us zh-cn build img download dist/ # The build script the action should run prior to deploying.\n+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}\n+ PUBLISH_BRANCH: asf-site\n+ PUBLISH_DIR: ./dist\n+ with:\n+ keepFiles: true\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
modify auto deploy
36,285
06.11.2019 18:19:06
-28,800
4596fe80488a4e371f253e64f79fa324e81b9970
remove release notes.
[ { "change_type": "DELETE", "old_path": "docs/en-us/release/1.0.1-release.md", "new_path": null, "diff": "-DolphinScheduler Release 1.0.1(Not Apache Release)\n-===\n-Easy Scheduler 1.0.1 is the second version in the 1.x series. The update is as follows:\n-\n-- 1,outlook TSL email support\n-- 2,servlet and protobuf jar conflict resolution\n-- 3,create a tenant and establish a Linux user at the same time\n-- 4,the re-run time is negative\n-- 5,stand-alone and cluster can be deployed with one click of install.sh\n-- 6,queue support interface added\n-- 7,escheduler.t_escheduler_queue added create_time and update_time fields\n-\n-\n-\n-\n-\n" }, { "change_type": "DELETE", "old_path": "docs/en-us/release/1.0.4-release.md", "new_path": null, "diff": "-# 1.0.4 release\n-\n" }, { "change_type": "DELETE", "old_path": "docs/en-us/release/1.0.5-release.md", "new_path": null, "diff": "-# 1.0.5 release\n-\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
remove release notes.
36,285
21.11.2019 15:13:47
-28,800
bb5c2e046bd329c22bc5a240a9382a3811189bc7
delete release before 1.1.0
[ { "change_type": "MODIFY", "old_path": "md_json/docs.json", "new_path": "md_json/docs.json", "diff": "\"link\": \"/en-us/docs/faq.html\",\n\"meta\": {}\n},\n- {\n- \"filename\": \"1.0.1-release.md\",\n- \"link\": \"/en-us/docs/release/1.0.1-release.html\",\n- \"meta\": {}\n- },\n- {\n- \"filename\": \"1.0.2-release.md\",\n- \"link\": \"/en-us/docs/release/1.0.2-release.html\",\n- \"meta\": {}\n- },\n- {\n- \"filename\": \"1.0.3-release.md\",\n- \"link\": \"/en-us/docs/release/1.0.3-release.html\",\n- \"meta\": {}\n- },\n- {\n- \"filename\": \"1.0.4-release.md\",\n- \"link\": \"/en-us/docs/release/1.0.4-release.html\",\n- \"meta\": {}\n- },\n- {\n- \"filename\": \"1.0.5-release.md\",\n- \"link\": \"/en-us/docs/release/1.0.5-release.html\",\n- \"meta\": {}\n- },\n- {\n- \"filename\": \"1.1.0-release.md\",\n- \"link\": \"/en-us/docs/release/1.1.0-release.html\",\n- \"meta\": {}\n- },\n{\n\"filename\": \"note.md\",\n\"link\": \"/en-us/docs/release/note.html\",\n\"link\": \"/zh-cn/docs/faq.html\",\n\"meta\": {}\n},\n- {\n- \"filename\": \"1.0.1-release.md\",\n- \"link\": \"/zh-cn/docs/release/1.0.1-release.html\",\n- \"meta\": {}\n- },\n- {\n- \"filename\": \"1.0.2-release.md\",\n- \"link\": \"/zh-cn/docs/release/1.0.2-release.html\",\n- \"meta\": {}\n- },\n- {\n- \"filename\": \"1.0.3-release.md\",\n- \"link\": \"/zh-cn/docs/release/1.0.3-release.html\",\n- \"meta\": {}\n- },\n- {\n- \"filename\": \"1.0.4-release.md\",\n- \"link\": \"/zh-cn/docs/release/1.0.4-release.html\",\n- \"meta\": {}\n- },\n- {\n- \"filename\": \"1.0.5-release.md\",\n- \"link\": \"/zh-cn/docs/release/1.0.5-release.html\",\n- \"meta\": {}\n- },\n- {\n- \"filename\": \"1.1.0-release.md\",\n- \"link\": \"/zh-cn/docs/release/1.1.0-release.html\",\n- \"meta\": {}\n- },\n{\n\"filename\": \"note.md\",\n\"link\": \"/zh-cn/docs/release/note.html\",\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
delete release before 1.1.0
36,261
27.11.2019 21:51:06
-28,800
c162a29f26d3be740d104b4d8547fc31ddfff98b
Modify menu font style
[ { "change_type": "MODIFY", "old_path": "docs/en-us/user_doc/system-manual.md", "new_path": "docs/en-us/user_doc/system-manual.md", "diff": "<p align=\"center\">\n<img src=\"/img/process_definitions_en.png\" width=\"60%\" />\n</p>\n- - Increase the order of execution between nodes: click \"line connection\". As shown, task 1 and task 3 are executed in parallel. When task 1 is executed, task 2 and task 3 are executed simultaneously.\n+ - Increase the order of execution between nodes: click \"line connection\". As shown, task 2 and task 3 are executed in parallel. When task 1 is executed, task 2 and task 3 are executed simultaneously.\n<p align=\"center\">\n<img src=\"/img/task_en.png\" width=\"60%\" />\n" }, { "change_type": "MODIFY", "old_path": "src/components/header/index.jsx", "new_path": "src/components/header/index.jsx", "diff": "@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';\nimport classnames from 'classnames';\nimport { autobind } from 'core-decorators';\nimport siteConfig from '../../../site_config/site';\n-import { getLink } from '../../../utils';\n+import { getScrollTop,getLink } from '../../../utils';\nimport 'antd/dist/antd.css';\nimport './index.scss';\nimport { Menu, Icon } from 'antd'\n@@ -55,7 +55,20 @@ class Header extends React.Component {\ninputVisible: false,\n};\n}\n-\n+ componentDidMount() {\n+ window.addEventListener('scroll', () => {\n+ const scrollTop = getScrollTop();\n+ if (scrollTop > 66) {\n+ this.setState({\n+ type: 'normal',\n+ });\n+ } else {\n+ this.setState({\n+ type: 'primary',\n+ });\n+ }\n+ });\n+ }\nstate = {\ncurrent: 'home',\n}\n@@ -193,7 +206,7 @@ class Header extends React.Component {\nonClick={this.toggleMenu}\nsrc={type === 'primary' ? getLink('/img/system/menu_white.png') : getLink('/img/system/menu_gray.png')}\n/>\n- <Menu onClick={this.handleClick} selectedKeys={[this.state.current]} mode=\"horizontal\">\n+ <Menu className={type === 'primary'? 'whiteClass': 'blackClass'} onClick={this.handleClick} selectedKeys={[this.state.current]} mode=\"horizontal\">\n{siteConfig[language].pageMenu.map(item => (\nitem.children ? <SubMenu\ntitle={\n" }, { "change_type": "MODIFY", "old_path": "src/components/header/index.scss", "new_path": "src/components/header/index.scss", "diff": "font-size: 14px;\nvertical-align: bottom;\n}\n+ .whiteClass{\n+ .ant-menu-item {\n+ a {\n+ color: #fff;\n+ opacity: 0.6;\n+ font-family: Avenir-Medium;\n+ }\n+ }\n+ }\n+ .blackClass {\n+ .ant-menu-item {\n+ a {\n+ color: #333;\n+ font-family: Avenir-Medium;\n+ }\n+ }\n+ }\n+ .whiteClass {\n+ .ant-menu-submenu-title {\n+ .submenu-title-wrapper {\n+ color: #fff;\n+ font-family: Avenir-Medium;\n+ }\n+ }\n+ }\n+ .blackClass {\n+ .ant-menu-submenu-title {\n+ .submenu-title-wrapper {\n+ color: #333;\n+ font-family: Avenir-Medium;\n+ }\n+ }\n+ }\n.menu-item-primary {\na {\ncolor: #fff;\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
Modify menu font style
36,278
28.11.2019 22:31:42
-28,800
32ed1a5849292ebe854530187805eb42f43346a4
add .asf.yaml to dist add .asf.yaml to dist
[ { "change_type": "MODIFY", "old_path": ".github/workflows/website.yml", "new_path": ".github/workflows/website.yml", "diff": "@@ -15,7 +15,7 @@ jobs:\nnode-version: 8.16.2\n- name: Build\nrun: |\n- mkdir dist && npm install && npm i docsite && node_modules/docsite/bin/docsite.js build && cp -r 404.html index.html en-us zh-cn build img download dist/\n+ mkdir dist && npm install && npm i docsite && node_modules/docsite/bin/docsite.js build && cp -r 404.html .asf.yaml index.html en-us zh-cn build img download dist/\n- name: Deploy\nuses: peaceiris/[email protected]\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
add .asf.yaml to dist add .asf.yaml to dist
36,261
29.11.2019 17:32:11
-28,800
e7bbc7fe2f510767941c34e277206f60934d3913
Added English page for plugin development page, migrated developer guide to developer, removed blog system architecture design page and style modification
[ { "change_type": "RENAME", "old_path": "docs/en-us/developer_guide/architecture-design.md", "new_path": "docs/en-us/development/architecture-design.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/en-us/developer_guide/backend-development.md", "new_path": "docs/en-us/development/backend-development.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/en-us/developer_guide/frontend-development.md", "new_path": "docs/en-us/development/frontend-development.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/zh-cn/developer_guide/backend-development.md", "new_path": "docs/zh-cn/development/backend-development.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/zh-cn/developer_guide/frontend-development.md", "new_path": "docs/zh-cn/development/frontend-development.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/zh-cn/developer_guide/plugin-development.md", "new_path": "docs/zh-cn/development/plugin-development.md", "diff": "" }, { "change_type": "MODIFY", "old_path": "md_json/docs.json", "new_path": "md_json/docs.json", "diff": "\"en-us\": [\n{\n\"filename\": \"architecture-design.md\",\n- \"link\": \"/en-us/docs/developer_guide/architecture-design.html\",\n+ \"link\": \"/en-us/docs/development/architecture-design.html\",\n\"meta\": {}\n},\n{\n\"filename\": \"backend-development.md\",\n- \"link\": \"/en-us/docs/developer_guide/backend-development.html\",\n- \"meta\": {}\n- },\n- {\n- \"filename\": \"frontend-development.md\",\n- \"link\": \"/en-us/docs/developer_guide/frontend-development.html\",\n+ \"link\": \"/en-us/docs/development/backend-development.html\",\n\"meta\": {}\n},\n{\n\"link\": \"/en-us/docs/development/developers.html\",\n\"meta\": {}\n},\n+ {\n+ \"filename\": \"frontend-development.md\",\n+ \"link\": \"/en-us/docs/development/frontend-development.html\",\n+ \"meta\": {}\n+ },\n+ {\n+ \"filename\": \"plugin-development.md\",\n+ \"link\": \"/en-us/docs/development/plugin-development.html\",\n+ \"meta\": {}\n+ },\n{\n\"filename\": \"faq.md\",\n\"link\": \"/en-us/docs/faq.html\",\n\"zh-cn\": [\n{\n\"filename\": \"architecture-design.md\",\n- \"link\": \"/zh-cn/docs/developer_guide/architecture-design.html\",\n+ \"link\": \"/zh-cn/docs/development/architecture-design.html\",\n\"meta\": {}\n},\n{\n\"filename\": \"backend-development.md\",\n- \"link\": \"/zh-cn/docs/developer_guide/backend-development.html\",\n+ \"link\": \"/zh-cn/docs/development/backend-development.html\",\n\"meta\": {}\n},\n{\n- \"filename\": \"frontend-development.md\",\n- \"link\": \"/zh-cn/docs/developer_guide/frontend-development.html\",\n+ \"filename\": \"contribute.md\",\n+ \"link\": \"/zh-cn/docs/development/contribute.html\",\n\"meta\": {}\n},\n{\n- \"filename\": \"plugin-development.md\",\n- \"link\": \"/zh-cn/docs/developer_guide/plugin-development.html\",\n+ \"filename\": \"developers.md\",\n+ \"link\": \"/zh-cn/docs/development/developers.html\",\n\"meta\": {}\n},\n{\n- \"filename\": \"contribute.md\",\n- \"link\": \"/zh-cn/docs/development/contribute.html\",\n+ \"filename\": \"frontend-development.md\",\n+ \"link\": \"/zh-cn/docs/development/frontend-development.html\",\n\"meta\": {}\n},\n{\n- \"filename\": \"developers.md\",\n- \"link\": \"/zh-cn/docs/development/developers.html\",\n+ \"filename\": \"plugin-development.md\",\n+ \"link\": \"/zh-cn/docs/development/plugin-development.html\",\n\"meta\": {}\n},\n{\n" }, { "change_type": "MODIFY", "old_path": "src/components/header/index.jsx", "new_path": "src/components/header/index.jsx", "diff": "@@ -48,6 +48,7 @@ class Header extends React.Component {\nconstructor(props) {\nsuper(props);\nthis.state = {\n+ current: '',\nmenuBodyVisible: false,\nlanguage: props.language,\nsearch: siteConfig.defaultSearch,\n@@ -69,15 +70,6 @@ class Header extends React.Component {\n}\n});\n}\n- state = {\n- current: 'home',\n- }\n-\n- handleClick = e => {\n- this.setState({\n- current: e.key,\n- });\n- }\ncomponentWillReceiveProps(nextProps) {\nthis.setState({\n@@ -85,9 +77,11 @@ class Header extends React.Component {\n});\n}\n- toggleMenu() {\n+\n+\n+ handleClick = e => {\nthis.setState({\n- menuBodyVisible: !this.state.menuBodyVisible,\n+ current: e.key,\n});\n}\n@@ -206,6 +200,7 @@ class Header extends React.Component {\nonClick={this.toggleMenu}\nsrc={type === 'primary' ? getLink('/img/system/menu_white.png') : getLink('/img/system/menu_gray.png')}\n/>\n+ <div>\n<Menu className={type === 'primary'? 'whiteClass': 'blackClass'} onClick={this.handleClick} selectedKeys={[this.state.current]} mode=\"horizontal\">\n{siteConfig[language].pageMenu.map(item => (\nitem.children ? <SubMenu\n@@ -227,6 +222,7 @@ class Header extends React.Component {\n</Menu>\n</div>\n</div>\n+ </div>\n</header>\n);\n}\n" }, { "change_type": "MODIFY", "old_path": "src/pages/blogDetail/index.scss", "new_path": "src/pages/blogDetail/index.scss", "diff": ".blog-content {\npadding: 80px 20%;\nmargin: $headerHeight auto 0;\n- max-width: 735px;\n+ min-width: 735px;\n}\n}\n\\ No newline at end of file\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
Added English page for plugin development page, migrated developer guide to developer, removed blog system architecture design page and style modification
36,278
30.11.2019 18:04:31
-28,800
50342c22135107f9d2df4f33eaa52affcb5f57dc
update document add subscribe
[ { "change_type": "ADD", "old_path": null, "new_path": "docs/en-us/user_doc/subscribe.md", "diff": "+It is highly recommended to subscribe to the development mailing list to keep up-to-date with the community.\n+\n+In the process of using DolphinScheduler, if you have any questions or ideas, suggestions, you can participate in the DolphinScheduler community building through the Apache mailing list. Sending a subscription email is also very simple, the steps are as follows:\n+\n+1. Send an email to [email protected] with your own email address, subject and content.\n+\n+2. Receive confirmation email and reply. After completing step 1, you will receive a confirmation email from [email protected] (if not received, please confirm whether the email is automatically classified as spam, promotion email, subscription email, etc.) . Then reply directly to the email, or click on the link in the email to reply quickly, the subject and content are arbitrary.\n+\n+3. Receive a welcome email. After completing the above steps, you will receive a welcome email with the subject WELCOME to [email protected], and you have successfully subscribed to the Apache DolphinScheduler (Incubating) mailing list.\n" }, { "change_type": "MODIFY", "old_path": "md_json/docs.json", "new_path": "md_json/docs.json", "diff": "\"link\": \"/en-us/docs/user_doc/frontend-deployment.html\",\n\"meta\": {}\n},\n+ {\n+ \"filename\": \"subscribe.md\",\n+ \"link\": \"/en-us/docs/user_doc/subscribe.html\",\n+ \"meta\": {}\n+ },\n{\n\"filename\": \"quick-start.md\",\n\"link\": \"/en-us/docs/user_doc/quick-start.html\",\n\"link\": \"/zh-cn/docs/user_doc/frontend-deployment.html\",\n\"meta\": {}\n},\n+ {\n+ \"filename\": \"subscribe.md\",\n+ \"link\": \"/zh-cn/docs/user_doc/subscribe.html\",\n+ \"meta\": {}\n+ },\n{\n\"filename\": \"quick-start.md\",\n\"link\": \"/zh-cn/docs/user_doc/quick-start.html\",\n" }, { "change_type": "MODIFY", "old_path": "site_config/development.js", "new_path": "site_config/development.js", "diff": "@@ -12,14 +12,14 @@ export default {\ntitle: 'Backend Development',\nlink: '/en-us/docs/development/backend-development.html',\n},\n+ {\n+ title: 'Frontend Development',\n+ link: '/en-us/docs/development/frontend-development.html',\n+ },\n{\ntitle: 'plugin-development',\nlink: '/en-us/docs/development/plugin-development.html',\n},\n- {\n- title: 'Frontend Development',\n- link: '/en-us/docs/development/frontend-development.html',\n- }\n],\n},\n{\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
update document add subscribe
36,283
03.12.2019 15:00:19
-28,800
d88e93b0d496d82ac38f7171dfe04e8012fc1c04
[dolphinscheduler-1197] [bug] wrong spell Changelog category: * Bug Detailed description: fix the wrong spell, and set the img src with static path
[ { "change_type": "MODIFY", "old_path": "docs/en-us/development/architecture-design.md", "new_path": "docs/en-us/development/architecture-design.md", "diff": "@@ -147,7 +147,7 @@ DolphinScheduler uses ZooKeeper distributed locks to implement only one Master t\n2. Scheduler thread distributed lock implementation flow chart in DolphinScheduler:\n<p align=\"center\">\n- <img src=\"https://analysys.github.io/easyscheduler_docs_cn/images/distributed_lock_procss.png\" alt=\"Get Distributed Lock Process\" width=\"50%\" />\n+ <img src=\"/img/distributed_lock_procss.png\" alt=\"Get Distributed Lock Process\" width=\"50%\" />\n</p>\n##### Third, the thread is insufficient loop waiting problem\n" }, { "change_type": "ADD", "old_path": "img/distributed_lock_procss.png", "new_path": "img/distributed_lock_procss.png", "diff": "Binary files /dev/null and b/img/distributed_lock_procss.png differ\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
[dolphinscheduler-1197] [bug] wrong spell Changelog category: * Bug Detailed description: fix the wrong spell, and set the img src with static path
36,261
05.12.2019 13:58:50
-28,800
76bd5414de317cc99353f869ff02cc3b742c3c43
Developer image replacement
[ { "change_type": "ADD", "old_path": "img/dag_examples_cn.jpg", "new_path": "img/dag_examples_cn.jpg", "diff": "Binary files /dev/null and b/img/dag_examples_cn.jpg differ\n" }, { "change_type": "MODIFY", "old_path": "img/edit-datasource-en.png", "new_path": "img/edit-datasource-en.png", "diff": "Binary files a/img/edit-datasource-en.png and b/img/edit-datasource-en.png differ\n" }, { "change_type": "MODIFY", "old_path": "img/hive-en.png", "new_path": "img/hive-en.png", "diff": "Binary files a/img/hive-en.png and b/img/hive-en.png differ\n" }, { "change_type": "MODIFY", "old_path": "img/spark_datesource.png", "new_path": "img/spark_datesource.png", "diff": "Binary files a/img/spark_datesource.png and b/img/spark_datesource.png differ\n" }, { "change_type": "MODIFY", "old_path": "img/sparksql_kerberos.png", "new_path": "img/sparksql_kerberos.png", "diff": "Binary files a/img/sparksql_kerberos.png and b/img/sparksql_kerberos.png differ\n" }, { "change_type": "MODIFY", "old_path": "img/zookeeper-en.png", "new_path": "img/zookeeper-en.png", "diff": "Binary files a/img/zookeeper-en.png and b/img/zookeeper-en.png differ\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
Developer image replacement
36,261
05.12.2019 17:53:21
-28,800
686dd98f729f4b07b2509552fce6c5ed3bd29b09
Change system user manual link address and English translation
[ { "change_type": "MODIFY", "old_path": "docs/en-us/development/architecture-design.md", "new_path": "docs/en-us/development/architecture-design.md", "diff": "@@ -98,7 +98,7 @@ Before explaining the architecture of the schedule system, let us first understa\n- **UI**\n- The front-end page of the system provides various visual operation interfaces of the system. For details, see the **[System User Manual] (System User Manual.md)** section.\n+ The front-end page of the system provides various visual operation interfaces of the system. For details, see the <a href=\"/en-us/docs/user_doc/system-manual.html\" target=\"_self\">System User Manual</a> section.\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
Change system user manual link address and English translation
36,276
09.12.2019 08:53:42
-28,800
38d2be6b9004923f6d1fd924add4389a48add8f5
seo optimization
[ { "change_type": "MODIFY", "old_path": ".github/workflows/website.yml", "new_path": ".github/workflows/website.yml", "diff": "@@ -15,7 +15,7 @@ jobs:\nnode-version: 8.16.2\n- name: Build\nrun: |\n- mkdir dist && npm install && npm i docsite && node_modules/docsite/bin/docsite.js build && cp -r 404.html .asf.yaml index.html en-us zh-cn build img download dist/\n+ mkdir dist && npm install && npm i docsite && node_modules/docsite/bin/docsite.js build && cp -r baidu_verify_D9hyOepqUF.html googleff48c3fa45891a20.html sitemap.xml 404.html .asf.yaml index.html en-us zh-cn build img download dist/\n- name: Deploy\nuses: peaceiris/[email protected]\n" }, { "change_type": "ADD", "old_path": null, "new_path": "baidu_verify_D9hyOepqUF.html", "diff": "+D9hyOepqUF\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "googleff48c3fa45891a20.html", "diff": "+google-site-verification: googleff48c3fa45891a20.html\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "sitemap.xml", "diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<urlset\n+ xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\"\n+ xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n+ xsi:schemaLocation=\"http://www.sitemaps.org/schemas/sitemap/0.9\n+ http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd\">\n+<!-- created with Free Online Sitemap Generator www.xml-sitemaps.com -->\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/zh-cn/index.html</loc>\n+ <lastmod>2019-11-29T12:00:11+00:00</lastmod>\n+ <priority>1.00</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/zh-cn/blog/index.html</loc>\n+ <lastmod>2019-11-29T12:00:11+00:00</lastmod>\n+ <priority>0.80</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/zh-cn/docs/development/architecture-design.html</loc>\n+ <lastmod>2019-12-06T08:48:28+00:00</lastmod>\n+ <priority>0.80</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/zh-cn/community/index.html</loc>\n+ <lastmod>2019-11-29T12:00:11+00:00</lastmod>\n+ <priority>0.80</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/zh-cn/docs/user_doc/quick-start.html</loc>\n+ <lastmod>2019-12-05T02:33:24+00:00</lastmod>\n+ <priority>0.80</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/zh-cn/docs/development/developers.html</loc>\n+ <lastmod>2019-11-30T10:08:21+00:00</lastmod>\n+ <priority>0.80</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/zh-cn/blog/meetup_2019_10_26.html</loc>\n+ <lastmod>2019-11-29T12:00:11+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/zh-cn/docs/user_doc/backend-deployment.html</loc>\n+ <lastmod>2019-12-03T08:58:53+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/zh-cn/docs/user_doc/frontend-deployment.html</loc>\n+ <lastmod>2019-12-03T03:56:27+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/zh-cn/docs/user_doc/system-manual.html</loc>\n+ <lastmod>2019-12-05T02:33:24+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/zh-cn/docs/user_doc/subscribe.html</loc>\n+ <lastmod>2019-12-01T00:58:51+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/zh-cn/docs/release/upgrade.html</loc>\n+ <lastmod>2019-11-30T10:08:21+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/zh-cn/docs/faq.html</loc>\n+ <lastmod>2019-11-30T10:08:21+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/zh-cn/blog/architecture-design.html</loc>\n+ <lastmod>2019-12-05T06:07:06+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/en-us/index.html</loc>\n+ <lastmod>2019-11-29T12:00:11+00:00</lastmod>\n+ <priority>1.00</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/en-us/blog/index.html</loc>\n+ <lastmod>2019-11-29T12:00:11+00:00</lastmod>\n+ <priority>0.80</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/en-us/docs/development/architecture-design.html</loc>\n+ <lastmod>2019-12-06T08:48:28+00:00</lastmod>\n+ <priority>0.80</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/en-us/community/index.html</loc>\n+ <lastmod>2019-11-29T12:00:11+00:00</lastmod>\n+ <priority>0.80</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/en-us/docs/user_doc/quick-start.html</loc>\n+ <lastmod>2019-12-05T02:33:24+00:00</lastmod>\n+ <priority>0.80</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/en-us/docs/development/developers.html</loc>\n+ <lastmod>2019-11-30T10:08:21+00:00</lastmod>\n+ <priority>0.80</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/en-us/blog/meetup_2019_10_26.html</loc>\n+ <lastmod>2019-11-29T12:00:11+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/en-us/docs/user_doc/backend-deployment.html</loc>\n+ <lastmod>2019-12-03T08:58:53+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/en-us/docs/user_doc/frontend-deployment.html</loc>\n+ <lastmod>2019-12-03T03:56:27+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/en-us/docs/user_doc/system-manual.html</loc>\n+ <lastmod>2019-12-05T02:33:24+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/en-us/docs/user_doc/subscribe.html</loc>\n+ <lastmod>2019-11-30T10:08:21+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/en-us/docs/release/upgrade.html</loc>\n+ <lastmod>2019-11-30T10:08:21+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/en-us/docs/faq.html</loc>\n+ <lastmod>2019-11-30T10:08:21+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+<url>\n+ <loc>https://dolphinscheduler.apache.org/en-us/blog/architecture-design.html</loc>\n+ <lastmod>2019-12-05T06:07:06+00:00</lastmod>\n+ <priority>0.64</priority>\n+</url>\n+\n+\n+</urlset>\n\\ No newline at end of file\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
seo optimization
36,276
10.12.2019 09:07:14
-28,800
dd04436ed3add7effbe95e40f50c94488e777700
github action build files
[ { "change_type": "MODIFY", "old_path": ".github/workflows/website.yml", "new_path": ".github/workflows/website.yml", "diff": "@@ -15,7 +15,7 @@ jobs:\nnode-version: 8.16.2\n- name: Build\nrun: |\n- mkdir dist && npm install && npm i docsite && node_modules/docsite/bin/docsite.js build && cp -r baidu_verify_D9hyOepqUF.html googleff48c3fa45891a20.html sitemap.xml 404.html .asf.yaml index.html en-us zh-cn build img download dist/\n+ mkdir dist && npm install && npm i docsite && node_modules/docsite/bin/docsite.js build && cp -r baidu_verify_*.html googleff48c3fa45891a20.html sitemap.xml 404.html .asf.yaml index.html en-us zh-cn build img download dist/\n- name: Deploy\nuses: peaceiris/[email protected]\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
github action build files
36,278
11.12.2019 13:00:53
-28,800
83b559f516b38999bfb745d90d3f85ec2affa6f8
upload meetup pics and ppts
[ { "change_type": "ADD", "old_path": "download/2019-12-08/DolphinScheduler_liuxiaochun.pptx", "new_path": "download/2019-12-08/DolphinScheduler_liuxiaochun.pptx", "diff": "Binary files /dev/null and b/download/2019-12-08/DolphinScheduler_liuxiaochun.pptx differ\n" }, { "change_type": "ADD", "old_path": "download/2019-12-08/DolphinScheduler_yangshuang.pptx", "new_path": "download/2019-12-08/DolphinScheduler_yangshuang.pptx", "diff": "Binary files /dev/null and b/download/2019-12-08/DolphinScheduler_yangshuang.pptx differ\n" }, { "change_type": "ADD", "old_path": "download/2019-12-08/ShardingSphere_panjuan.pptx", "new_path": "download/2019-12-08/ShardingSphere_panjuan.pptx", "diff": "Binary files /dev/null and b/download/2019-12-08/ShardingSphere_panjuan.pptx differ\n" }, { "change_type": "ADD", "old_path": "download/2019-12-08/ShardingSphere_zhangyonglun.pptx", "new_path": "download/2019-12-08/ShardingSphere_zhangyonglun.pptx", "diff": "Binary files /dev/null and b/download/2019-12-08/ShardingSphere_zhangyonglun.pptx differ\n" }, { "change_type": "ADD", "old_path": "img/2019-12-08/941576036700_.pic_hd.jpg", "new_path": "img/2019-12-08/941576036700_.pic_hd.jpg", "diff": "Binary files /dev/null and b/img/2019-12-08/941576036700_.pic_hd.jpg differ\n" }, { "change_type": "ADD", "old_path": "img/2019-12-08/951576036704_.pic_hd.jpg", "new_path": "img/2019-12-08/951576036704_.pic_hd.jpg", "diff": "Binary files /dev/null and b/img/2019-12-08/951576036704_.pic_hd.jpg differ\n" }, { "change_type": "ADD", "old_path": "img/2019-12-08/961576036709_.pic_hd.jpg", "new_path": "img/2019-12-08/961576036709_.pic_hd.jpg", "diff": "Binary files /dev/null and b/img/2019-12-08/961576036709_.pic_hd.jpg differ\n" }, { "change_type": "ADD", "old_path": "img/2019-12-08/971576036713_.pic_hd.jpg", "new_path": "img/2019-12-08/971576036713_.pic_hd.jpg", "diff": "Binary files /dev/null and b/img/2019-12-08/971576036713_.pic_hd.jpg differ\n" }, { "change_type": "ADD", "old_path": "img/2019-12-08/981576036714_.pic.jpg", "new_path": "img/2019-12-08/981576036714_.pic.jpg", "diff": "Binary files /dev/null and b/img/2019-12-08/981576036714_.pic.jpg differ\n" }, { "change_type": "ADD", "old_path": "img/2019-12-08/991576036717_.pic_hd.jpg", "new_path": "img/2019-12-08/991576036717_.pic_hd.jpg", "diff": "Binary files /dev/null and b/img/2019-12-08/991576036717_.pic_hd.jpg differ\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
upload meetup pics and ppts
36,335
17.12.2019 23:19:45
-28,800
23cfe2ac7ff2ba81c84efa3feddfbbaf1f973500
modify document format
[ { "change_type": "MODIFY", "old_path": "docs/en-us/development/architecture-design.md", "new_path": "docs/en-us/development/architecture-design.md", "diff": "@@ -24,7 +24,7 @@ Before explaining the architecture of the schedule system, let us first understa\n**Timed schedule**: The system uses **quartz** distributed scheduler and supports the generation of cron expression visualization\n-**Dependency**: The system does not only support **DAG** Simple dependencies between predecessors and successor nodes, but also provides **task dependencies** nodes, support for custom task dependencies between processes**\n+**Dependency**: The system does not only support **DAG** Simple dependencies between predecessors and successor nodes, but also provides **task dependencies** nodes, support for **custom task dependencies between processes**\n**Priority**: Supports the priority of process instances and task instances. If the process instance and task instance priority are not set, the default is first in, first out.\n@@ -212,7 +212,7 @@ Once the Master Scheduler thread finds the task instance as \"need to be fault to\nHere we must first distinguish between the concept of task failure retry, process failure recovery, and process failure rerun:\n- Task failure Retry is task level, which is automatically performed by the scheduling system. For example, if a shell task sets the number of retries to 3 times, then the shell task will try to run up to 3 times after failing to run.\n-- Process failure recovery is process level, is done manually, recovery can only be performed from the failed node ** or ** from the current node **\n+- Process failure recovery is process level, is done manually, recovery can only be performed **from the failed node** or **from the current node**\n- Process failure rerun is also process level, is done manually, rerun is from the start node\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
modify document format
36,269
18.12.2019 16:02:38
-28,800
6ebbd2d720783a3da91ba8ab4560a6a241577ee2
Modify English link jump
[ { "change_type": "MODIFY", "old_path": "docs/en-us/user_doc/system-manual.md", "new_path": "docs/en-us/user_doc/system-manual.md", "diff": "@@ -52,7 +52,7 @@ The homepage contains task status statistics, process status statistics, and wor\n<img src=\"/img/global_parameters_en.png\" width=\"80%\" />\n</p>\n- - For other types of nodes, refer to [task node types and parameter settings](#task node types and parameter settings)\n+ - For other types of nodes, refer to [task node types and parameter settings](#TaskNodeType)\n### Execution process definition\n- **The process definition of the off-line state can be edited, but not run**, so the on-line workflow is the first step.\n@@ -505,7 +505,7 @@ conf/common/hadoop.properties\n- Number of tasks to run: statistics of task_queue data in zookeeper\n- Number of tasks to be killed: statistics of task_kill in zookeeper\n-## Task Node Type and Parameter Setting\n+## <span id=TaskNodeType>Task Node Type and Parameter Setting</span>\n### Shell\n@@ -720,7 +720,7 @@ Note: JAVA and Scala are just used for identification, no difference. If it's a\n* First N minutes: $[HHmmss-N/24/60]\n-### User-defined parameters\n+### <span id=CustomParameters>User-defined parameters</span>\n- User-defined parameters are divided into global parameters and local parameters. Global parameters are the global parameters passed when the process definition and process instance are saved. Global parameters can be referenced by local parameters of any task node in the whole process.\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
Modify English link jump
36,266
03.01.2020 10:15:57
-28,800
92a4efb027987738827adb190747fe863b5f8b66
add user changan logo add user changan logo
[ { "change_type": "ADD", "old_path": "img/users_changan.jpg", "new_path": "img/users_changan.jpg", "diff": "Binary files /dev/null and b/img/users_changan.jpg differ\n" }, { "change_type": "MODIFY", "old_path": "site_config/home.jsx", "new_path": "site_config/home.jsx", "diff": "@@ -86,6 +86,7 @@ export default {\n'/img/users_yousukuaidi.jpg',\n'/img/users_yuxueyuan.jpg',\n'/img/users_zhongruanguoji.jpg',\n+ '/img/users_changan.jpg',\n],\n},\n},\n@@ -174,6 +175,7 @@ export default {\n'/img/users_yousukuaidi.jpg',\n'/img/users_yuxueyuan.jpg',\n'/img/users_zhongruanguoji.jpg',\n+ '/img/users_changan.jpg',\n],\n},\n},\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
add user changan logo add user changan logo
36,367
03.01.2020 15:27:31
-28,800
af20ecda584ffca7f1ae9d865ab3f76bae61a09a
update upgreade md and add download in chinese
[ { "change_type": "MODIFY", "old_path": "docs/en-us/release/upgrade.md", "new_path": "docs/en-us/release/upgrade.md", "diff": "## 3. Download the new version of the installation package\n-- [github](https://github.com/apache/incubator-dolphinscheduler/releases), download the latest version of the front and back installation packages (backend referred to as dolphinscheduler-backend, front end referred to as dolphinscheduler-ui)\n+- [download](https://dolphinscheduler.apache.org/en-us/docs/user_doc/download.html), download the latest version of the front and back installation packages (backend referred to as dolphinscheduler-backend, front end referred to as dolphinscheduler-front)\n- The following upgrade operations need to be performed in the new version of the directory\n## 4. Database upgrade\n-- Modify the following properties in conf/dao/data_source.properties\n+- Modify the following properties in conf/application-dao.properties\n```\nspring.datasource.url\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
update upgreade md and add download in chinese
36,367
06.01.2020 13:58:29
-28,800
f2a277f118d58a5dee4954e0e469ff2c141fd4ce
update download url in docs of deployment
[ { "change_type": "MODIFY", "old_path": "site_config/site.js", "new_path": "site_config/site.js", "diff": "@@ -18,7 +18,7 @@ export default {\nchildren: [\n{\nkey: 'docs1',\n- text: '1.2.0(Upcoming release)',\n+ text: '1.2.0',\nlink: '/en-us/docs/user_doc/quick-start.html',\n},\n{\n" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
update download url in docs of deployment
36,261
06.01.2020 19:52:15
-28,800
09798d341b4c758aa2d0ae1850642013dc0133f7
Documentation added 1.2.0 directory
[ { "change_type": "RENAME", "old_path": "docs/en-us/faq.md", "new_path": "docs/en-us/1.2.0/faq.md", "diff": "" }, { "change_type": "ADD", "old_path": null, "new_path": "docs/en-us/1.2.0/release/upgrade.md", "diff": "+\n+# DolphinScheduler upgrade documentation\n+\n+## 1. Back up the previous version of the files and database\n+\n+## 2. Stop all services of dolphinscheduler\n+\n+ `sh ./script/stop-all.sh`\n+\n+## 3. Download the new version of the installation package\n+\n+- [download](https://dolphinscheduler.apache.org/en-us/docs/user_doc/download.html), download the latest version of the front and back installation packages (backend referred to as dolphinscheduler-backend, front end referred to as dolphinscheduler-front)\n+- The following upgrade operations need to be performed in the new version of the directory\n+\n+## 4. Database upgrade\n+- Modify the following properties in conf/application-dao.properties\n+\n+```\n+ spring.datasource.url\n+ spring.datasource.username\n+ spring.datasource.password\n+```\n+\n+- Execute database upgrade script\n+\n+`sh ./script/upgrade-dolphinscheduler.sh`\n+\n+## 5. Backend service upgrade\n+\n+- Modify the content of the install.sh configuration and execute the upgrade script\n+\n+ `sh install.sh`\n+\n+## 6. Frontend service upgrade\n+\n+- Overwrite the previous version of the dist directory\n+- Restart the nginx service\n+\n+ `systemctl restart nginx`\n" }, { "change_type": "RENAME", "old_path": "docs/en-us/user_doc/backend-deployment.md", "new_path": "docs/en-us/1.2.0/user_doc/backend-deployment.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/en-us/user_doc/frontend-deployment.md", "new_path": "docs/en-us/1.2.0/user_doc/frontend-deployment.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/en-us/user_doc/quick-start.md", "new_path": "docs/en-us/1.2.0/user_doc/quick-start.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/en-us/user_doc/subscribe.md", "new_path": "docs/en-us/1.2.0/user_doc/subscribe.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/en-us/user_doc/system-manual.md", "new_path": "docs/en-us/1.2.0/user_doc/system-manual.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/zh-cn/faq.md", "new_path": "docs/zh-cn/1.2.0/faq.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/zh-cn/release/upgrade.md", "new_path": "docs/zh-cn/1.2.0/release/upgrade.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/zh-cn/user_doc/backend-deployment.md", "new_path": "docs/zh-cn/1.2.0/user_doc/backend-deployment.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/zh-cn/user_doc/frontend-deployment.md", "new_path": "docs/zh-cn/1.2.0/user_doc/frontend-deployment.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/zh-cn/user_doc/quick-start.md", "new_path": "docs/zh-cn/1.2.0/user_doc/quick-start.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/zh-cn/user_doc/subscribe.md", "new_path": "docs/zh-cn/1.2.0/user_doc/subscribe.md", "diff": "" }, { "change_type": "RENAME", "old_path": "docs/zh-cn/user_doc/system-manual.md", "new_path": "docs/zh-cn/1.2.0/user_doc/system-manual.md", "diff": "" } ]
JavaScript
Apache License 2.0
apache/dolphinscheduler-website
Documentation added 1.2.0 directory