Rewrite `MessageCountsProvider` to use `MessageStore` (ef583ba6) · Commits · e / os / Mail

app/core/src/main/java/com/fsck/k9/controller/KoinModule.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ val controllerModule = module {
		DefaultMessageCountsProvider(
		preferences = get(),
		accountSearchConditions = get(),
		localStoreProvider = get(),
		messageStoreManager = get()
		)
		}

app/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt

+14 −20

Original line number	Diff line number	Diff line
		@@ -2,10 +2,9 @@ package com.fsck.k9.controller

		import com.fsck.k9.Account
		import com.fsck.k9.Preferences
		import com.fsck.k9.mail.MessagingException
		import com.fsck.k9.mailstore.LocalStoreProvider
		import com.fsck.k9.mailstore.MessageStoreManager
		import com.fsck.k9.search.AccountSearchConditions
		import com.fsck.k9.search.ConditionsTreeNode
		import com.fsck.k9.search.LocalSearch
		import com.fsck.k9.search.SearchAccount
		import com.fsck.k9.search.getAccounts
		@@ -22,22 +21,14 @@ data class MessageCounts(val unread: Int, val starred: Int)
		internal class DefaultMessageCountsProvider(
		private val preferences: Preferences,
		private val accountSearchConditions: AccountSearchConditions,
		private val localStoreProvider: LocalStoreProvider,
		private val messageStoreManager: MessageStoreManager
		) : MessageCountsProvider {
		override fun getMessageCounts(account: Account): MessageCounts {
		return try {
		val localStore = localStoreProvider.getInstance(account)

		val search = LocalSearch()
		accountSearchConditions.excludeSpecialFolders(account, search)
		accountSearchConditions.limitToDisplayableFolders(account, search)

		localStore.getMessageCounts(search)
		} catch (e: MessagingException) {
		Timber.e(e, "Unable to getMessageCounts for account: %s", account)
		MessageCounts(0, 0)
		}
		return getMessageCounts(account, search.conditions)
		}

		override fun getMessageCounts(searchAccount: SearchAccount): MessageCounts {
		@@ -47,7 +38,7 @@ internal class DefaultMessageCountsProvider(
		var unreadCount = 0
		var starredCount = 0
		for (account in accounts) {
		val accountMessageCount = getMessageCountsWithLocalSearch(account, search)
		val accountMessageCount = getMessageCounts(account, search.conditions)
		unreadCount += accountMessageCount.unread
		starredCount += accountMessageCount.starred
		}
		@@ -69,13 +60,16 @@ internal class DefaultMessageCountsProvider(
		}
		}

		private fun getMessageCountsWithLocalSearch(account: Account, search: LocalSearch): MessageCounts {
		private fun getMessageCounts(account: Account, conditions: ConditionsTreeNode): MessageCounts {
		return try {
		val localStore = localStoreProvider.getInstance(account)
		localStore.getMessageCounts(search)
		} catch (e: MessagingException) {
		val messageStore = messageStoreManager.getMessageStore(account)
		return MessageCounts(
		unread = messageStore.getUnreadMessageCount(conditions),
		starred = messageStore.getStarredMessageCount(conditions)
		)
		} catch (e: Exception) {
		Timber.e(e, "Unable to getMessageCounts for account: %s", account)
		MessageCounts(0, 0)
		MessageCounts(unread = 0, starred = 0)
		}
		}
		}

app/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java

+0 −67

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import androidx.core.database.CursorKt;
		import com.fsck.k9.Account;
		import com.fsck.k9.Clock;
		import com.fsck.k9.DI;
		import com.fsck.k9.controller.MessageCounts;
		import com.fsck.k9.Preferences;
		import com.fsck.k9.controller.MessagingControllerCommands.PendingCommand;
		import com.fsck.k9.controller.PendingCommandSerializer;
		@@ -1005,72 +1004,6 @@ public class LocalStore {
		return folderMap;
		}

		public int getUnreadMessageCount(LocalSearch search) throws MessagingException {
		StringBuilder whereBuilder = new StringBuilder();
		List<String> queryArgs = new ArrayList<>();
		SqlQueryBuilder.buildWhereClause(search.getConditions(), whereBuilder, queryArgs);

		String where = whereBuilder.toString();
		final String[] selectionArgs = queryArgs.toArray(new String[queryArgs.size()]);

		final String sqlQuery = "SELECT SUM(read=0) " +
		"FROM messages " +
		"JOIN folders ON (folders.id = messages.folder_id) " +
		"WHERE (messages.empty = 0 AND messages.deleted = 0)" +
		(!TextUtils.isEmpty(where) ? " AND (" + where + ")" : "");

		return database.execute(false, new DbCallback<Integer>() {
		@Override
		public Integer doDbWork(SQLiteDatabase db) {
		Cursor cursor = db.rawQuery(sqlQuery, selectionArgs);
		try {
		if (cursor.moveToFirst()) {
		return cursor.getInt(0);
		} else {
		return 0;
		}
		} finally {
		cursor.close();
		}
		}
		});
		}

		private int getStarredMessageCount(LocalSearch search) throws MessagingException {
		StringBuilder whereBuilder = new StringBuilder();
		List<String> queryArgs = new ArrayList<>();
		SqlQueryBuilder.buildWhereClause(search.getConditions(), whereBuilder, queryArgs);

		String where = whereBuilder.toString();
		final String[] selectionArgs = queryArgs.toArray(new String[queryArgs.size()]);

		final String sqlQuery = "SELECT SUM(flagged=1) " +
		"FROM messages " +
		"JOIN folders ON (folders.id = messages.folder_id) " +
		"WHERE (messages.empty = 0 AND messages.deleted = 0)" +
		(!TextUtils.isEmpty(where) ? " AND (" + where + ")" : "");

		return database.execute(false, new DbCallback<Integer>() {
		@Override
		public Integer doDbWork(SQLiteDatabase db) {
		Cursor cursor = db.rawQuery(sqlQuery, selectionArgs);
		try {
		if (cursor.moveToFirst()) {
		return cursor.getInt(0);
		} else {
		return 0;
		}
		} finally {
		cursor.close();
		}
		}
		});
		}

		public MessageCounts getMessageCounts(LocalSearch search) throws MessagingException {
		return new MessageCounts(getUnreadMessageCount(search), getStarredMessageCount(search));
		}

		public List<NotificationMessage> getNotificationMessages() throws MessagingException {
		return database.execute(false, db -> {
		try (Cursor cursor = db.rawQuery(

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ import com.fsck.k9.mail.Flag
		import com.fsck.k9.mail.FolderClass
		import com.fsck.k9.mail.FolderType
		import com.fsck.k9.mail.Header
		import com.fsck.k9.search.ConditionsTreeNode
		import java.util.Date

		/**
		@@ -226,6 +227,16 @@ interface MessageStore {
		*/
		fun getUnreadMessageCount(folderId: Long): Int

		/**
		* Retrieve the number of unread messages matching [conditions].
		*/
		fun getUnreadMessageCount(conditions: ConditionsTreeNode): Int

		/**
		* Retrieve the number of starred messages matching [conditions].
		*/
		fun getStarredMessageCount(conditions: ConditionsTreeNode): Int

		/**
		* Update a folder's name and type.
		*/

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ import com.fsck.k9.mailstore.MoreMessages
		import com.fsck.k9.mailstore.SaveMessageData
		import com.fsck.k9.mailstore.StorageManager
		import com.fsck.k9.message.extractors.BasicPartInfoExtractor
		import com.fsck.k9.search.ConditionsTreeNode
		import java.util.Date

		class K9MessageStore(
		@@ -180,6 +181,14 @@ class K9MessageStore(
		return retrieveFolderOperations.getUnreadMessageCount(folderId)
		}

		override fun getUnreadMessageCount(conditions: ConditionsTreeNode): Int {
		return retrieveFolderOperations.getUnreadMessageCount(conditions)
		}

		override fun getStarredMessageCount(conditions: ConditionsTreeNode): Int {
		return retrieveFolderOperations.getStarredMessageCount(conditions)
		}

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