Fixed error after resolving conflicts

getodk · Jul 12, 2023 · 7e88617 · 7e88617
1 parent 1afd28c
commit 7e88617
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/formentry/FormEntryViewModel.java b/collect_app/src/main/java/org/odk/collect/android/formentry/FormEntryViewModel.java
@@ -298,7 +298,7 @@ public void validate() {
                     try {
                         result = formController.validateAnswers(true);
                     } catch (JavaRosaException e) {
-                        error.setValue(new NonFatal(e.getMessage()));
+                        error.setValue(new FormError.NonFatal(e.getMessage()));
                     }
 
                     return result;

diff --git a/collect_app/src/test/java/org/odk/collect/android/formentry/FormEntryViewModelTest.java b/collect_app/src/test/java/org/odk/collect/android/formentry/FormEntryViewModelTest.java
@@ -387,6 +387,6 @@ public void validate_whenThereIsAnErrorValidating_setsError() throws Exception {
 
         viewModel.validate();
         scheduler.runBackground();
-        assertThat(viewModel.getError().getValue(), equalTo(new NonFatal("OH NO")));
+        assertThat(viewModel.getError().getValue(), equalTo(new FormError.NonFatal("OH NO")));
     }
 }