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

Merge pull request #4758 from k9mail/fix_imap_folder_refresh

Browse source 
Fix IMAP folder refresh
This commit is contained in:
cketti 2020-05-13 00:08:38 +02:00 committed by GitHub
commit f414d4788c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,8 @@ package com.fsck.k9.backend.imap
import com.fsck.k9.backend.api.BackendStorage import com.fsck.k9.backend.api.BackendStorage
import com.fsck.k9.backend.api.FolderInfo import com.fsck.k9.backend.api.FolderInfo
import com.fsck.k9.backend.api.updateFolders 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 com.fsck.k9.mail.store.imap.ImapStore
internal class CommandRefreshFolderList( internal class CommandRefreshFolderList(
@ -10,19 +12,18 @@ internal class CommandRefreshFolderList(
private val imapStore: ImapStore private val imapStore: ImapStore
) { ) {
fun refreshFolderList() { fun refreshFolderList() {
val foldersOnServer = imapStore.folders // TODO: Start using the proper server ID.
// For now we still use the old server ID format (decoded, with prefix removed).
val foldersOnServer = imapStore.folders.toLegacyFolderList()
val oldFolderServerIds = backendStorage.getFolderServerIds() val oldFolderServerIds = backendStorage.getFolderServerIds()
backendStorage.updateFolders { backendStorage.updateFolders {
val foldersToCreate = mutableListOf<FolderInfo>() val foldersToCreate = mutableListOf<FolderInfo>()
for (folder in foldersOnServer) { for (folder in foldersOnServer) {
// TODO: Start using the proper server ID. For now we still use the old server ID. if (folder.serverId !in oldFolderServerIds) {
val serverId = folder.oldServerId ?: continue foldersToCreate.add(FolderInfo(folder.serverId, folder.name, folder.type))
if (serverId !in oldFolderServerIds) {
foldersToCreate.add(FolderInfo(serverId, folder.name, folder.type))
} else { } else {
changeFolder(serverId, folder.name, folder.type) changeFolder(folder.serverId, folder.name, folder.type)
} }
} }
createFolders(foldersToCreate) createFolders(foldersToCreate)
@ -33,3 +34,14 @@ internal class CommandRefreshFolderList(
} }
} }
} }
private fun List<FolderListItem>.toLegacyFolderList(): List<LegacyFolderListItem> {
return this.filterNot { it.oldServerId == null }
.map { LegacyFolderListItem(it.oldServerId!!, it.name, it.type) }
}
private data class LegacyFolderListItem(
val serverId: String,
val name: String,
val type: FolderType
)