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

Unverified Commit 8f542d6b authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

refactor(search): rename SearchField to MessageSearchField

parent 9b959b56

feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/data/UnifiedFolderRepository.kt

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ import net.thunderbird.feature.navigation.drawer.dropdown.domain.DomainContract 
import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayUnifiedFolder

import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayUnifiedFolderType

import net.thunderbird.feature.search.LocalMessageSearch

import net.thunderbird.feature.search.api.MessageSearchField

import net.thunderbird.feature.search.api.SearchAttribute

import net.thunderbird.feature.search.api.SearchField



internal class UnifiedFolderRepository(

    private val messageCountsProvider: MessageCountsProvider,
@@ -34,7 +34,7 @@ internal class UnifiedFolderRepository( 
    private fun createUnifiedInboxSearch(): LocalMessageSearch {

        return LocalMessageSearch().apply {

            id = UNIFIED_INBOX_ID

            and(SearchField.INTEGRATE, "1", SearchAttribute.EQUALS)

            and(MessageSearchField.INTEGRATE, "1", SearchAttribute.EQUALS)

        }

    }

feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/data/UnifiedFolderRepositoryTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ import kotlinx.coroutines.flow.first 
import kotlinx.coroutines.test.runTest

import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayUnifiedFolder

import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayUnifiedFolderType

import net.thunderbird.feature.search.api.MessageSearchField

import net.thunderbird.feature.search.api.SearchAttribute

import net.thunderbird.feature.search.api.SearchField



internal class UnifiedFolderRepositoryTest {
@@ -42,6 +42,6 @@ internal class UnifiedFolderRepositoryTest { 
        val condition = search.conditions.condition

        assertThat(condition?.value).isEqualTo("1")

        assertThat(condition?.attribute).isEqualTo(SearchAttribute.EQUALS)

        assertThat(condition?.field).isEqualTo(SearchField.INTEGRATE)

        assertThat(condition?.field).isEqualTo(MessageSearchField.INTEGRATE)

    }

}

feature/navigation/drawer/siderail/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/data/UnifiedFolderRepository.kt

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ import net.thunderbird.feature.navigation.drawer.siderail.domain.DomainContract 
import net.thunderbird.feature.navigation.drawer.siderail.domain.entity.DisplayUnifiedFolder

import net.thunderbird.feature.navigation.drawer.siderail.domain.entity.DisplayUnifiedFolderType

import net.thunderbird.feature.search.LocalMessageSearch

import net.thunderbird.feature.search.api.MessageSearchField

import net.thunderbird.feature.search.api.SearchAttribute

import net.thunderbird.feature.search.api.SearchField



internal class UnifiedFolderRepository(

    private val messageCountsProvider: MessageCountsProvider,
@@ -34,7 +34,7 @@ internal class UnifiedFolderRepository( 
    private fun createUnifiedInboxSearch(): LocalMessageSearch {

        return LocalMessageSearch().apply {

            id = UNIFIED_INBOX_ID

            and(SearchField.INTEGRATE, "1", SearchAttribute.EQUALS)

            and(MessageSearchField.INTEGRATE, "1", SearchAttribute.EQUALS)

        }

    }

feature/navigation/drawer/siderail/src/test/kotlin/net/thunderbird/feature/navigation/drawer/siderail/data/UnifiedFolderRepositoryTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ import kotlinx.coroutines.flow.first 
import kotlinx.coroutines.test.runTest

import net.thunderbird.feature.navigation.drawer.siderail.domain.entity.DisplayUnifiedFolder

import net.thunderbird.feature.navigation.drawer.siderail.domain.entity.DisplayUnifiedFolderType

import net.thunderbird.feature.search.api.MessageSearchField

import net.thunderbird.feature.search.api.SearchAttribute

import net.thunderbird.feature.search.api.SearchField



internal class UnifiedFolderRepositoryTest {
@@ -42,6 +42,6 @@ internal class UnifiedFolderRepositoryTest { 
        val condition = search.conditions.condition

        assertThat(condition?.value).isEqualTo("1")

        assertThat(condition?.attribute).isEqualTo(SearchAttribute.EQUALS)

        assertThat(condition?.field).isEqualTo(SearchField.INTEGRATE)

        assertThat(condition?.field).isEqualTo(MessageSearchField.INTEGRATE)

    }

}

feature/search/src/main/java/net/thunderbird/feature/search/LocalMessageSearch.java

+6 −6
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ import android.os.Parcelable; 
import androidx.annotation.NonNull;

import net.thunderbird.feature.search.api.SearchAttribute;

import net.thunderbird.feature.search.api.SearchCondition;

import net.thunderbird.feature.search.api.SearchField;

import net.thunderbird.feature.search.api.MessageSearchField;

import net.thunderbird.feature.search.api.MessageSearchSpecification;
@@ -79,7 +79,7 @@ public class LocalMessageSearch implements MessageSearchSpecification { 
     * @param value Value to look for.

     * @param attribute Attribute to use when matching.

     */

    public void and(SearchField field, String value, SearchAttribute attribute) {

    public void and(MessageSearchField field, String value, SearchAttribute attribute) {

        and(new SearchCondition(field, attribute, value));

    }
@@ -165,7 +165,7 @@ public class LocalMessageSearch implements MessageSearchSpecification { 
         *          - do and on root of it & rest of search

         *          - do or between folder nodes

         */

        mConditions = and(new SearchCondition(SearchField.FOLDER, SearchAttribute.EQUALS, Long.toString(folderId)));

        mConditions = and(new SearchCondition(MessageSearchField.FOLDER, SearchAttribute.EQUALS, Long.toString(folderId)));

    }



    /*
@@ -176,7 +176,7 @@ public class LocalMessageSearch implements MessageSearchSpecification { 
    public List<Long> getFolderIds() {

        List<Long> results = new ArrayList<>();

        for (SearchConditionTreeNode node : mLeafSet) {

            if (node.getCondition().field == SearchField.FOLDER &&

            if (node.getCondition().field == MessageSearchField.FOLDER &&

                    node.getCondition().attribute == SearchAttribute.EQUALS) {

                results.add(Long.valueOf(node.getCondition().value));

            }
@@ -207,8 +207,8 @@ public class LocalMessageSearch implements MessageSearchSpecification { 
        }



        for (SearchConditionTreeNode node : leafSet) {

            if (node.getCondition().field == SearchField.SUBJECT ||

                    node.getCondition().field == SearchField.SENDER ) {

            if (node.getCondition().field == MessageSearchField.SUBJECT ||

                    node.getCondition().field == MessageSearchField.SENDER ) {

                return node.getCondition().value;

            }

        }