cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use correct filename when sharing backup

Browse Source
This commit is contained in:
Dominik Schürmann
2015-10-15 19:46:28 +02:00
parent 7384fa7f2b
commit 81283a2967
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
View File

@@ -426,8 +426,12 @@ public class BackupCodeFragment extends CryptoOperationFragment<ExportKeyringPar
return;
}
String date = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(new Date());
String filename = "backup_" + date
+ (mExportSecret ? Constants.FILE_EXTENSION_PGP_MAIN : ".pub" + Constants.FILE_EXTENSION_PGP_MAIN);
if (mCachedBackupUri == null) {
mCachedBackupUri = TemporaryFileProvider.createFile(activity);
mCachedBackupUri = TemporaryFileProvider.createFile(activity, filename, Constants.ENCRYPTED_FILES_MIME);
cryptoOperation();
return;
}
@@ -438,21 +442,17 @@ public class BackupCodeFragment extends CryptoOperationFragment<ExportKeyringPar
intent.putExtra(Intent.EXTRA_STREAM, mCachedBackupUri);
startActivity(intent);
} else {
saveFile(false);
saveFile(filename, false);
}
}
private void saveFile(boolean overwrite) {
private void saveFile(final String filename, boolean overwrite) {
FragmentActivity activity = getActivity();
if (activity == null) {
return;
}
String date = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(new Date());
String filename = "backup_" + date
+ (mExportSecret ? Constants.FILE_EXTENSION_PGP_MAIN : ".pub" + Constants.FILE_EXTENSION_PGP_MAIN);
// for kitkat and above, we have the document api
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
FileHelper.saveDocument(this, "application/octet-stream", filename, REQUEST_SAVE);
@@ -465,7 +465,7 @@ public class BackupCodeFragment extends CryptoOperationFragment<ExportKeyringPar
Notify.create(activity, R.string.snack_backup_exists, Style.WARN, new ActionListener() {
@Override
public void onAction() {
saveFile(true);
saveFile(filename, true);
}
}, R.string.snack_btn_overwrite).show();
return;