From 6ada08d104871b5b4751382b268df6098e3c1ca1 Mon Sep 17 00:00:00 2001 From: Grzegorz Orczykowski Date: Fri, 31 Jan 2025 01:46:04 +0100 Subject: [PATCH] Simplified removing empty instance dirs --- .../odk/collect/android/activities/FormFillingActivity.java | 1 - .../android/formentry/audit/IdentityPromptViewModel.java | 5 +---- 2 files changed, 1 insertion(+), 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 index fb93dcf6b76..f83cfc49b68 100644 --- 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/collect_app/src/main/java/org/odk/collect/android/formentry/audit/IdentityPromptViewModel.java b/collect_app/src/main/java/org/odk/collect/android/formentry/audit/IdentityPromptViewModel.java index c1cc079fc9b..2a609437793 100644 --- a/collect_app/src/main/java/org/odk/collect/android/formentry/audit/IdentityPromptViewModel.java +++ b/collect_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); - } }