From e121cfeefe09520214a7cba3b9b1b3dd204e3238 Mon Sep 17 00:00:00 2001
From: Nicolas Bourdin <nicolas.bourdin@infomaniak.com>
Date: Wed, 30 Oct 2024 11:07:51 +0100
Subject: [PATCH 1/2] fix: Don't show the contact if the email is incorrect

---
 .../mail/ui/newMessage/RecipientFieldView.kt          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/RecipientFieldView.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/RecipientFieldView.kt
index 85048de9e9..d67e177b4c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/RecipientFieldView.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/RecipientFieldView.kt
@@ -132,11 +132,7 @@ class RecipientFieldView @JvmOverloads constructor(
                 onContactClicked = { addRecipient(it.email, it.name) },
                 onAddUnrecognizedContact = {
                     val input = textInput.text.toString()
-                    if (input.isEmail()) {
-                        addRecipient(email = input, name = input)
-                    } else {
-                        snackbarManager.setValue(context.getString(R.string.addUnknownRecipientInvalidEmail))
-                    }
+                    addRecipient(email = input, name = input)
                 },
                 snackbarManager = snackbarManager,
             )
@@ -312,6 +308,11 @@ class RecipientFieldView @JvmOverloads constructor(
 
     private fun addRecipient(email: String, name: String) {
 
+        if (!email.isEmail()) {
+            snackbarManager.setValue(context.getString(R.string.addUnknownRecipientInvalidEmail))
+            return
+        }
+
         if (contactChipAdapter.itemCount > MAX_ALLOWED_RECIPIENT) {
             snackbarManager.setValue(context.getString(R.string.tooManyRecipients))
             return

From 46b0114a08d181a372fc35b8e2d83748450e521a Mon Sep 17 00:00:00 2001
From: Nicolas Bourdin <nicolas.bourdin@infomaniak.com>
Date: Wed, 20 Nov 2024 09:47:08 +0100
Subject: [PATCH 2/2] refactor: Remove unused function

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt     | 1 -
 1 file changed, 1 deletion(-)

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
index bb8008888b..e6202d272d 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -192,7 +192,6 @@ class NewMessageViewModel @Inject constructor(
     fun arrivedFromExistingDraft() = arrivedFromExistingDraft
     fun draftLocalUuid() = draftLocalUuid
     fun draftMode() = draftMode
-    fun recipient() = recipient
     fun shouldLoadDistantResources() = shouldLoadDistantResources
 
     fun initDraftAndViewModel(intent: Intent): LiveData<Draft?> = liveData(ioCoroutineContext) {