From 69a62357b5ea1190cfc1b426fd21304fc819209e Mon Sep 17 00:00:00 2001
From: CTLalit <lalitkumar@clevertap.com>
Date: Fri, 7 Mar 2025 16:37:18 +0530
Subject: [PATCH] feat(SDK-4481) pr comments + test cases

- renames method names to be more descriptive
- fixes test cases which were broken due to interface invocation signature for activityResumed, created
- adds samples for baidu and hms in sample manifest entries
---
 .../com/clevertap/android/sdk/CleverTapInstanceConfig.java  | 4 ++--
 .../main/java/com/clevertap/android/sdk/ManifestInfo.java   | 5 +++--
 .../clevertap/android/sdk/ActivityLifecycleCallbackTest.kt  | 6 +++---
 sample/src/main/AndroidManifest.xml                         | 6 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java b/clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java
index 4df914cfb..881041a3a 100644
--- a/clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java
+++ b/clevertap-core/src/main/java/com/clevertap/android/sdk/CleverTapInstanceConfig.java
@@ -210,7 +210,7 @@ private CleverTapInstanceConfig(
 
     private void buildPushProvidersFromManifest(ManifestInfo manifest) {
         try {
-            String provider1 = manifest.getProvider1();
+            String provider1 = manifest.getVendorOneProvider();
             if (provider1 != null) {
                 String[] splits = provider1.split(",");
                 if (splits != null && splits.length == 5) {
@@ -218,7 +218,7 @@ private void buildPushProvidersFromManifest(ManifestInfo manifest) {
                     addPushType(pushType);
                 }
             }
-            String provider2 = manifest.getProvider2();
+            String provider2 = manifest.getVendorTwoProvider();
             if (provider2 != null) {
                 String[] splits = provider2.split(",");
                 if (splits != null && splits.length == 5) {
diff --git a/clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java b/clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java
index e8ff3d93e..ce0ee2380 100644
--- a/clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java
+++ b/clevertap-core/src/main/java/com/clevertap/android/sdk/ManifestInfo.java
@@ -341,11 +341,12 @@ private String _getManifestStringValueForKey(Bundle manifest, String name) {
         }
     }
 
-    public String getProvider1() {
+
+    public String getVendorOneProvider() {
         return provider1;
     }
 
-    public String getProvider2() {
+    public String getVendorTwoProvider() {
         return provider2;
     }
 }
diff --git a/clevertap-core/src/test/java/com/clevertap/android/sdk/ActivityLifecycleCallbackTest.kt b/clevertap-core/src/test/java/com/clevertap/android/sdk/ActivityLifecycleCallbackTest.kt
index 5cf928c58..ace0be20e 100644
--- a/clevertap-core/src/test/java/com/clevertap/android/sdk/ActivityLifecycleCallbackTest.kt
+++ b/clevertap-core/src/test/java/com/clevertap/android/sdk/ActivityLifecycleCallbackTest.kt
@@ -64,7 +64,7 @@ class ActivityLifecycleCallbackTest : BaseTestCase() {
         mockStatic(CleverTapAPI::class.java).use {
             val mockActivity = mock(Activity::class.java)
             value.onActivityCreated(mockActivity, Bundle())
-            it.verify { CleverTapAPI.onActivityCreated(mockActivity) }
+            it.verify { CleverTapAPI.onActivityCreated(mockActivity, null, null) }
             value.onActivityResumed(mockActivity)
             it.verify { CleverTapAPI.onActivityResumed(mockActivity) }
         }
@@ -81,9 +81,9 @@ class ActivityLifecycleCallbackTest : BaseTestCase() {
         mockStatic(CleverTapAPI::class.java).use {
             val mockActivity = mock(Activity::class.java)
             value.onActivityCreated(mockActivity, Bundle())
-            it.verify { CleverTapAPI.onActivityCreated(mockActivity,"1234567890") }
+            it.verify { CleverTapAPI.onActivityCreated(mockActivity,"1234567890", null) }
             value.onActivityResumed(mockActivity)
-            it.verify { CleverTapAPI.onActivityResumed(mockActivity,"1234567890") }
+            it.verify { CleverTapAPI.onActivityResumed(mockActivity,"1234567890", null) }
         }
     }
 
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index b86a56877..ead1d9d01 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -106,11 +106,11 @@
         <!-- Builds push provider for clevertap other than firebase, add csv string 5 values, please refer docs to integrate different push providers in clevertap -->
         <meta-data
             android:name="CLEVERTAP_PROVIDER_1"
-            android:value="1" />
+            android:value="hps, hps_token, com.clevertap.android.hms.HmsPushProvider, com.huawei.hms.push.HmsMessageService, HPS" />
         <!-- Builds push provider for clevertap other than firebase, add csv string with 5 values, please refer docs to integrate different push providers in clevertap -->
         <meta-data
-            android:name="CLEVERTAP_PROVIDER_1"
-            android:value="1" />
+            android:name="CLEVERTAP_PROVIDER_2"
+            android:value="bps, bps_token, com.clevertap.android.bps.BaiduPushProvider, com.baidu.android.pushservice.PushMessageReceiver, BPS" />
 
         <!-- Add CleverTap Push Notification Services & Install Referrer Receivers -->
         <service