Don't stop if starting Tor was cancelled already

onionshare · Jun 26, 2023 · 17c8c87 · 17c8c87
1 parent dd0c58a
commit 17c8c87
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/app/src/main/java/org/onionshare/android/ShareManager.kt b/app/src/main/java/org/onionshare/android/ShareManager.kt
@@ -1,5 +1,6 @@
 package org.onionshare.android
 
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
@@ -84,7 +85,9 @@ class ShareManager @Inject constructor(
                         torManager.start()
                     } catch (e: Exception) {
                         LOG.error("Error starting Tor: ", e)
-                        stopOnError(ShareUiState.ErrorStarting(errorMsg = e.toString()))
+                        if (e !is CancellationException) {
+                            stopOnError(ShareUiState.ErrorStarting(errorMsg = e.toString()))
+                        }
                     }
                 }
                 // wait for tor.start() to return before starting to observe, actual startup happens async