Merge pull request #2745 from brandonpage/fix-push-reg-npe

Fix NPE when attempting push registration upon login.

Author: brandonpage

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

@@ -385,9 +385,7 @@ open class PushService {
         account: UserAccount,
         restClient: RestClient
     ): String? {
-
         val sdkManager = SalesforceSDKManager.getInstance()
-        val accountManager = UserAccountManager.getInstance()
 
         runCatching {
             val fields: MutableMap<String, String?> = mutableMapOf(
@@ -397,9 +395,9 @@ open class PushService {
             )
 
             // Adds community ID to the registration payload to allow scoping of notifications per community.
-            val communityId = accountManager.currentUser.communityId
-            if (communityId?.isNotEmpty() == true) {
-                fields[NETWORK_ID] = communityId
+            val communityUrl = account.communityUrl
+            if (!communityUrl.isNullOrBlank()) {
+                fields[NETWORK_ID] = communityUrl
             }
 
             // Adds an RSA public key to the registration payload if available.