From bed3819c11e2d7b4be27c1132d38a4420f0a56ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 15 Oct 2015 17:26:51 +0200
Subject: Unify backup filename

---
 .../java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java')

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() {
-- 
cgit v1.2.3