moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-30 13:12:25 -05:00
Code Issues Releases Wiki Activity

Renamed StorageImporter to SettingsImporter

Browse Source
This commit is contained in:
cketti 2011-10-14 05:58:55 +02:00
parent cf8bdef0a8
commit c835bb757a
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/fsck/k9/activity/Accounts.java
View File

@ -74,10 +74,10 @@ import com.fsck.k9.mail.store.StorageManager;
import com.fsck.k9.view.ColorChip; import com.fsck.k9.view.ColorChip;
import com.fsck.k9.preferences.SettingsExporter; import com.fsck.k9.preferences.SettingsExporter;
import com.fsck.k9.preferences.StorageImportExportException; import com.fsck.k9.preferences.StorageImportExportException;
import com.fsck.k9.preferences.StorageImporter; import com.fsck.k9.preferences.SettingsImporter;
import com.fsck.k9.preferences.StorageImporter.AccountDescription; import com.fsck.k9.preferences.SettingsImporter.AccountDescription;
import com.fsck.k9.preferences.StorageImporter.ImportContents; import com.fsck.k9.preferences.SettingsImporter.ImportContents;
import com.fsck.k9.preferences.StorageImporter.ImportResults; import com.fsck.k9.preferences.SettingsImporter.ImportResults;
public class Accounts extends K9ListActivity implements OnItemClickListener, OnClickListener { public class Accounts extends K9ListActivity implements OnItemClickListener, OnClickListener {
@ -1380,7 +1380,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
try { try {
InputStream is = mContext.getContentResolver().openInputStream(mUri); InputStream is = mContext.getContentResolver().openInputStream(mUri);
try { try {
mImportResults = StorageImporter.importSettings(mContext, is, mImportResults = SettingsImporter.importSettings(mContext, is,
mIncludeGlobals, mAccountUuids, mOverwrite); mIncludeGlobals, mAccountUuids, mOverwrite);
} finally { } finally {
try { try {
@ -1449,7 +1449,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
ContentResolver resolver = mContext.getContentResolver(); ContentResolver resolver = mContext.getContentResolver();
InputStream is = resolver.openInputStream(mUri); InputStream is = resolver.openInputStream(mUri);
try { try {
mImportContents = StorageImporter.getImportStreamContents(is); mImportContents = SettingsImporter.getImportStreamContents(is);
} finally { } finally {
try { try {
is.close(); is.close();

2
src/com/fsck/k9/preferences/SettingsExporter.java
View File

@ -40,7 +40,7 @@ public class SettingsExporter {
* <p> * <p>
* Increment this if you need to change the structure of the settings file. When you do this * Increment this if you need to change the structure of the settings file. When you do this
* remember that we also have to be able to handle old file formats. So have fun adding support * remember that we also have to be able to handle old file formats. So have fun adding support
* for that to {@link StorageImporter} :) * for that to {@link SettingsImporter} :)
* </p> * </p>
*/ */
public static final int FILE_FORMAT_VERSION = 1; public static final int FILE_FORMAT_VERSION = 1;

4
src/com/fsck/k9/preferences/StorageImporter.java → src/com/fsck/k9/preferences/SettingsImporter.java
View File

@ -30,12 +30,12 @@ import com.fsck.k9.mail.Store;
import com.fsck.k9.mail.Transport; import com.fsck.k9.mail.Transport;
import com.fsck.k9.preferences.Settings.InvalidSettingValueException; import com.fsck.k9.preferences.Settings.InvalidSettingValueException;
public class StorageImporter { public class SettingsImporter {
/** /**
* Class to list the contents of an import file/stream. * Class to list the contents of an import file/stream.
* *
* @see StorageImporter#getImportStreamContents(InputStream) * @see SettingsImporter#getImportStreamContents(InputStream)
*/ */
public static class ImportContents { public static class ImportContents {
/** /**