Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ec6e9761 authored Jun 26, 2021 by cketti Committed by GitHub Jun 26, 2021

Merge pull request #5370 from k9mail/inbox_push_class

Set push class of Inbox to 'first class' by default

parents fe4282a0 f9f5f8eb

app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt

+5 −0

Original line number	Diff line number	Diff line
		@@ -201,6 +201,11 @@ class FolderRepository(
		messageStore.setSyncClass(folderId, folderClass)
		}

		fun setPushClass(folderId: Long, folderClass: FolderClass) {
		val messageStore = messageStoreManager.getMessageStore(account)
		messageStore.setPushClass(folderId, folderClass)
		}

		fun setNotificationClass(folderId: Long, folderClass: FolderClass) {
		val messageStore = messageStoreManager.getMessageStore(account)
		messageStore.setNotificationClass(folderId, folderClass)

app/core/src/main/java/com/fsck/k9/mailstore/ListenableMessageStore.kt

+5 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,11 @@ class ListenableMessageStore(private val messageStore: MessageStore) : MessageSt
		notifyFolderSettingsChanged()
		}

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

		override fun setNotificationClass(folderId: Long, folderClass: FolderClass) {
		messageStore.setNotificationClass(folderId, folderClass)
		notifyFolderSettingsChanged()

app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt

+5 −0

Original line number	Diff line number	Diff line
		@@ -196,6 +196,11 @@ interface MessageStore {
		*/
		fun setSyncClass(folderId: Long, folderClass: FolderClass)

		/**
		* Update the push class of a folder.
		*/
		fun setPushClass(folderId: Long, folderClass: FolderClass)

		/**
		* Update the notification class of a folder.
		*/

app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ class SpecialFolderUpdater(
		folderRepository.setIncludeInUnifiedInbox(newInboxId, true)
		folderRepository.setDisplayClass(newInboxId, FolderClass.FIRST_CLASS)
		folderRepository.setSyncClass(newInboxId, FolderClass.FIRST_CLASS)
		folderRepository.setPushClass(newInboxId, FolderClass.FIRST_CLASS)
		folderRepository.setNotificationClass(newInboxId, FolderClass.FIRST_CLASS)
		}
		}

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -153,6 +153,10 @@ class K9MessageStore(
		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)
		}