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

Unify backup filename

Browse Source
This commit is contained in:
Dominik Schürmann
2015-10-15 17:26:51 +02:00
parent c4b3dc0643
commit bed3819c11
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
View File

@@ -52,8 +52,8 @@ public final class Constants {
public static final String ENCRYPTED_FILES_MIME = "application/octet-stream"; public static final String ENCRYPTED_FILES_MIME = "application/octet-stream";
public static final String ENCRYPTED_TEXT_MIME = "text/plain"; public static final String ENCRYPTED_TEXT_MIME = "text/plain";
public static final String FILE_EXTENSION_PGP_MAIN = ".gpg"; public static final String FILE_EXTENSION_PGP_MAIN = ".pgp";
public static final String FILE_EXTENSION_PGP_ALTERNATE = ".pgp"; public static final String FILE_EXTENSION_PGP_ALTERNATE = ".gpg";
public static final String FILE_EXTENSION_ASC = ".asc"; public static final String FILE_EXTENSION_ASC = ".asc";
// used by QR Codes (Guardian Project, Monkeysphere compatiblity) // used by QR Codes (Guardian Project, Monkeysphere compatiblity)

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

@@ -452,15 +452,16 @@ public class BackupCodeFragment extends CryptoOperationFragment<ExportKeyringPar
} }
String date = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(new Date()); 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 // for kitkat and above, we have the document api
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
String filename = "openkeychain_backup_" + date + (mExportSecret ? ".gpg" : ".pub.gpg");
FileHelper.saveDocument(this, "application/octet-stream", filename, REQUEST_SAVE); FileHelper.saveDocument(this, "application/octet-stream", filename, REQUEST_SAVE);
return; return;
} }
File file = new File(Constants.Path.APP_DIR, "backup_" + date + (mExportSecret ? ".gpg" : ".pub.gpg")); File file = new File(Constants.Path.APP_DIR, filename);
if (!overwrite && file.exists()) { if (!overwrite && file.exists()) {
Notify.create(activity, R.string.snack_backup_exists, Style.WARN, new ActionListener() { Notify.create(activity, R.string.snack_backup_exists, Style.WARN, new ActionListener() {