Skip to content

@W-19964705: [MSDK Android] Push Notification Registration Failure For User Accounts With Community URL #2788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 17, 2025
Merged

@W-19964705: [MSDK Android] Push Notification Registration Failure For User Accounts With Community URL #2788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8b7faf
@W-19964705: [MSDK Android] Push Notification Registration Failure Fo…
JohnsonEricAtSalesforce Oct 15, 2025
d914477
@W-19964705: [MSDK Android] Push Notification Registration Failure Fo…
JohnsonEricAtSalesforce Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions libs/SalesforceSDK/src/com/salesforce/androidsdk/push/PushService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import android.app.NotificationManager
import android.app.NotificationManager.IMPORTANCE_HIGH
import android.content.Intent
import androidx.annotation.VisibleForTesting
import androidx.annotation.VisibleForTesting.Companion.PRIVATE
import androidx.annotation.VisibleForTesting.Companion.PROTECTED
import androidx.work.Constraints
import androidx.work.Data
Expand All @@ -43,7 +42,6 @@ import androidx.work.OneTimeWorkRequest
import androidx.work.PeriodicWorkRequest
import androidx.work.WorkManager
import com.salesforce.androidsdk.accounts.UserAccount
import com.salesforce.androidsdk.accounts.UserAccountManager
import com.salesforce.androidsdk.analytics.security.Encryptor
import com.salesforce.androidsdk.app.Features.FEATURE_PUSH_NOTIFICATIONS
import com.salesforce.androidsdk.app.SalesforceSDKManager
Expand Down Expand Up @@ -395,9 +393,9 @@ open class PushService {
)

// Adds community ID to the registration payload to allow scoping of notifications per community.
val communityUrl = account.communityUrl
if (!communityUrl.isNullOrBlank()) {
fields[NETWORK_ID] = communityUrl
val communityId = account.communityId
if (!communityId.isNullOrBlank()) {
fields[NETWORK_ID] = communityId
}

// Adds an RSA public key to the registration payload if available.
Expand Down
10 changes: 9 additions & 1 deletion libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/app/PushServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import com.salesforce.androidsdk.rest.RestClient.ClientInfo
import com.salesforce.androidsdk.rest.RestResponse
import io.mockk.every
import io.mockk.mockk
import io.mockk.verify
import kotlinx.serialization.json.Json.Default.encodeToJsonElement
import kotlinx.serialization.json.Json.Default.encodeToString
import kotlinx.serialization.json.JsonArray
Expand Down Expand Up @@ -738,6 +739,7 @@ class PushServiceTest {
val restClient = mockk<RestClient>()
every { restClient.sendSync(any()) } returns restResponse

val account = createTestAccount()
var actualStatus: Int? = null
val actualId = object : PushService() {
override fun onPushNotificationRegistrationStatus(
Expand All @@ -750,10 +752,16 @@ class PushServiceTest {
}
}.registerSFDCPushNotification(
registrationId = "test_registration_id",
account = createTestAccount(),
account = account,
restClient = restClient
)

verify(exactly = 1) {
restClient.sendSync(withArg {
assertEquals("test_community_id", it.requestBodyAsJson.get("NetworkId"))
})
}

assertEquals(REGISTRATION_STATUS_SUCCEEDED, actualStatus)
assertEquals("test_id", actualId)
}
Expand Down
Loading