Fix crash in ExceptionHandlingViewModel.kt

Author: LukasLechnerDev

.idea/misc.xml

@@ -3,10 +3,7 @@ package com.lukaslechner.coroutineusecasesonandroid.usecases.coroutines.usecase1
 import androidx.lifecycle.viewModelScope
 import com.lukaslechner.coroutineusecasesonandroid.base.BaseViewModel
 import com.lukaslechner.coroutineusecasesonandroid.mock.MockApi
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineExceptionHandler
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import timber.log.Timber
 
 class ExceptionHandlingViewModel(
@@ -40,34 +37,33 @@ class ExceptionHandlingViewModel(
         uiState.value = UiState.Loading
         viewModelScope.launch {
 
+            supervisorScope {
+                val oreoFeaturesDeferred = async { api.getAndroidVersionFeatures(27) }
+                val pieFeaturesDeferred = async { api.getAndroidVersionFeatures(28) }
+                val android10FeaturesDeferred = async { api.getAndroidVersionFeatures(29) }
 
-            //supervisorScope {
-            val oreoFeaturesDeferred = async { api.getAndroidVersionFeatures(27) }
-            val pieFeaturesDeferred = async { api.getAndroidVersionFeatures(28) }
-            val android10FeaturesDeferred = async { api.getAndroidVersionFeatures(29) }
-
-            val versionFeatures = listOf(
-                oreoFeaturesDeferred,
-                pieFeaturesDeferred,
-                android10FeaturesDeferred
-            ).mapNotNull {
-                try {
-                    it.await()
-                } catch (exception: Exception) {
-                    // We have to re-throw cancellation exceptions so that
-                    // our Coroutine gets cancelled immediately.
-                    // Otherwise, the CancellationException is ignored
-                    // and the Coroutine keeps running until it reaches the next
-                    // suspension point.
-                    if (exception is CancellationException) {
-                        throw exception
+                val versionFeatures = listOf(
+                    oreoFeaturesDeferred,
+                    pieFeaturesDeferred,
+                    android10FeaturesDeferred
+                ).mapNotNull {
+                    try {
+                        it.await()
+                    } catch (exception: Exception) {
+                        // We have to re-throw cancellation exceptions so that
+                        // our Coroutine gets cancelled immediately.
+                        // Otherwise, the CancellationException is ignored
+                        // and the Coroutine keeps running until it reaches the next
+                        // suspension point.
+                        if (exception is CancellationException) {
+                            throw exception
+                        }
+                        Timber.e("Error loading feature data!")
+                        null
                     }
-                    Timber.e("Error loading feature data!")
-                    null
                 }
+                uiState.value = UiState.Success(versionFeatures)
             }
-            uiState.value = UiState.Success(versionFeatures)
-            //}
         }
     }
 }