Fixed subject issue.| #74

FlowCrypt · Dec 2, 2024 · addb6cc · addb6cc
1 parent 74f0edb
commit addb6cc
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/ThreadExt.kt b/...main/java/com/flowcrypt/email/extensions/com/google/api/services/gmail/model/ThreadExt.kt
@@ -82,14 +82,14 @@ fun Thread.hasPgp(): Boolean {
 
 fun Thread.extractSubject(context: Context, receiverEmail: String): String {
   return messages?.getOrNull(0)?.takeIf { message ->
-    message.getRecipients("From").any { internetAddress ->
+    (message.getRecipients("From").any { internetAddress ->
       internetAddress.address.equals(receiverEmail, true)
-    } || (messages?.size ?: 0) == 1
+    } || (messages?.size ?: 0) == 1) && !message.isDraft()
   }?.getSubject()
     ?: messages.firstOrNull { message ->
       message.getRecipients("From").any { internetAddress ->
         internetAddress.address.equals(receiverEmail, true)
-      }
+      } && !message.isDraft()
     }?.getSubject()
     ?: messages?.getOrNull(0)?.getSubject()
     ?: context.getString(R.string.no_subject)