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

Unverified Commit 0b36cb19 authored Jun 20, 2025 by Wolf-Martell Montwé

refactor(search): move SqlQueryBuilder to :feature:search module

parent 7fe09e5b

legacy/core/src/main/java/com/fsck/k9/search/SqlQueryBuilder.java→feature/search/src/main/java/net/thunderbird/feature/search/sql/SqlQueryBuilder.java

+1 −3

Original line number	Original line	Diff line number	Diff line
	package com.fsck.k9.search;		package net.thunderbird.feature.search.sql;

	import java.util.List;		import java.util.List;

	import net.thunderbird.feature.search.SearchConditionTreeNode;		import net.thunderbird.feature.search.SearchConditionTreeNode;
	import net.thunderbird.feature.search.api.SearchAttribute;		import net.thunderbird.feature.search.api.SearchAttribute;
	import net.thunderbird.feature.search.api.SearchCondition;		import net.thunderbird.feature.search.api.SearchCondition;
	import net.thunderbird.feature.search.api.MessageSearchField;
	import net.thunderbird.core.logging.legacy.Log;
	import net.thunderbird.feature.search.api.SearchField;		import net.thunderbird.feature.search.api.SearchField;
	import net.thunderbird.feature.search.api.SearchFieldType;		import net.thunderbird.feature.search.api.SearchFieldType;

legacy/core/src/test/java/com/fsck/k9/search/SqlQueryBuilderTest.kt→feature/search/src/test/java/net/thunderbird/feature/search/sql/SqlQueryBuilderTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	package com.fsck.k9.search		package net.thunderbird.feature.search.sql

	import assertk.assertFailure		import assertk.assertFailure
	import assertk.assertThat		import assertk.assertThat

feature/widget/message-list-glance/src/main/kotlin/net/thunderbird/feature/widget/message/list/MessageListLoader.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,12 +4,12 @@ import app.k9mail.legacy.mailstore.MessageListRepository
	import com.fsck.k9.Preferences		import com.fsck.k9.Preferences
	import com.fsck.k9.helper.MessageHelper		import com.fsck.k9.helper.MessageHelper
	import com.fsck.k9.mailstore.MessageColumns		import com.fsck.k9.mailstore.MessageColumns
	import com.fsck.k9.search.SqlQueryBuilder
	import com.fsck.k9.search.getAccounts		import com.fsck.k9.search.getAccounts
	import net.thunderbird.core.android.account.LegacyAccount		import net.thunderbird.core.android.account.LegacyAccount
	import net.thunderbird.core.android.account.SortType		import net.thunderbird.core.android.account.SortType
	import net.thunderbird.core.logging.legacy.Log		import net.thunderbird.core.logging.legacy.Log
	import net.thunderbird.core.preference.GeneralSettingsManager		import net.thunderbird.core.preference.GeneralSettingsManager
			import net.thunderbird.feature.search.sql.SqlQueryBuilder

	internal class MessageListLoader(		internal class MessageListLoader(
	private val preferences: Preferences,		private val preferences: Preferences,

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListLoader.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,12 +4,12 @@ import app.k9mail.legacy.mailstore.MessageListRepository
	import com.fsck.k9.Preferences		import com.fsck.k9.Preferences
	import com.fsck.k9.helper.MessageHelper		import com.fsck.k9.helper.MessageHelper
	import com.fsck.k9.mailstore.MessageColumns		import com.fsck.k9.mailstore.MessageColumns
	import com.fsck.k9.search.SqlQueryBuilder
	import com.fsck.k9.search.getAccounts		import com.fsck.k9.search.getAccounts
	import net.thunderbird.core.android.account.LegacyAccount		import net.thunderbird.core.android.account.LegacyAccount
	import net.thunderbird.core.android.account.SortType		import net.thunderbird.core.android.account.SortType
	import net.thunderbird.core.logging.legacy.Log		import net.thunderbird.core.logging.legacy.Log
	import net.thunderbird.core.preference.GeneralSettingsManager		import net.thunderbird.core.preference.GeneralSettingsManager
			import net.thunderbird.feature.search.sql.SqlQueryBuilder

	internal class MessageListLoader(		internal class MessageListLoader(
	private val preferences: Preferences,		private val preferences: Preferences,

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,7 @@ import com.fsck.k9.mailstore.LocalFolder.DataLocation;
	import com.fsck.k9.mailstore.LockableDatabase.DbCallback;		import com.fsck.k9.mailstore.LockableDatabase.DbCallback;
	import com.fsck.k9.mailstore.LockableDatabase.SchemaDefinition;		import com.fsck.k9.mailstore.LockableDatabase.SchemaDefinition;
	import com.fsck.k9.message.extractors.AttachmentInfoExtractor;		import com.fsck.k9.message.extractors.AttachmentInfoExtractor;
	import com.fsck.k9.search.SqlQueryBuilder;		import net.thunderbird.feature.search.sql.SqlQueryBuilder;
	import kotlinx.datetime.Clock;		import kotlinx.datetime.Clock;
	import net.thunderbird.core.android.account.LegacyAccount;		import net.thunderbird.core.android.account.LegacyAccount;
	import net.thunderbird.feature.search.LocalMessageSearch;		import net.thunderbird.feature.search.LocalMessageSearch;