Filter instances in DeleteSavedFormListViewModel

getodk · Apr 28, 2024 · 2d30b34 · 2d30b34
1 parent db7ade0
commit 2d30b34
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/...p/src/main/java/org/odk/collect/android/formlists/savedformlist/SavedFormListViewModel.kt b/...p/src/main/java/org/odk/collect/android/formlists/savedformlist/SavedFormListViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
 import org.odk.collect.android.instancemanagement.InstancesDataService
 import org.odk.collect.androidshared.async.TrackableWorker
 import org.odk.collect.androidshared.data.Consumable
@@ -39,6 +40,7 @@ class SavedFormListViewModel(
         }
 
     val formsToDisplay: LiveData<List<Instance>> = instancesDataService.instances
+        .map { instances -> instances.filter { instance -> instance.deletedDate == null } }
         .combine(_sortOrder) { instances, order ->
             when (order) {
                 SortOrder.NAME_DESC -> {