Fix discard changes when editing finalized form

getodk · Sep 11, 2023 · 967501b · 967501b
1 parent 78a4278
commit 967501b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/...roidTest/java/org/odk/collect/android/feature/instancemanagement/SendFinalizedFormTest.kt b/...roidTest/java/org/odk/collect/android/feature/instancemanagement/SendFinalizedFormTest.kt
@@ -11,6 +11,7 @@ import org.odk.collect.android.support.pages.FormEntryPage.QuestionAndAnswer
 import org.odk.collect.android.support.pages.MainMenuPage
 import org.odk.collect.android.support.pages.OkDialog
 import org.odk.collect.android.support.pages.ProjectSettingsPage
+import org.odk.collect.android.support.pages.SaveOrDiscardFormDialog
 import org.odk.collect.android.support.pages.SendFinalizedFormPage
 import org.odk.collect.android.support.rules.CollectTestRule
 import org.odk.collect.android.support.rules.TestRuleChain.chain
@@ -70,6 +71,25 @@ class SendFinalizedFormTest {
             .assertText("53")
     }
 
+    @Test
+    fun canEditAFormAndLeaveFinalizedBeforeSending() {
+        rule.withProject(testDependencies.server.url)
+            .copyForm("one-question.xml", projectName = testDependencies.server.hostName)
+            .startBlankForm("One Question")
+            .fillOutAndFinalize(QuestionAndAnswer("what is your age", "52"))
+
+            .clickSendFinalizedForm(1)
+            .clickOnFormToEdit("One Question")
+            .clickGoToStart()
+            .answerQuestion("what is your age", "53")
+            .pressBack(SaveOrDiscardFormDialog(MainMenuPage()))
+            .clickDiscardChanges()
+
+            .clickSendFinalizedForm(1)
+            .clickOnFormToEdit("One Question")
+            .assertText("52")
+    }
+
     @Test
     fun whenThereIsAnAuthenticationError_allowsUserToReenterCredentials() {
         testDependencies.server.setCredentials("Draymond", "Green")

diff --git a/...ct_app/src/main/java/org/odk/collect/android/activities/InstanceUploaderListActivity.java b/...ct_app/src/main/java/org/odk/collect/android/activities/InstanceUploaderListActivity.java
@@ -420,14 +420,14 @@ protected void onSaveInstanceState(Bundle outState) {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
-        if (resultCode == RESULT_CANCELED) {
-            multiSelectViewModel.unselectAll();
-            return;
-        }
-
         switch (requestCode) {
             // returns with a form path, start entry
             case INSTANCE_UPLOADER:
+                if (resultCode == RESULT_CANCELED) {
+                    multiSelectViewModel.unselectAll();
+                    return;
+                }
+
                 if (intent.getBooleanExtra(FormFillingActivity.KEY_SUCCESS, false)) {
                     listView.clearChoices();
                     if (listAdapter.isEmpty()) {