PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

use nicer filenames during export

Browse source
This commit is contained in:
Vincent Breitmoser 2015-08-27 16:34:08 +02:00
parent 9e3c041549
commit e7991e8dc8
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupFragment.java
View file

@ -18,7 +18,11 @@
package org.sufficientlysecure.keychain.ui;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.Locale;
import android.app.Activity;
import android.content.ContentResolver;
@ -93,7 +97,7 @@ public class BackupFragment extends Fragment {
}
if (!includeSecretKeys) {
mExportHelper.showExportKeysDialog(null, Constants.Path.APP_DIR_FILE, false);
startBackup(false);
return;
}
@ -148,7 +152,7 @@ public class BackupFragment extends Fragment {
return;
}
mExportHelper.showExportKeysDialog(null, Constants.Path.APP_DIR_FILE, true);
startBackup(true);
}
}.execute(activity.getContentResolver());
@ -178,7 +182,19 @@ public class BackupFragment extends Fragment {
return;
}
mExportHelper.showExportKeysDialog(null, Constants.Path.APP_DIR_FILE, true);
startBackup(true);
}
}
private void startBackup(boolean exportSecret) {
File filename;
String date = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(new Date());
if (exportSecret) {
filename = new File(Constants.Path.APP_DIR, "keys_" + date + ".asc");
} else {
filename = new File(Constants.Path.APP_DIR, "keys_" + date + ".pub.asc");
}
mExportHelper.showExportKeysDialog(null, filename, exportSecret);
}
}

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View file

@ -80,6 +80,7 @@ import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.NfcHelper;
import org.sufficientlysecure.keychain.util.Preferences;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@ -413,7 +414,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements
private void backupToFile() {
new ExportHelper(this).showExportKeysDialog(
mMasterKeyId, Constants.Path.APP_DIR_FILE, true);
mMasterKeyId, new File(Constants.Path.APP_DIR,
KeyFormattingUtils.convertKeyIdToHex(mMasterKeyId) + ".sec.asc"), true);
}
private void deleteKey() {