wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2636 from clawoflight/add_date_to_exported_settings_filename

Browse source 
SettingsExporter.java: add date to export
This commit is contained in:
Vincent Breitmoser 2017-07-23 00:12:05 +02:00 committed by GitHub
commit 228441bfd6
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
k9mail/src/main/java/com/fsck/k9/activity/Accounts.java
View file

@ -1924,7 +1924,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT); Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
intent.setType("application/octet-stream"); intent.setType("application/octet-stream");
intent.putExtra(Intent.EXTRA_TITLE, SettingsExporter.EXPORT_FILENAME); intent.putExtra(Intent.EXTRA_TITLE, SettingsExporter.generateDatedExportFileName());
intent.addCategory(Intent.CATEGORY_OPENABLE); intent.addCategory(Intent.CATEGORY_OPENABLE);
startActivityForResult(intent, ACTIVITY_REQUEST_SAVE_SETTINGS_FILE); startActivityForResult(intent, ACTIVITY_REQUEST_SAVE_SETTINGS_FILE);

14
k9mail/src/main/java/com/fsck/k9/preferences/SettingsExporter.java
View file

@ -5,7 +5,9 @@ import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -33,7 +35,8 @@ import org.xmlpull.v1.XmlSerializer;
public class SettingsExporter { public class SettingsExporter {
public static final String EXPORT_FILENAME = "settings.k9s"; public static final String EXPORT_FILENAME_PREFIX = "k9_settings_export";
public static final String EXPORT_FILENAME_SUFFIX = "k9s";
/** /**
* File format version number. * File format version number.
@ -87,7 +90,7 @@ public class SettingsExporter {
Timber.d("Unable to create directory: %s", dir.getAbsolutePath()); Timber.d("Unable to create directory: %s", dir.getAbsolutePath());
} }
File file = FileHelper.createUniqueFile(dir, EXPORT_FILENAME); File file = FileHelper.createUniqueFile(dir, generateDatedExportFileName());
String filename = file.getAbsolutePath(); String filename = file.getAbsolutePath();
os = new FileOutputStream(filename); os = new FileOutputStream(filename);
@ -533,4 +536,11 @@ public class SettingsExporter {
} }
serializer.endTag(null, VALUE_ELEMENT); serializer.endTag(null, VALUE_ELEMENT);
} }
public static String generateDatedExportFileName() {
Calendar now = Calendar.getInstance();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
return String.format("%s_%s.%s", EXPORT_FILENAME_PREFIX, dateFormat.format(now.getTime()), EXPORT_FILENAME_SUFFIX);
}
} }