From c03dee6fe2f60717f448178dcf49d370dce0bab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 15 Oct 2015 21:56:23 +0200
Subject: File ending consisitency for backups

---
 .../src/main/java/org/sufficientlysecure/keychain/Constants.java  | 7 +++++++
 .../sufficientlysecure/keychain/operations/BackupOperation.java   | 7 +++----
 .../org/sufficientlysecure/keychain/ui/BackupCodeFragment.java    | 8 +++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'OpenKeychain/src/main/java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
index e74d585af..17db500ce 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
@@ -57,6 +57,13 @@ public final class Constants {
     public static final String FILE_EXTENSION_PGP_ALTERNATE = ".gpg";
     public static final String FILE_EXTENSION_ASC = ".asc";
 
+    public static final String FILE_BACKUP_PREFIX = "backup_";
+    public static final String FILE_EXTENSION_BACKUP_SECRET = ".sec.asc";
+    public static final String FILE_EXTENSION_BACKUP_PUBLIC = ".pub.asc";
+    public static final String FILE_ENCRYPTED_BACKUP_PREFIX = "backup_";
+    public static final String FILE_EXTENSION_ENCRYPTED_BACKUP_SECRET = ".sec.asc";
+    public static final String FILE_EXTENSION_ENCRYPTED_BACKUP_PUBLIC = ".pub.asc";
+
     // used by QR Codes (Guardian Project, Monkeysphere compatiblity)
     public static final String FINGERPRINT_SCHEME = "openpgp4fpr";
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java
index 8f383cd3a..5886f000c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java
@@ -147,12 +147,11 @@ public class BackupOperation extends BaseOperation<BackupKeyringParcel> {
 
             String filename;
             if (exportInput.mMasterKeyIds != null && exportInput.mMasterKeyIds.length == 1) {
-                filename = "backup_" + KeyFormattingUtils.convertKeyIdToHex(exportInput.mMasterKeyIds[0]);
-                filename += exportInput.mExportSecret ? ".sec.asc" : ".pub.asc";
+                filename = Constants.FILE_BACKUP_PREFIX + KeyFormattingUtils.convertKeyIdToHex(exportInput.mMasterKeyIds[0]);
             } else {
-                filename = "backup_" + new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(new Date());
-                filename += exportInput.mExportSecret ? ".asc" : ".pub.asc";
+                filename = Constants.FILE_BACKUP_PREFIX + new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(new Date());
             }
+            filename += exportInput.mExportSecret ? Constants.FILE_EXTENSION_BACKUP_SECRET : Constants.FILE_EXTENSION_BACKUP_PUBLIC;
 
             InputData inputData = new InputData(inStream, exportedDataSize, filename);
 
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 87f9052a7..bba83dfc8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
@@ -421,11 +421,13 @@ public class BackupCodeFragment extends CryptoOperationFragment<BackupKeyringPar
         }
 
         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);
+        String filename = Constants.FILE_ENCRYPTED_BACKUP_PREFIX + date
+                + (mExportSecret ? Constants.FILE_EXTENSION_ENCRYPTED_BACKUP_SECRET
+                : Constants.FILE_EXTENSION_ENCRYPTED_BACKUP_PUBLIC);
 
         if (mCachedBackupUri == null) {
-            mCachedBackupUri = TemporaryFileProvider.createFile(activity, filename, Constants.MIME_TYPE_ENCRYPTED_ALTERNATE);
+            mCachedBackupUri = TemporaryFileProvider.createFile(activity, filename,
+                    Constants.MIME_TYPE_ENCRYPTED_ALTERNATE);
             cryptoOperation();
             return;
         }
-- 
cgit v1.2.3