Merge pull request #1604 from alexbakker/flush-export

Flush temporary export file before starting ExportTask
master
Michael Schättgen 4 days ago committed by GitHub
commit 7882ecc33a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -518,11 +518,10 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
file = File.createTempFile(VaultRepository.FILENAME_PREFIX_EXPORT + "-", ".json", getExportCacheDir()); file = File.createTempFile(VaultRepository.FILENAME_PREFIX_EXPORT + "-", ".json", getExportCacheDir());
outStream = new FileOutputStream(file); outStream = new FileOutputStream(file);
cb.exportVault(outStream); cb.exportVault(outStream);
new ExportTask(requireContext(), new ExportResultListener()).execute(getLifecycle(), new ExportTask.Params(file, uri));
} catch (VaultRepositoryException | IOException e) { } catch (VaultRepositoryException | IOException e) {
e.printStackTrace(); e.printStackTrace();
Dialogs.showErrorDialog(requireContext(), R.string.exporting_vault_error, e); Dialogs.showErrorDialog(requireContext(), R.string.exporting_vault_error, e);
return;
} finally { } finally {
try { try {
if (outStream != null) { if (outStream != null) {
@ -532,6 +531,8 @@ public class ImportExportPreferencesFragment extends PreferencesFragment {
e.printStackTrace(); e.printStackTrace();
} }
} }
new ExportTask(requireContext(), new ExportResultListener()).execute(getLifecycle(), new ExportTask.Params(file, uri));
}, _exportFilter); }, _exportFilter);
_exportFilter = null; _exportFilter = null;
} }

Loading…
Cancel
Save