Merge pull request #1023 from session-foundation/release/1.21.1

Release/1.21.1

app/src/huawei/kotlin/org/thoughtcrime/securesms/notifications/HuaweiTokenFetcher.kt

@@ -9,6 +9,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.session.libsession.messaging.notifications.TokenFetcher
+import org.session.libsignal.utilities.Log
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -33,10 +34,14 @@ class HuaweiTokenFetcher @Inject constructor(
 
     init {
         GlobalScope.launch {
+            try {
                 val instanceId = HmsInstanceId.getInstance(context)
                 withContext(Dispatchers.Default) {
                     instanceId.getToken(APP_ID, TOKEN_SCOPE)
                 }
+            } catch (e: Exception) {
+                Log.e("HuaweiTokenFetcher", "Failed to fetch token", e)
+            }
         }
     }
 }

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt

@@ -107,9 +107,10 @@ class Poller(
             Log.d(TAG, "Polling...")
 
             isPolling = true
-
+            var pollDelay = RETRY_INTERVAL_MS
+            try {
                 // check if the polling pool is empty
-            if(pollPool.isEmpty()){
+                if (pollPool.isEmpty()){
                     // if it is empty, fill it with the snodes from our swarm
                     pollPool.addAll(SnodeAPI.getSwarm(userPublicKey).await())
                 }
@@ -120,8 +121,6 @@ class Poller(
                 // remove that snode from the pool
                 pollPool.remove(currentNode)
 
-            var pollDelay = RETRY_INTERVAL_MS
-            try {
                 poll(currentNode)
                 retryScalingFactor = 1f
             } catch (e: Exception){