Making sure Cancellation of coroutines stops long processes.

app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt

@@ -32,6 +32,7 @@ import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.getOrC
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.getOrCreateZapChannel
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.GiftWrapEvent
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -60,6 +61,7 @@ class PushMessageReceiver : MessagingReceiver() {
             try {
                 parseMessage(messageStr)?.let { receiveIfNew(it) }
             } catch (e: Exception) {
+                if (e is CancellationException) throw e
                 Log.d(TAG, "Message could not be parsed: ${e.message}")
             }
         }

app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt

@@ -22,6 +22,7 @@ package com.vitorpamplona.amethyst.service.notifications
 
 import android.util.Log
 import com.vitorpamplona.amethyst.AccountInfo
+import kotlinx.coroutines.CancellationException
 
 object PushNotificationUtils {
     var hasInit: Boolean = false
@@ -36,6 +37,7 @@ object PushNotificationUtils {
                 RegisterAccounts(accounts).go(pushHandler.getSavedEndpoint())
             }
         } catch (e: Exception) {
+            if (e is CancellationException) throw e
             Log.d("Amethyst-OSSPushUtils", "Failed to get endpoint.")
         }
     }