Skip to content

Commit 7882ecc

Browse files
Merge pull request #1604 from alexbakker/flush-export
Flush temporary export file before starting ExportTask
2 parents 7c6e3ae + e8d712e commit 7882ecc

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/ImportExportPreferencesFragment.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -518,11 +518,10 @@ private void onExportResult(int requestCode, int resultCode, @Nullable Intent da
518518
file = File.createTempFile(VaultRepository.FILENAME_PREFIX_EXPORT + "-", ".json", getExportCacheDir());
519519
outStream = new FileOutputStream(file);
520520
cb.exportVault(outStream);
521-
522-
new ExportTask(requireContext(), new ExportResultListener()).execute(getLifecycle(), new ExportTask.Params(file, uri));
523521
} catch (VaultRepositoryException | IOException e) {
524522
e.printStackTrace();
525523
Dialogs.showErrorDialog(requireContext(), R.string.exporting_vault_error, e);
524+
return;
526525
} finally {
527526
try {
528527
if (outStream != null) {
@@ -532,6 +531,8 @@ private void onExportResult(int requestCode, int resultCode, @Nullable Intent da
532531
e.printStackTrace();
533532
}
534533
}
534+
535+
new ExportTask(requireContext(), new ExportResultListener()).execute(getLifecycle(), new ExportTask.Params(file, uri));
535536
}, _exportFilter);
536537
_exportFilter = null;
537538
}

0 commit comments

Comments
 (0)