Exception handling bug fix

Author: jdamcd

desktop/src/main/kotlin/com/jdamcd/arrivals/desktop/ArrivalsViewModel.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.jdamcd.arrivals.Arrivals
 import com.jdamcd.arrivals.ArrivalsInfo
+import com.jdamcd.arrivals.NoDataException
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -43,9 +44,11 @@ class ArrivalsViewModel(private val arrivals: Arrivals) : ViewModel() {
         try {
             val result = arrivals.latest()
             _uiState.value = ArrivalsState.Data(result, false)
+        } catch (e: NoDataException) {
+            _uiState.value = ArrivalsState.Error(e.message ?: "Unknown error")
         } catch (e: Exception) {
             if (_uiState.value !is ArrivalsState.Data) {
-                _uiState.value = ArrivalsState.Error(e.message ?: "Unknown error")
+                _uiState.value = ArrivalsState.Error("Unknown error")
             }
         }
     }

shared/src/commonMain/kotlin/com/jdamcd/arrivals/gtfs/GtfsArrivals.kt

@@ -23,16 +23,16 @@ internal class GtfsArrivals(
     @Throws(NoDataException::class, CancellationException::class)
     override suspend fun latest(): ArrivalsInfo {
         updateStops()
+        val model: ArrivalsInfo
         try {
-            val model = formatArrivals(api.fetchFeedMessage(settings.gtfsRealtime))
-            if (model.arrivals.isNotEmpty()) {
-                return model
-            } else {
-                throw NoDataException("No arrivals found")
-            }
+            model = formatArrivals(api.fetchFeedMessage(settings.gtfsRealtime))
         } catch (e: Exception) {
-            throw NoDataException("Failed to connect")
+            throw NoDataException("No connection")
+        }
+        if (model.arrivals.isEmpty()) {
+            throw NoDataException("No arrivals found")
         }
+        return model
     }
 
     private suspend fun updateStops() {

shared/src/commonMain/kotlin/com/jdamcd/arrivals/tfl/TflArrivals.kt

@@ -20,16 +20,16 @@ internal class TflArrivals(
 
     @Throws(NoDataException::class, CancellationException::class)
     override suspend fun latest(): ArrivalsInfo {
+        val model: ArrivalsInfo
         try {
-            val model = formatArrivals(api.fetchArrivals(settings.tflStopId))
-            if (model.arrivals.isNotEmpty()) {
-                return model
-            } else {
-                throw NoDataException("No arrivals found")
-            }
+            model = formatArrivals(api.fetchArrivals(settings.tflStopId))
         } catch (e: Exception) {
             throw NoDataException("No connection")
         }
+        if (model.arrivals.isEmpty()) {
+            throw NoDataException("No arrivals found")
+        }
+        return model
     }
 
     @Throws(CancellationException::class)