diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 17:26:51 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 17:26:51 +0200 |
| commit | bed3819c11e2d7b4be27c1132d38a4420f0a56ff (patch) | |
| tree | be4a383e8d3653c3b24eb77dbb8f6381b8bfb5aa /OpenKeychain/src/main/java/org/sufficientlysecure/keychain | |
| parent | c4b3dc0643a91d7c3e7e8c14479dbca31b590927 (diff) | |
| download | open-keychain-bed3819c11e2d7b4be27c1132d38a4420f0a56ff.tar.gz open-keychain-bed3819c11e2d7b4be27c1132d38a4420f0a56ff.tar.bz2 open-keychain-bed3819c11e2d7b4be27c1132d38a4420f0a56ff.zip | |
Unify backup filename
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index 6a9656b28..e76db157e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -52,8 +52,8 @@ public final class Constants { public static final String ENCRYPTED_FILES_MIME = "application/octet-stream"; 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_ALTERNATE = ".pgp"; + public static final String FILE_EXTENSION_PGP_MAIN = ".pgp"; + public static final String FILE_EXTENSION_PGP_ALTERNATE = ".gpg"; public static final String FILE_EXTENSION_ASC = ".asc"; // used by QR Codes (Guardian Project, Monkeysphere compatiblity) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java index be1399a30..94485d401 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java @@ -452,15 +452,16 @@ public class BackupCodeFragment extends CryptoOperationFragment<ExportKeyringPar } 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) { - String filename = "openkeychain_backup_" + date + (mExportSecret ? ".gpg" : ".pub.gpg"); FileHelper.saveDocument(this, "application/octet-stream", filename, REQUEST_SAVE); 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()) { Notify.create(activity, R.string.snack_backup_exists, Style.WARN, new ActionListener() { |