Merge pull request #2192 from dimagi/fix-missing-attachment

Fix mismatched attachments while editing a saved form
dimagi · Mar 5, 2020 · 30b3711 · 30b3711
2 parents 9f67708 + 6cb574e
commit 30b3711
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/app/src/org/commcare/activities/FormEntryActivity.java b/app/src/org/commcare/activities/FormEntryActivity.java
@@ -352,6 +352,7 @@ private void resetPendingCalloutIndex() {
     public void saveImageWidgetAnswer(String imagePath) {
         uiController.questionsView.setBinaryData(imagePath, mFormController);
         saveAnswersForCurrentScreen(FormEntryConstants.DO_NOT_EVALUATE_CONSTRAINTS);
+        onExternalAttachmentUpdated();
         uiController.refreshView();
     }
 
@@ -370,6 +371,7 @@ private void processChooserResponse(Intent intent) {
             uiController.questionsView.setBinaryData(media, mFormController);
         }
         saveAnswersForCurrentScreen(FormEntryConstants.DO_NOT_EVALUATE_CONSTRAINTS);
+        onExternalAttachmentUpdated();
         uiController.refreshView();
     }
 
@@ -701,6 +703,21 @@ private void saveIncompleteFormToDisk() {
         saveDataToDisk(FormEntryConstants.EXIT, false, null, true);
     }
 
+    /**
+     * Attempts to update the form in the disk when user changes the attachment.
+     * NOTE:- This fixes the mismatch in attachments while trying to update attachments in a saved form.
+     */
+    protected void onExternalAttachmentUpdated() {
+        FormRecord formRecord = FormRecord.getFormRecord(formRecordStorage, FormEntryInstanceState.mFormRecordPath);
+        if (formRecord == null) {
+            return;
+        }
+        String formStatus = formRecord.getStatus();
+        if (FormRecord.STATUS_INCOMPLETE.equals(formStatus)) {
+            saveDataToDisk(false, false, null, true);
+        }
+    }
+
     private void showSaveErrorAndExit() {
         Toast.makeText(this, Localization.get("form.entry.save.error"), Toast.LENGTH_SHORT).show();
         hasSaved = false;

diff --git a/app/src/org/commcare/activities/FormEntryActivityUIController.java b/app/src/org/commcare/activities/FormEntryActivityUIController.java
@@ -37,6 +37,7 @@
 import org.commcare.views.dialogs.HorizontalPaneledChoiceDialog;
 import org.commcare.views.dialogs.PaneledChoiceDialog;
 import org.commcare.views.media.AudioController;
+import org.commcare.views.widgets.ImageWidget;
 import org.commcare.views.widgets.IntentWidget;
 import org.commcare.views.widgets.QuestionWidget;
 import org.javarosa.core.model.Constants;
@@ -737,6 +738,13 @@ protected void updateFormRelevancies() {
                 shouldRemoveFromView.add(i);
                 continue;
             }
+
+            if (oldWidgets.get(i) instanceof ImageWidget) {
+                // If there was change(in particular image-remove) in an image widget,
+                // only then update the form to disk.
+                activity.onExternalAttachmentUpdated();
+            }
+
             FormEntryPrompt oldPrompt = oldWidgets.get(i).getPrompt();
             String priorQuestionTextForThisWidget = oldQuestionTexts.get(i);
             Vector<SelectChoice> priorSelectChoicesForThisWidget = oldSelectChoices.get(i);

diff --git a/app/src/org/commcare/activities/components/FormRelevancyUpdating.java b/app/src/org/commcare/activities/components/FormRelevancyUpdating.java
@@ -2,6 +2,7 @@
 
 import org.commcare.views.widgets.QuestionWidget;
 import org.javarosa.core.model.SelectChoice;
+import org.javarosa.core.model.data.IAnswerData;
 import org.javarosa.form.api.FormEntryPrompt;
 
 import java.util.ArrayList;

diff --git a/app/src/org/commcare/views/widgets/ImageWidget.java b/app/src/org/commcare/views/widgets/ImageWidget.java
@@ -157,6 +157,7 @@ public ImageWidget(final Context context, FormEntryPrompt prompt, PendingCallout
                 !mPrompt.isReadOnly());
         mDiscardButton.setOnClickListener(v -> {
             deleteMedia();
+            widgetEntryChanged();
         });
         mDiscardButton.setVisibility(View.GONE);