@W-18186860: Actionable Notifications (Android) Additional Test Automation For Code Coverage (#2704)

Author: JohnsonEricAtSalesforce

libs/SalesforceSDK/build.gradle.kts

@@ -51,6 +51,7 @@ dependencies {
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
     androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
     androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeVersion")
+    androidTestImplementation("io.mockk:mockk-android:1.14.0")
 }
 
 android {
@@ -92,7 +93,7 @@ android {
 
     packaging {
         resources {
-            excludes += setOf("META-INF/LICENSE", "META-INF/LICENSE.txt", "META-INF/DEPENDENCIES", "META-INF/NOTICE")
+            excludes += setOf("META-INF/LICENSE*", "META-INF/LICENSE.txt", "META-INF/DEPENDENCIES", "META-INF/NOTICE")
         }
     }
 

libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt

@@ -62,7 +62,6 @@ import androidx.compose.runtime.Composable
 import androidx.core.content.ContextCompat.RECEIVER_EXPORTED
 import androidx.core.content.ContextCompat.RECEIVER_NOT_EXPORTED
 import androidx.core.content.ContextCompat.registerReceiver
-import androidx.core.net.toUri
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
@@ -622,28 +621,30 @@ open class SalesforceSDKManager protected constructor(
      */
     fun getNotificationsType(
         type: String
-    ) = getNotificationsTypes(
-        userAccountManager.currentUser
-    )?.notificationTypes?.firstOrNull { notificationType ->
-        notificationType.type == type
+    ) = userAccountManager.currentUser?.let { currentUser ->
+        getNotificationsTypes(
+            currentUser
+        )?.notificationTypes?.firstOrNull { notificationType ->
+            notificationType.type == type
+        }
     }
 
     /**
      * Invokes a Salesforce Notifications API notification action.
      * @param notificationId The Salesforce actionable notification's id
      * @param actionKey The Salesforce actionable notification's action key
+     * @param restClient The REST client to use when invoking the Salesforce
+     * Notifications API.  Note the REST client determines the user account used
+     * as well.  This defaults to the current user's REST client.
      * @return The Salesforce Notifications API actions endpoint response or
      * null
      */
     fun invokeServerNotificationAction(
         notificationId: String,
-        actionKey: String
+        actionKey: String,
+        restClient: RestClient = clientManager.peekRestClient(userAccountManager.currentUser)
     ): NotificationsActionsResponseBody? {
-        val userAccount = userAccountManager.currentUser
-        val instanceHost = userAccount.instanceServer.toUri().host ?: return null
-        val restClient = clientManager.peekRestClient(userAccount)
         return NotificationsApiClient(
-            apiHostName = instanceHost,
             restClient = restClient
         ).submitNotificationAction(
             notificationId = notificationId,

libs/SalesforceSDK/src/com/salesforce/androidsdk/push/PushMessaging.kt

@@ -45,6 +45,7 @@ import com.salesforce.androidsdk.push.PushService.PushNotificationReRegistration
 import com.salesforce.androidsdk.rest.NotificationsTypesResponseBody
 import com.salesforce.androidsdk.security.KeyStoreWrapper
 import com.salesforce.androidsdk.util.SalesforceSDKLogger
+import kotlinx.serialization.json.Json
 
 
 /**
@@ -264,7 +265,7 @@ object PushMessaging {
 
     /**
      * Stores the Salesforce notifications types for the provided user account.
-     * @param userAccount THe user account
+     * @param userAccount The user account
      */
     @JvmStatic
     internal fun setNotificationTypes(
@@ -279,7 +280,10 @@ object PushMessaging {
         sharedPreferences.edit {
             putString(
                 NOTIFICATIONS_TYPES,
-                notificationsTypes.sourceJson
+                Json.encodeToString(
+                    NotificationsTypesResponseBody.serializer(),
+                    notificationsTypes
+                )
             )
         }
     }