Merge pull request #9772 from rafaeltonholo/fix/9567/duplicated-imap-prefix (901befc8) · Commits · e / os / Mail

backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandRefreshFolderList.kt

+19 −6

Original line number	Diff line number	Diff line
		@@ -6,15 +6,25 @@ import com.fsck.k9.backend.api.updateFolders
		import com.fsck.k9.mail.FolderType
		import com.fsck.k9.mail.store.imap.FolderListItem
		import com.fsck.k9.mail.store.imap.ImapStore
		import net.thunderbird.core.logging.Logger
		import net.thunderbird.core.logging.legacy.Log
		import net.thunderbird.feature.mail.folder.api.FolderPathDelimiter

		private const val TAG = "CommandRefreshFolderList"

		internal class CommandRefreshFolderList(
		private val backendStorage: BackendStorage,
		private val imapStore: ImapStore,
		private val logger: Logger = Log,
		) {

		private val LegacyFolderListItem.normalizedServerId: String
		get() = imapStore.combinedPrefix?.let {
		serverId.removePrefix(prefix = it)
		} ?: serverId

		fun refreshFolderList(): FolderPathDelimiter? {
		// TODO: Start using the proper server ID.
		// For now we still use the old server ID format (decoded, with prefix removed).
		logger.verbose(TAG) { "refreshFolderList() called" }
		val folders = imapStore.getFolders()
		val folderPathDelimiter = folders.firstOrNull { it.folderPathDelimiter != null }?.folderPathDelimiter
		val foldersOnServer = folders.toLegacyFolderList()
		@@ -23,16 +33,19 @@ internal class CommandRefreshFolderList(
		backendStorage.updateFolders {
		val foldersToCreate = mutableListOf<FolderInfo>()
		for (folder in foldersOnServer) {
		if (folder.serverId !in oldFolderServerIds) {
		foldersToCreate.add(FolderInfo(folder.serverId, folder.name, folder.type))
		if (folder.normalizedServerId !in oldFolderServerIds) {
		foldersToCreate.add(FolderInfo(folder.normalizedServerId, folder.name, folder.type))
		} else {
		changeFolder(folder.serverId, folder.name, folder.type)
		changeFolder(folder.normalizedServerId, folder.name, folder.type)
		}
		}

		logger.verbose(TAG) { "refreshFolderList: foldersToCreate = $foldersToCreate" }
		createFolders(foldersToCreate)

		val newFolderServerIds = foldersOnServer.map { it.serverId }
		val newFolderServerIds = foldersOnServer.map { it.normalizedServerId }
		val removedFolderServerIds = oldFolderServerIds - newFolderServerIds
		logger.verbose(TAG) { "refreshFolderList: folders to remove = $removedFolderServerIds" }
		deleteFolders(removedFolderServerIds)
		}
		return folderPathDelimiter

backend/imap/src/test/java/com/fsck/k9/backend/imap/TestImapStore.kt

+7 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,9 @@ import com.fsck.k9.mail.store.imap.ImapStore
		class TestImapStore : ImapStore {
		private val folders = mutableMapOf<String, ImapFolder>()

		override val combinedPrefix: String?
		get() = throw UnsupportedOperationException("not implemented")

		fun addFolder(serverId: String): TestImapFolder {
		require(!folders.containsKey(serverId)) { "Folder '$serverId' already exists" }

		@@ -44,4 +47,8 @@ class TestImapStore : ImapStore {
		override fun closeAllConnections() {
		throw UnsupportedOperationException("not implemented")
		}

		override fun fetchImapPrefix() {
		throw UnsupportedOperationException("not implemented")
		}
		}

backend/imap/src/test/kotlin/net/thunderbird/backend/imap/ImapRemoteFolderCreatorTest.kt

+7 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,9 @@ class ImapRemoteFolderCreatorTest {
		private class FakeImapStore(
		private val folder: TestImapFolder,
		) : ImapStore {
		override val combinedPrefix: String?
		get() = throw NotImplementedError("combinedPrefix not implemented")

		override fun checkSettings() {
		throw NotImplementedError("checkSettings not implemented")
		}
		@@ -135,4 +138,8 @@ private class FakeImapStore(
		override fun closeAllConnections() {
		throw NotImplementedError("closeAllConnections not implemented")
		}

		override fun fetchImapPrefix() {
		throw NotImplementedError("fetchImapPrefix not implemented")
		}
		}

legacy/storage/build.gradle.kts

+4 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,10 @@ dependencies {
		implementation(projects.core.logging.api)

		implementation(projects.legacy.core)
		// Required for MigrationTo107
		implementation(projects.mail.common)
		implementation(projects.mail.protocols.imap)

		implementation(libs.androidx.core.ktx)
		implementation(libs.mime4j.core)
		implementation(libs.commons.io)

legacy/storage/src/main/java/com/fsck/k9/storage/StoreSchemaDefinition.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ import net.thunderbird.core.logging.legacy.Log;


		class StoreSchemaDefinition implements SchemaDefinition {
		static final int DB_VERSION = 89;
		static final int DB_VERSION = 90;

		private final MigrationsHelper migrationsHelper;