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

File ending consisitency for backups

Browse Source
This commit is contained in:
Dominik Schürmann
2015-10-15 21:56:23 +02:00
parent 53680b6213
commit c03dee6fe2
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,13 @@ public final class Constants {
public static final String FILE_EXTENSION_PGP_ALTERNATE = ".gpg"; 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";
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) // used by QR Codes (Guardian Project, Monkeysphere compatiblity)
public static final String FINGERPRINT_SCHEME = "openpgp4fpr"; public static final String FINGERPRINT_SCHEME = "openpgp4fpr";

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java
View File

@@ -147,12 +147,11 @@ public class BackupOperation extends BaseOperation<BackupKeyringParcel> {
String filename; String filename;
if (exportInput.mMasterKeyIds != null && exportInput.mMasterKeyIds.length == 1) { if (exportInput.mMasterKeyIds != null && exportInput.mMasterKeyIds.length == 1) {
filename = "backup_" + KeyFormattingUtils.convertKeyIdToHex(exportInput.mMasterKeyIds[0]); filename = Constants.FILE_BACKUP_PREFIX + KeyFormattingUtils.convertKeyIdToHex(exportInput.mMasterKeyIds[0]);
filename += exportInput.mExportSecret ? ".sec.asc" : ".pub.asc";
} else { } else {
filename = "backup_" + new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(new Date()); filename = Constants.FILE_BACKUP_PREFIX + new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(new Date());
filename += exportInput.mExportSecret ? ".asc" : ".pub.asc";
} }
filename += exportInput.mExportSecret ? Constants.FILE_EXTENSION_BACKUP_SECRET : Constants.FILE_EXTENSION_BACKUP_PUBLIC;
InputData inputData = new InputData(inStream, exportedDataSize, filename); InputData inputData = new InputData(inStream, exportedDataSize, filename);

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

@@ -421,11 +421,13 @@ public class BackupCodeFragment extends CryptoOperationFragment<BackupKeyringPar
} }
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 String filename = Constants.FILE_ENCRYPTED_BACKUP_PREFIX + date
+ (mExportSecret ? Constants.FILE_EXTENSION_PGP_MAIN : ".pub" + Constants.FILE_EXTENSION_PGP_MAIN); + (mExportSecret ? Constants.FILE_EXTENSION_ENCRYPTED_BACKUP_SECRET
: Constants.FILE_EXTENSION_ENCRYPTED_BACKUP_PUBLIC);
if (mCachedBackupUri == null) { if (mCachedBackupUri == null) {
mCachedBackupUri = TemporaryFileProvider.createFile(activity, filename, Constants.MIME_TYPE_ENCRYPTED_ALTERNATE); mCachedBackupUri = TemporaryFileProvider.createFile(activity, filename,
Constants.MIME_TYPE_ENCRYPTED_ALTERNATE);
cryptoOperation(); cryptoOperation();
return; return;
} }