fix: Fix block sender functionality

Author: solrubado

app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/JunkMessagesViewModel.kt

@@ -57,6 +57,12 @@ class JunkMessagesViewModel @Inject constructor(
             getJunkMessagesAndUsersToBlock(value)
         }
 
+    var messages: List<Message> = emptyList()
+        set(value) {
+            field = value
+            getUserToBlockFromMessage(messages)
+        }
+
     private val currentMailboxFlow = mailboxController.getMailboxAsync(
         AccountUtils.currentUserId,
         AccountUtils.currentMailboxId,
@@ -75,4 +81,10 @@ class JunkMessagesViewModel @Inject constructor(
         junkMessages.postValue(messages)
         potentialBlockedUsers.postValue(potentialMessagesToBlock)
     }
+
+    private fun getUserToBlockFromMessage(messages: List<Message>) = viewModelScope.launch(defaultDispatcher) {
+        val potentialMessagesToBlock = MessageUtils.getJunkMessagesAndMessagesToBlockUser(messages)
+        junkMessages.postValue(messages)
+        potentialBlockedUsers.postValue(potentialMessagesToBlock)
+    }
 }

app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/MessageActionsBottomSheetDialog.kt

@@ -89,8 +89,9 @@ class MessageActionsBottomSheetDialog : MailActionsBottomSheetDialog() {
                 return@launch
             }
 
-            // Initialization of threadsUids to populate junkMessages and potentialUsersToBlock
-            junkMessagesViewModel.threadsUids = listOf(threadUid)
+            // Initialization of message to populate junkMessages and potentialUsersToBlock
+            junkMessagesViewModel.messages = listOf(message)
+
             val folderRole = folderRoleUtils.getActionFolderRole(message)
             isFromSpam = folderRole == FolderRole.SPAM
 

app/src/main/java/com/infomaniak/mail/utils/MessageUtils.kt

@@ -47,6 +47,20 @@ object MessageUtils {
 
         return JunkMessagesData(junkMessages = lastMessagesOfThreads, messagesFromUsersToBlock = messagesFromUsersToBlock)
     }
-}
 
-data class JunkMessagesData(val junkMessages: List<Message>, val messagesFromUsersToBlock: Map<Recipient, Message>)
+    fun getJunkMessagesAndMessagesToBlockUser(
+        messages: List<Message>,
+    ): MutableMap<Recipient, Message> {
+        val messagesFromUsersToBlock: MutableMap<Recipient, Message> = mutableMapOf()
+
+        messages.forEach { message ->
+            message.from.firstOrNull()?.let { user ->
+                if (!user.isMe() && user !in messagesFromUsersToBlock) messagesFromUsersToBlock[user] = message
+            }
+        }
+
+        return messagesFromUsersToBlock
+    }
+
+    data class JunkMessagesData(val junkMessages: List<Message>, val messagesFromUsersToBlock: Map<Recipient, Message>)
+}