coroutines: only let async propagate exceptions in one direction

If we don't do this, catching the exception isn't enough; it'll still
bubble to its parent and kill everything. See
Kotlin/kotlinx.coroutines#763 for an extended
discussion of Kotlin misdesigns.

Signed-off-by: Jason A. Donenfeld <[email protected]>

Author: zx2c4

ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt

@@ -39,6 +39,8 @@ import com.wireguard.config.Config
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.launch
@@ -132,12 +134,12 @@ class TunnelListFragment : BaseFragment() {
                                     null
                                 }?.let {
                                     val nameCopy = name
-                                    futureTunnels.add(async { Application.getTunnelManager().create(nameCopy, it) })
+                                    futureTunnels.add(async(SupervisorJob(coroutineContext[Job])) { Application.getTunnelManager().create(nameCopy, it) })
                                 }
                             }
                         }
                     } else {
-                        futureTunnels.add(async { Application.getTunnelManager().create(name, Config.parse(contentResolver.openInputStream(uri)!!)) })
+                        futureTunnels.add(async(SupervisorJob(coroutineContext[Job])) { Application.getTunnelManager().create(name, Config.parse(contentResolver.openInputStream(uri)!!)) })
                     }
 
                     if (futureTunnels.isEmpty()) {
@@ -321,7 +323,7 @@ class TunnelListFragment : BaseFragment() {
                             val tunnels = Application.getTunnelManager().tunnels.await()
                             val tunnelsToDelete = ArrayList<ObservableTunnel>()
                             for (position in copyCheckedItems) tunnelsToDelete.add(tunnels[position])
-                            val futures = tunnelsToDelete.map { async { it.delete() } }
+                            val futures = tunnelsToDelete.map { async(SupervisorJob(coroutineContext[Job])) { it.delete() } }
                             onTunnelDeletionFinished(futures.awaitAll().size, null)
                         } catch (e: Throwable) {
                             onTunnelDeletionFinished(0, e)

ui/src/main/java/com/wireguard/android/model/TunnelManager.kt

@@ -26,7 +26,10 @@ import com.wireguard.config.Config
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
@@ -139,7 +142,7 @@ class TunnelManager(private val configStore: ConfigStore) : BaseObservable() {
         coroutineScope.launch {
             withContext(Dispatchers.IO) {
                 try {
-                    tunnelMap.filter { previouslyRunning.contains(it.name) }.map { async { setTunnelState(it, Tunnel.State.UP) } }.map { it.await() }
+                    tunnelMap.filter { previouslyRunning.contains(it.name) }.map { async(SupervisorJob(coroutineContext[Job])) { setTunnelState(it, Tunnel.State.UP) } }.awaitAll()
                 } catch (e: Throwable) {
                     Log.println(Log.ERROR, TAG, Log.getStackTraceString(e))
                 }

ui/src/main/java/com/wireguard/android/preference/KernelModuleDisablerPreference.kt

@@ -17,6 +17,8 @@ import com.wireguard.android.backend.Tunnel
 import com.wireguard.android.backend.WgQuickBackend
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.launch
@@ -49,7 +51,7 @@ class KernelModuleDisablerPreference(context: Context, attrs: AttributeSet?) : P
         }
         coroutineScope.launch {
             val observableTunnels = Application.getTunnelManager().tunnels.await()
-                val downings = observableTunnels.map { async { it.setStateAsync(Tunnel.State.DOWN) } }
+                val downings = observableTunnels.map { async(SupervisorJob(coroutineContext[Job])) { it.setStateAsync(Tunnel.State.DOWN) } }
             try {
                 downings.awaitAll()
                 withContext(Dispatchers.IO) {

ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt

@@ -21,6 +21,8 @@ import com.wireguard.android.util.ErrorMessages
 import com.wireguard.android.util.FragmentUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.launch
@@ -45,7 +47,7 @@ class ZipExporterPreference(context: Context, attrs: AttributeSet?) : Preference
             try {
                 val name: String
                 withContext(Dispatchers.IO) {
-                    val configs = tunnels.map { async { it.getConfigAsync() } }.awaitAll()
+                    val configs = tunnels.map { async(SupervisorJob(coroutineContext[Job])) { it.getConfigAsync() } }.awaitAll()
                     if (configs.isEmpty()) {
                         throw IllegalArgumentException(context.getString(R.string.no_tunnels_error))
                     }