Add MessageStore.getFolderServerId() (8891c56e) · Commits · e / os / Mail

app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStore.kt

+3 −47

Original line number	Diff line number	Diff line
		package com.fsck.k9.storage.messages

		import com.fsck.k9.Account.FolderMode
		import com.fsck.k9.mail.Flag
		import com.fsck.k9.mail.FolderClass
		@@ -15,7 +14,6 @@ import com.fsck.k9.mailstore.SaveMessageData
		import com.fsck.k9.mailstore.StorageManager
		import com.fsck.k9.message.extractors.BasicPartInfoExtractor
		import java.util.Date

		class K9MessageStore(
		database: LockableDatabase,
		storageManager: StorageManager,
		@@ -33,6 +31,7 @@ class K9MessageStore(
		private val copyMessageOperations = CopyMessageOperations(database, attachmentFileManager, threadMessageOperations)
		private val moveMessageOperations = MoveMessageOperations(database, threadMessageOperations)
		private val flagMessageOperations = FlagMessageOperations(database)
		private val retrieveMessageOperations = RetrieveMessageOperations(database)
		private val deleteMessageOperations = DeleteMessageOperations(database, attachmentFileManager)
		private val createFolderOperations = CreateFolderOperations(database)
		private val retrieveFolderOperations = RetrieveFolderOperations(database)
		@@ -40,87 +39,66 @@ class K9MessageStore(
		private val deleteFolderOperations = DeleteFolderOperations(database, attachmentFileManager)
		private val keyValueStoreOperations = KeyValueStoreOperations(database)
		private val databaseOperations = DatabaseOperations(database, storageManager, accountUuid)

		override fun saveRemoteMessage(folderId: Long, messageServerId: String, messageData: SaveMessageData) {
		saveMessageOperations.saveRemoteMessage(folderId, messageServerId, messageData)
		}

		override fun saveLocalMessage(folderId: Long, messageData: SaveMessageData, existingMessageId: Long?): Long {
		return saveMessageOperations.saveLocalMessage(folderId, messageData, existingMessageId)
		}

		override fun copyMessage(messageId: Long, destinationFolderId: Long): Long {
		return copyMessageOperations.copyMessage(messageId, destinationFolderId)
		}

		override fun moveMessage(messageId: Long, destinationFolderId: Long): Long {
		return moveMessageOperations.moveMessage(messageId, destinationFolderId)
		}

		override fun setFlag(messageIds: Collection<Long>, flag: Flag, set: Boolean) {
		flagMessageOperations.setFlag(messageIds, flag, set)
		}

		override fun setMessageFlag(folderId: Long, messageServerId: String, flag: Flag, set: Boolean) {
		flagMessageOperations.setMessageFlag(folderId, messageServerId, flag, set)
		}

		override fun getMessageServerId(messageId: Long): String {
		return retrieveMessageOperations.getMessageServerId(messageId)
		}

		override fun getMessageServerIds(messageIds: Collection<Long>): Map<Long, String> {
		return retrieveMessageOperations.getMessageServerIds(messageIds)
		}

		override fun getMessageServerIds(folderId: Long): Set<String> {
		return retrieveMessageOperations.getMessageServerIds(folderId)
		}

		override fun isMessagePresent(folderId: Long, messageServerId: String): Boolean {
		return retrieveMessageOperations.isMessagePresent(folderId, messageServerId)
		}

		override fun getMessageFlags(folderId: Long, messageServerId: String): Set<Flag> {
		return retrieveMessageOperations.getMessageFlags(folderId, messageServerId)
		}

		override fun getAllMessagesAndEffectiveDates(folderId: Long): Map<String, Long?> {
		return retrieveMessageOperations.getAllMessagesAndEffectiveDates(folderId)
		}

		override fun getOldestMessageDate(folderId: Long): Date? {
		return retrieveMessageOperations.getOldestMessageDate(folderId)
		}

		override fun getHeaders(folderId: Long, messageServerId: String): List<Header> {
		return retrieveMessageOperations.getHeaders(folderId, messageServerId)
		}

		override fun getLastUid(folderId: Long): Long? {
		return retrieveMessageOperations.getLastUid(folderId)
		}

		override fun destroyMessages(folderId: Long, messageServerIds: Collection<String>) {
		deleteMessageOperations.destroyMessages(folderId, messageServerIds)
		}

		override fun createFolders(folders: List<CreateFolderInfo>) {
		createFolderOperations.createFolders(folders)
		}

		override fun <T> getFolder(folderId: Long, mapper: FolderMapper<T>): T? {
		return retrieveFolderOperations.getFolder(folderId, mapper)
		}

		override fun <T> getFolder(folderServerId: String, mapper: FolderMapper<T>): T? {
		return retrieveFolderOperations.getFolder(folderServerId, mapper)
		}

		override fun <T> getFolders(excludeLocalOnly: Boolean, mapper: FolderMapper<T>): List<T> {
		return retrieveFolderOperations.getFolders(excludeLocalOnly, mapper)
		}

		override fun <T> getDisplayFolders(
		displayMode: FolderMode,
		outboxFolderId: Long?,
		@@ -128,7 +106,6 @@ class K9MessageStore(
		): List<T> {
		return retrieveFolderOperations.getDisplayFolders(displayMode, outboxFolderId, mapper)
		}

		override fun getFolderId(folderServerId: String): Long? {
		return retrieveFolderOperations.getFolderId(folderServerId)
		}
		@@ -140,87 +117,66 @@ class K9MessageStore(
		override fun getMessageCount(folderId: Long): Int {
		return retrieveFolderOperations.getMessageCount(folderId)
		}

		override fun getSize(): Long {
		return databaseOperations.getSize()
		}

		override fun changeFolder(folderServerId: String, name: String, type: FolderType) {
		updateFolderOperations.changeFolder(folderServerId, name, type)
		}

		override fun updateFolderSettings(folderDetails: FolderDetails) {
		updateFolderOperations.updateFolderSettings(folderDetails)
		}

		override fun setIncludeInUnifiedInbox(folderId: Long, includeInUnifiedInbox: Boolean) {
		updateFolderOperations.setIncludeInUnifiedInbox(folderId, includeInUnifiedInbox)
		}

		override fun setDisplayClass(folderId: Long, folderClass: FolderClass) {
		updateFolderOperations.setDisplayClass(folderId, folderClass)
		}

		override fun setSyncClass(folderId: Long, folderClass: FolderClass) {
		updateFolderOperations.setSyncClass(folderId, folderClass)
		}

		override fun setPushClass(folderId: Long, folderClass: FolderClass) {
		updateFolderOperations.setPushClass(folderId, folderClass)
		}

		override fun setNotificationClass(folderId: Long, folderClass: FolderClass) {
		updateFolderOperations.setNotificationClass(folderId, folderClass)
		}

		override fun setMoreMessages(folderId: Long, moreMessages: MoreMessages) {
		updateFolderOperations.setMoreMessages(folderId, moreMessages)
		}

		override fun setLastChecked(folderId: Long, timestamp: Long) {
		TODO("Not yet implemented")
		updateFolderOperations.setLastChecked(folderId, timestamp)
		}

		override fun setStatus(folderId: Long, status: String?) {
		updateFolderOperations.setStatus(folderId, status)
		}

		override fun deleteFolders(folderServerIds: List<String>) {
		deleteFolderOperations.deleteFolders(folderServerIds)
		}

		override fun getExtraString(name: String): String? {
		return keyValueStoreOperations.getExtraString(name)
		}

		override fun setExtraString(name: String, value: String) {
		keyValueStoreOperations.setExtraString(name, value)
		}

		override fun getExtraNumber(name: String): Long? {
		return keyValueStoreOperations.getExtraNumber(name)
		}

		override fun setExtraNumber(name: String, value: Long) {
		keyValueStoreOperations.setExtraNumber(name, value)
		}

		override fun getFolderExtraString(folderId: Long, name: String): String? {
		return keyValueStoreOperations.getFolderExtraString(folderId, name)
		}

		override fun setFolderExtraString(folderId: Long, name: String, value: String?) {
		return keyValueStoreOperations.setFolderExtraString(folderId, name, value)
		}

		override fun getFolderExtraNumber(folderId: Long, name: String): Long? {
		return keyValueStoreOperations.getFolderExtraNumber(folderId, name)
		}

		override fun setFolderExtraNumber(folderId: Long, name: String, value: Long) {
		return keyValueStoreOperations.setFolderExtraNumber(folderId, name, value)
		}

		override fun compact() {
		return databaseOperations.compact()
		}