Rename Account.get*Folder() to getImported*Folder() (cc637a65) · Commits · e / os / Mail

app/core/src/main/java/com/fsck/k9/Account.java

+35 −56

Original line number	Diff line number	Diff line
		@@ -125,11 +125,11 @@ public class Account implements BaseAccount {
		private boolean notifySelfNewMail;
		private boolean notifyContactsMailOnly;
		private String legacyInboxFolder;
		private String draftsFolder;
		private String sentFolder;
		private String trashFolder;
		private String archiveFolder;
		private String spamFolder;
		private String importedDraftsFolder;
		private String importedSentFolder;
		private String importedTrashFolder;
		private String importedArchiveFolder;
		private String importedSpamFolder;
		private Long inboxFolderId;
		private Long outboxFolderId;
		private Long draftsFolderId;
		@@ -142,7 +142,7 @@ public class Account implements BaseAccount {
		private SpecialFolderSelection trashFolderSelection;
		private SpecialFolderSelection archiveFolderSelection;
		private SpecialFolderSelection spamFolderSelection;
		private String autoExpandFolder;
		private String importedAutoExpandFolder;
		private Long autoExpandFolderId;
		private FolderMode folderDisplayMode;
		private FolderMode folderSyncMode;
		@@ -414,12 +414,12 @@ public class Account implements BaseAccount {
		this.deletePolicy = deletePolicy;
		}

		public synchronized String getDraftsFolder() {
		return draftsFolder;
		public synchronized String getImportedDraftsFolder() {
		return importedDraftsFolder;
		}

		public synchronized void setDraftsFolder(String folderServerId) {
		draftsFolder = folderServerId;
		public synchronized void setImportedDraftsFolder(String folderServerId) {
		importedDraftsFolder = folderServerId;
		}

		@Nullable
		@@ -436,20 +436,16 @@ public class Account implements BaseAccount {
		draftsFolderSelection = selection;
		}

		/**
		* Checks if this account has a drafts folder set.
		* @return true if account has a drafts folder set.
		*/
		public synchronized boolean hasDraftsFolder() {
		return draftsFolder != null;
		return draftsFolderId != null;
		}

		public synchronized String getSentFolder() {
		return sentFolder;
		public synchronized String getImportedSentFolder() {
		return importedSentFolder;
		}

		public synchronized void setSentFolder(String folderServerId) {
		sentFolder = folderServerId;
		public synchronized void setImportedSentFolder(String folderServerId) {
		importedSentFolder = folderServerId;
		}

		@Nullable
		@@ -466,21 +462,16 @@ public class Account implements BaseAccount {
		sentFolderSelection = selection;
		}

		/**
		* Checks if this account has a sent folder set.
		* @return true if account has a sent folder set.
		*/
		public synchronized boolean hasSentFolder() {
		return sentFolder != null;
		return sentFolderId != null;
		}


		public synchronized String getTrashFolder() {
		return trashFolder;
		public synchronized String getImportedTrashFolder() {
		return importedTrashFolder;
		}

		public synchronized void setTrashFolder(String folderServerId) {
		trashFolder = folderServerId;
		public synchronized void setImportedTrashFolder(String folderServerId) {
		importedTrashFolder = folderServerId;
		}

		@Nullable
		@@ -497,20 +488,16 @@ public class Account implements BaseAccount {
		trashFolderSelection = selection;
		}

		/**
		* Checks if this account has a trash folder set.
		* @return true if account has a trash folder set.
		*/
		public synchronized boolean hasTrashFolder() {
		return trashFolder != null;
		return trashFolderId != null;
		}

		public synchronized String getArchiveFolder() {
		return archiveFolder;
		public synchronized String getImportedArchiveFolder() {
		return importedArchiveFolder;
		}

		public synchronized void setArchiveFolder(String archiveFolder) {
		this.archiveFolder = archiveFolder;
		public synchronized void setImportedArchiveFolder(String archiveFolder) {
		this.importedArchiveFolder = archiveFolder;
		}

		@Nullable
		@@ -527,20 +514,16 @@ public class Account implements BaseAccount {
		archiveFolderSelection = selection;
		}

		/**
		* Checks if this account has an archive folder set.
		* @return true if account has an archive folder set.
		*/
		public synchronized boolean hasArchiveFolder() {
		return archiveFolder != null;
		return archiveFolderId != null;
		}

		public synchronized String getSpamFolder() {
		return spamFolder;
		public synchronized String getImportedSpamFolder() {
		return importedSpamFolder;
		}

		public synchronized void setSpamFolder(String folderServerId) {
		spamFolder = folderServerId;
		public synchronized void setImportedSpamFolder(String folderServerId) {
		importedSpamFolder = folderServerId;
		}

		@Nullable
		@@ -557,12 +540,8 @@ public class Account implements BaseAccount {
		spamFolderSelection = selection;
		}

		/**
		* Checks if this account has a spam folder set.
		* @return true if account has a spam folder set.
		*/
		public synchronized boolean hasSpamFolder() {
		return spamFolder != null;
		return spamFolderId != null;
		}

		@NotNull
		@@ -599,12 +578,12 @@ public class Account implements BaseAccount {
		outboxFolderId = folderId;
		}

		public synchronized String getAutoExpandFolder() {
		return autoExpandFolder;
		public synchronized String getImportedAutoExpandFolder() {
		return importedAutoExpandFolder;
		}

		public synchronized void setAutoExpandFolder(String name) {
		autoExpandFolder = name;
		public synchronized void setImportedAutoExpandFolder(String name) {
		importedAutoExpandFolder = name;
		}

		@Nullable

app/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt

+13 −13

Original line number	Diff line number	Diff line
		@@ -52,11 +52,11 @@ class AccountPreferenceSerializer(
		isNotifySync = storage.getBoolean("$accountUuid.notifyMailCheck", false)
		deletePolicy = DeletePolicy.fromInt(storage.getInt("$accountUuid.deletePolicy", DeletePolicy.NEVER.setting))
		legacyInboxFolder = storage.getString("$accountUuid.inboxFolderName", null)
		draftsFolder = storage.getString("$accountUuid.draftsFolderName", null)
		sentFolder = storage.getString("$accountUuid.sentFolderName", null)
		trashFolder = storage.getString("$accountUuid.trashFolderName", null)
		archiveFolder = storage.getString("$accountUuid.archiveFolderName", null)
		spamFolder = storage.getString("$accountUuid.spamFolderName", null)
		importedDraftsFolder = storage.getString("$accountUuid.draftsFolderName", null)
		importedSentFolder = storage.getString("$accountUuid.sentFolderName", null)
		importedTrashFolder = storage.getString("$accountUuid.trashFolderName", null)
		importedArchiveFolder = storage.getString("$accountUuid.archiveFolderName", null)
		importedSpamFolder = storage.getString("$accountUuid.spamFolderName", null)

		inboxFolderId = storage.getString("$accountUuid.inboxFolderId", null)?.toLongOrNull()
		outboxFolderId = storage.getString("$accountUuid.outboxFolderId", null)?.toLongOrNull()
		@@ -113,7 +113,7 @@ class AccountPreferenceSerializer(
		setCompression(type, useCompression)
		}

		autoExpandFolder = storage.getString("$accountUuid.autoExpandFolderName", null)
		importedAutoExpandFolder = storage.getString("$accountUuid.autoExpandFolderName", null)

		accountNumber = storage.getInt("$accountUuid.accountNumber", UNASSIGNED_ACCOUNT_NUMBER)

		@@ -246,11 +246,11 @@ class AccountPreferenceSerializer(
		editor.putBoolean("$accountUuid.notifyMailCheck", isNotifySync)
		editor.putInt("$accountUuid.deletePolicy", deletePolicy.setting)
		editor.putString("$accountUuid.inboxFolderName", legacyInboxFolder)
		editor.putString("$accountUuid.draftsFolderName", draftsFolder)
		editor.putString("$accountUuid.sentFolderName", sentFolder)
		editor.putString("$accountUuid.trashFolderName", trashFolder)
		editor.putString("$accountUuid.archiveFolderName", archiveFolder)
		editor.putString("$accountUuid.spamFolderName", spamFolder)
		editor.putString("$accountUuid.draftsFolderName", importedDraftsFolder)
		editor.putString("$accountUuid.sentFolderName", importedSentFolder)
		editor.putString("$accountUuid.trashFolderName", importedTrashFolder)
		editor.putString("$accountUuid.archiveFolderName", importedArchiveFolder)
		editor.putString("$accountUuid.spamFolderName", importedSpamFolder)
		editor.putString("$accountUuid.inboxFolderId", inboxFolderId?.toString())
		editor.putString("$accountUuid.outboxFolderId", outboxFolderId?.toString())
		editor.putString("$accountUuid.draftsFolderId", draftsFolderId?.toString())
		@@ -263,7 +263,7 @@ class AccountPreferenceSerializer(
		editor.putString("$accountUuid.sentFolderSelection", sentFolderSelection.name)
		editor.putString("$accountUuid.spamFolderSelection", spamFolderSelection.name)
		editor.putString("$accountUuid.trashFolderSelection", trashFolderSelection.name)
		editor.putString("$accountUuid.autoExpandFolderName", autoExpandFolder)
		editor.putString("$accountUuid.autoExpandFolderName", importedAutoExpandFolder)
		editor.putString("$accountUuid.autoExpandFolderId", autoExpandFolderId?.toString())
		editor.putInt("$accountUuid.accountNumber", accountNumber)
		editor.putString("$accountUuid.sortTypeEnum", sortType.name)
		@@ -556,7 +556,7 @@ class AccountPreferenceSerializer(
		showPictures = ShowPictures.NEVER
		isSignatureBeforeQuotedText = false
		expungePolicy = Expunge.EXPUNGE_IMMEDIATELY
		autoExpandFolder = null
		importedAutoExpandFolder = null
		legacyInboxFolder = null
		maxPushFolders = 10
		isGoToUnreadMessageSearch = false

app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo67.kt

+5 −5

Original line number	Diff line number	Diff line
		@@ -11,11 +11,11 @@ internal object MigrationTo67 {
		val account = migrationsHelper.account
		setFolderType(db, account.legacyInboxFolder, "inbox")
		setFolderType(db, "K9MAIL_INTERNAL_OUTBOX", "outbox")
		setFolderType(db, account.trashFolder, "trash")
		setFolderType(db, account.draftsFolder, "drafts")
		setFolderType(db, account.spamFolder, "spam")
		setFolderType(db, account.sentFolder, "sent")
		setFolderType(db, account.archiveFolder, "archive")
		setFolderType(db, account.importedTrashFolder, "trash")
		setFolderType(db, account.importedDraftsFolder, "drafts")
		setFolderType(db, account.importedSpamFolder, "spam")
		setFolderType(db, account.importedSentFolder, "sent")
		setFolderType(db, account.importedArchiveFolder, "archive")
		}

		private fun setFolderType(db: SQLiteDatabase, serverId: String?, type: String) {

app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo75.kt

+12 −12

Original line number	Diff line number	Diff line
		@@ -9,19 +9,19 @@ internal class MigrationTo75(private val db: SQLiteDatabase, private val migrati

		setSpecialFolderId(account.legacyInboxFolder, account::setInboxFolderId)
		setSpecialFolderId("K9MAIL_INTERNAL_OUTBOX", account::setOutboxFolderId)
		setSpecialFolderId(account.draftsFolder, account::setDraftsFolderId)
		setSpecialFolderId(account.sentFolder, account::setSentFolderId)
		setSpecialFolderId(account.trashFolder, account::setTrashFolderId)
		setSpecialFolderId(account.archiveFolder, account::setArchiveFolderId)
		setSpecialFolderId(account.spamFolder, account::setSpamFolderId)
		setSpecialFolderId(account.autoExpandFolder, account::setAutoExpandFolderId)
		setSpecialFolderId(account.importedDraftsFolder, account::setDraftsFolderId)
		setSpecialFolderId(account.importedSentFolder, account::setSentFolderId)
		setSpecialFolderId(account.importedTrashFolder, account::setTrashFolderId)
		setSpecialFolderId(account.importedArchiveFolder, account::setArchiveFolderId)
		setSpecialFolderId(account.importedSpamFolder, account::setSpamFolderId)
		setSpecialFolderId(account.importedAutoExpandFolder, account::setAutoExpandFolderId)

		account.draftsFolder = null
		account.sentFolder = null
		account.trashFolder = null
		account.archiveFolder = null
		account.spamFolder = null
		account.autoExpandFolder = null
		account.importedDraftsFolder = null
		account.importedSentFolder = null
		account.importedTrashFolder = null
		account.importedArchiveFolder = null
		account.importedSpamFolder = null
		account.importedAutoExpandFolder = null

		migrationsHelper.saveAccount()
		}

app/storage/src/test/java/com/fsck/k9/storage/StoreSchemaDefinitionTest.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -400,11 +400,11 @@ public class StoreSchemaDefinitionTest extends K9RobolectricTest {
		private Account createAccount() {
		Account account = mock(Account.class);
		when(account.getLegacyInboxFolder()).thenReturn("Inbox");
		when(account.getTrashFolder()).thenReturn("Trash");
		when(account.getDraftsFolder()).thenReturn("Drafts");
		when(account.getSpamFolder()).thenReturn("Spam");
		when(account.getSentFolder()).thenReturn("Sent");
		when(account.getArchiveFolder()).thenReturn(null);
		when(account.getImportedTrashFolder()).thenReturn("Trash");
		when(account.getImportedDraftsFolder()).thenReturn("Drafts");
		when(account.getImportedSpamFolder()).thenReturn("Spam");
		when(account.getImportedSentFolder()).thenReturn("Sent");
		when(account.getImportedArchiveFolder()).thenReturn(null);
		when(account.getLocalStorageProviderId()).thenReturn(StorageManager.InternalStorageProvider.ID);
		when(account.getStoreUri()).thenReturn("dummy://");
		return account;