Simplified removing empty instance dirs

getodk · Jan 31, 2025 · 6ada08d · 6ada08d
1 parent 73f00b1
commit 6ada08d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
@@ -559,7 +559,6 @@ private void setupViewModels(FormEntryViewModelFactory formEntryViewModelFactory
 
         identityPromptViewModel.isFormEntryCancelled().observe(this, isFormEntryCancelled -> {
             if (isFormEntryCancelled) {
-                identityPromptViewModel.exit();
                 exit();
             }
         });

diff --git a/...ct_app/src/main/java/org/odk/collect/android/formentry/audit/IdentityPromptViewModel.java b/...ct_app/src/main/java/org/odk/collect/android/formentry/audit/IdentityPromptViewModel.java
@@ -59,6 +59,7 @@ public void done() {
     }
 
     public void promptDismissed() {
+        FileUtils.purgeMediaPath(instanceFolder);
         formEntryCancelled.setValue(true);
     }
 
@@ -75,8 +76,4 @@ private static boolean userIsValid(String user) {
     public String getFormTitle() {
         return formName;
     }
-
-    public void exit() {
-        FileUtils.purgeMediaPath(instanceFolder);
-    }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
             identityPromptViewModel.isFormEntryCancelled().observe(this, isFormEntryCancelled -> {
                 if (isFormEntryCancelled) {
-                    identityPromptViewModel.exit();
                     exit();
                 }
             });
@@ Expand Down @@