luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-06-23 17:40:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #392 from alexbakker/export-filename

Browse source 
Append a timestamp to the filename of exported vaults
This commit is contained in:
Michael Schättgen 2020-05-09 14:39:18 +02:00 • committed by GitHub
commit 984010dc7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
View file

@ -37,6 +37,7 @@ import com.beemdevelopment.aegis.services.NotificationService;
import com.beemdevelopment.aegis.ui.models.ImportEntry; import com.beemdevelopment.aegis.ui.models.ImportEntry;
import com.beemdevelopment.aegis.ui.preferences.SwitchPreference; import com.beemdevelopment.aegis.ui.preferences.SwitchPreference;
import com.beemdevelopment.aegis.util.UUIDMap; import com.beemdevelopment.aegis.util.UUIDMap;
import com.beemdevelopment.aegis.vault.VaultBackupManager;
import com.beemdevelopment.aegis.vault.VaultEntry; import com.beemdevelopment.aegis.vault.VaultEntry;
import com.beemdevelopment.aegis.vault.VaultFileCredentials; import com.beemdevelopment.aegis.vault.VaultFileCredentials;
import com.beemdevelopment.aegis.vault.VaultFileException; import com.beemdevelopment.aegis.vault.VaultFileException;
@ -633,10 +634,13 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()) AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
.setTitle(R.string.pref_export_summary) .setTitle(R.string.pref_export_summary)
.setPositiveButton(android.R.string.ok, (dialog, which) -> { .setPositiveButton(android.R.string.ok, (dialog, which) -> {
String filename = checked.get() ? VaultManager.FILENAME_EXPORT : VaultManager.FILENAME_EXPORT_PLAIN;
filename = new VaultBackupManager.FileInfo(filename).toString();
Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT) Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT)
.addCategory(Intent.CATEGORY_OPENABLE) .addCategory(Intent.CATEGORY_OPENABLE)
.setType("application/json") .setType("application/json")
.putExtra(Intent.EXTRA_TITLE, checked.get() ? VaultManager.FILENAME_EXPORT : VaultManager.FILENAME_EXPORT_PLAIN); .putExtra(Intent.EXTRA_TITLE, filename);
startActivityForResult(intent, checked.get() ? CODE_EXPORT_ENCRYPT : CODE_EXPORT); startActivityForResult(intent, checked.get() ? CODE_EXPORT_ENCRYPT : CODE_EXPORT);
}) })

8
app/src/main/java/com/beemdevelopment/aegis/vault/VaultBackupManager.java
View file

@ -41,7 +41,7 @@ public class VaultBackupManager {
} }
public void create(Uri dirUri, int versionsToKeep) throws VaultManagerException { public void create(Uri dirUri, int versionsToKeep) throws VaultManagerException {
FileInfo fileInfo = new FileInfo(FILENAME_PREFIX, Calendar.getInstance().getTime()); FileInfo fileInfo = new FileInfo(FILENAME_PREFIX);
DocumentFile dir = DocumentFile.fromTreeUri(_context, dirUri); DocumentFile dir = DocumentFile.fromTreeUri(_context, dirUri);
Log.i(TAG, String.format("Creating backup at %s: %s", Uri.decode(dir.getUri().toString()), fileInfo.toString())); Log.i(TAG, String.format("Creating backup at %s: %s", Uri.decode(dir.getUri().toString()), fileInfo.toString()));
@ -112,7 +112,7 @@ public class VaultBackupManager {
} }
} }
private static class FileInfo { public static class FileInfo {
private String _filename; private String _filename;
private Date _date; private Date _date;
@ -121,6 +121,10 @@ public class VaultBackupManager {
_date = date; _date = date;
} }
public FileInfo(String filename) {
this(filename, Calendar.getInstance().getTime());
}
public static FileInfo parseFilename(String filename) throws ParseException { public static FileInfo parseFilename(String filename) throws ParseException {
if (filename == null) { if (filename == null) {
throw new ParseException("The filename must not be null", 0); throw new ParseException("The filename must not be null", 0);