Making sure Cancellation of coroutines stops long processes.

app/src/play/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt

@@ -33,6 +33,7 @@ import com.google.mlkit.nl.translate.TranslatorOptions
 import com.linkedin.urls.detection.UrlDetector
 import com.linkedin.urls.detection.UrlDetectorOptions
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import kotlinx.coroutines.CancellationException
 import java.util.concurrent.Executors
 import java.util.regex.Pattern
 
@@ -161,7 +162,8 @@ object LanguageTranslatorService {
                 val short = "A$counter"
                 counter++
                 returningList.put(short, tag)
-            } catch (_: Exception) {
+            } catch (e: Exception) {
+                if (e is CancellationException) throw e
             }
         }
         return returningList
@@ -177,7 +179,8 @@ object LanguageTranslatorService {
                 val short = "A$counter"
                 counter++
                 returningList.put(short, lnInvoice)
-            } catch (_: Exception) {
+            } catch (e: Exception) {
+                if (e is CancellationException) throw e
             }
         }
         return returningList

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

@@ -23,6 +23,7 @@ package com.vitorpamplona.amethyst.service.notifications
 import android.util.Log
 import com.google.firebase.messaging.FirebaseMessaging
 import com.vitorpamplona.amethyst.AccountInfo
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.tasks.await
 
@@ -38,6 +39,7 @@ object PushNotificationUtils {
             try {
                 RegisterAccounts(accounts).go(FirebaseMessaging.getInstance().token.await())
             } catch (e: Exception) {
+                if (e is CancellationException) throw e
                 Log.e("Firebase token", "failed to get firebase token", e)
             }
         }