fix: Wrong signature and reply action used due to case-sensitive emails

Infomaniak · Feb 20, 2025 · d624445 · d624445
1 parent f158794
commit d624445
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/src/main/java/com/infomaniak/mail/data/models/correspondent/Correspondent.kt b/app/src/main/java/com/infomaniak/mail/data/models/correspondent/Correspondent.kt
@@ -1,6 +1,6 @@
 /*
  * Infomaniak Mail - Android
- * Copyright (C) 2022-2024 Infomaniak Network SA
+ * Copyright (C) 2022-2025 Infomaniak Network SA
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,9 +30,9 @@ interface Correspondent : Parcelable {
 
     val initials: String
 
-    fun isMe(): Boolean = AccountUtils.currentMailboxEmail == email
+    fun isMe(): Boolean = AccountUtils.currentMailboxEmail?.lowercase() == email.lowercase()
 
-    fun shouldDisplayUserAvatar(): Boolean = isMe() && email == AccountUtils.currentUser?.email
+    fun shouldDisplayUserAvatar(): Boolean = isMe() && email.lowercase() == AccountUtils.currentUser?.email?.lowercase()
 
     fun getNameOrEmail(): String = name.ifBlank { email }
 

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -542,7 +542,7 @@ class NewMessageViewModel @Inject constructor(
 
     private fun guessMostFittingSignature(message: Message, signatures: List<Signature>): Signature? {
 
-        val signatureEmailsMap = signatures.groupBy { it.senderEmail }
+        val signatureEmailsMap = signatures.groupBy { it.senderEmail.lowercase() }
 
         return findSignatureInRecipients(message.to, signatureEmailsMap)
             ?: findSignatureInRecipients(message.from, signatureEmailsMap)
@@ -554,13 +554,13 @@ class NewMessageViewModel @Inject constructor(
         signatureEmailsMap: Map<String, List<Signature>>,
     ): Signature? {
 
-        val matchingEmailRecipients = recipients.filter { it.email in signatureEmailsMap }
+        val matchingEmailRecipients = recipients.filter { it.email.lowercase() in signatureEmailsMap }
         if (matchingEmailRecipients.isEmpty()) return null // If no Recipient represents us, go to next Recipients
 
         var bestScore = NO_MATCH
         var bestSignature: Signature? = null
         matchingEmailRecipients.forEach { recipient ->
-            val signatures = signatureEmailsMap[recipient.email] ?: return@forEach
+            val signatures = signatureEmailsMap[recipient.email.lowercase()] ?: return@forEach
             val (score, signature) = computeScore(recipient, signatures)
             when (score) {
                 EXACT_MATCH_AND_IS_DEFAULT -> return signature