Add support for search in recipient addresses

thunderbird · Nov 28, 2022 · 77756e5 · 77756e5
1 parent de89124
commit 77756e5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
@@ -453,6 +453,9 @@ open class MessageList :
             val search = LocalSearch().apply {
                 isManualSearch = true
                 or(SearchCondition(SearchField.SENDER, SearchSpecification.Attribute.CONTAINS, query))
+                or(SearchCondition(SearchField.TO, SearchSpecification.Attribute.CONTAINS, query))
+                or(SearchCondition(SearchField.CC, SearchSpecification.Attribute.CONTAINS, query))
+                or(SearchCondition(SearchField.BCC, SearchSpecification.Attribute.CONTAINS, query))
                 or(SearchCondition(SearchField.SUBJECT, SearchSpecification.Attribute.CONTAINS, query))
                 or(SearchCondition(SearchField.MESSAGE_CONTENTS, SearchSpecification.Attribute.CONTAINS, query))
             }

diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/UidSearchCommandBuilder.java b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/UidSearchCommandBuilder.java
@@ -50,7 +50,11 @@ private void addQueryString(StringBuilder builder) {
         if (performFullTextSearch) {
             builder.append(" TEXT ").append(encodedQuery);
         } else {
-            builder.append(" OR SUBJECT ").append(encodedQuery).append(" FROM ").append(encodedQuery);
+            builder.append(" OR OR OR OR SUBJECT ").append(encodedQuery)
+                    .append(" FROM ").append(encodedQuery)
+                    .append(" TO ").append(encodedQuery)
+                    .append(" CC ").append(encodedQuery)
+                    .append(" BCC ").append(encodedQuery);
         }
     }
 

diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt
@@ -1066,7 +1066,7 @@ class RealImapFolderTest {
 
         folder.search("query", emptySet(), emptySet(), false)
 
-        assertCommandIssued("UID SEARCH OR SUBJECT \"query\" FROM \"query\"")
+        assertCommandIssued("""UID SEARCH OR OR OR OR SUBJECT "query" FROM "query" TO "query" CC "query" BCC "query"""")
     }
 
     @Test

diff --git a/...protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/UidSearchCommandBuilderTest.java b/...protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/UidSearchCommandBuilderTest.java
@@ -32,6 +32,7 @@ public void build_withoutFullTextSearch() {
                 .queryString("query")
                 .build();
 
-        assertEquals("UID SEARCH OR SUBJECT \"query\" FROM \"query\" NOT DELETED", command);
+        assertEquals("UID SEARCH OR OR OR OR SUBJECT \"query\" FROM \"query\" TO \"query\" CC \"query\"" +
+                " BCC \"query\" NOT DELETED", command);
     }
 }