From e9b58096cc7990cd3d2b5c70027457cf0dc9024c Mon Sep 17 00:00:00 2001
From: Kevin Boulongne <kevin.boulongne@infomaniak.com>
Date: Mon, 9 Sep 2024 13:46:17 +0200
Subject: [PATCH] Simplify `.joinToString()` usage

---
 .../main/java/com/infomaniak/mail/data/api/ApiRoutes.kt    | 2 +-
 .../mail/data/cache/mailboxContent/MessageController.kt    | 2 +-
 .../infomaniak/mail/ui/newMessage/AiPropositionFragment.kt | 2 +-
 app/src/main/java/com/infomaniak/mail/utils/SentryDebug.kt | 7 +++++--
 .../java/com/infomaniak/mail/utils/SentryRealmLogger.kt    | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/data/api/ApiRoutes.kt b/app/src/main/java/com/infomaniak/mail/data/api/ApiRoutes.kt
index 88772f75f9..ec24bd4e08 100644
--- a/app/src/main/java/com/infomaniak/mail/data/api/ApiRoutes.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/api/ApiRoutes.kt
@@ -180,7 +180,7 @@ object ApiRoutes {
     }
 
     fun getMessagesByUids(mailboxUuid: String, folderId: String, uids: List<Int>): String {
-        return "${getMessages(mailboxUuid, folderId)}/messages?uids=${uids.joinToString(",")}"
+        return "${getMessages(mailboxUuid, folderId)}/messages?uids=${uids.joinToString(separator = ",")}"
     }
     //endregion
 
diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
index 05c9032635..6743edd946 100644
--- a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
@@ -121,7 +121,7 @@ class MessageController @Inject constructor(private val mailboxContentRealm: Rea
             }
         }
 
-        val filtersQuery = queriesList.joinToString(" AND ") { it }
+        val filtersQuery = queriesList.joinToString(separator = " AND ")
 
         return if (searchQuery?.isNotBlank() == true) {
             val containsSubject = "${Message::subject.name} CONTAINS[c] $0"
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPropositionFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPropositionFragment.kt
index 3655fe5430..55819d6883 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPropositionFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPropositionFragment.kt
@@ -239,7 +239,7 @@ class AiPropositionFragment : Fragment() {
 
     private fun generateNewAiProposition() {
         val formattedRecipientsString = newMessageViewModel.toLiveData.valueOrEmpty()
-            .joinToString(", ") { it.name }
+            .joinToString(separator = ", ") { it.name }
             .takeIf { it.isNotBlank() }
         val currentMailboxUuid = newMessageViewModel.currentMailbox.uuid
         currentRequestJob = aiViewModel.generateNewAiProposition(currentMailboxUuid, formattedRecipientsString)
diff --git a/app/src/main/java/com/infomaniak/mail/utils/SentryDebug.kt b/app/src/main/java/com/infomaniak/mail/utils/SentryDebug.kt
index 94b1f148e6..c819e0d6bb 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/SentryDebug.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/SentryDebug.kt
@@ -18,6 +18,7 @@
 package com.infomaniak.mail.utils
 
 import android.os.Bundle
+import android.util.Log
 import androidx.navigation.NavController
 import com.infomaniak.mail.BuildConfig
 import com.infomaniak.mail.data.cache.mailboxContent.MessageController
@@ -115,7 +116,7 @@ object SentryDebug {
         fun Int.countPadding(): String = toString().padStart(length = 2, '0')
 
         fun addData(category: String, key: String = "", value: String) {
-            data[count.countPadding() + "." + (category + key).padStart(length = 19)] = value
+            data[count.countPadding() + "." + (category + key).padStart(length = 20)] = value
             count++
         }
 
@@ -159,7 +160,9 @@ object SentryDebug {
             )
         }
 
-        addInfoBreadcrumb(category = "Attachments_Situation", data = data)
+        val category = "Attachments_Situation"
+        Log.i(category, data.map { "${it.key}: ${it.value}" }.joinToString(separator = "\n"))
+        addInfoBreadcrumb(category = category, data = data)
     }
 
     private fun addInfoBreadcrumb(category: String, message: String? = null, data: Map<String, Any>? = null) {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/SentryRealmLogger.kt b/app/src/main/java/com/infomaniak/mail/utils/SentryRealmLogger.kt
index fffa70d4e9..f397f58ed5 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/SentryRealmLogger.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/SentryRealmLogger.kt
@@ -65,7 +65,7 @@ class SentryRealmLogger : RealmLogger {
                         val breadcrumb = Breadcrumb().apply {
                             this.level = SentryLevel.INFO
                             this.category = tag
-                            this.message = values?.joinToString(separator = "\n") { it }
+                            this.message = values?.joinToString(separator = "\n")
                         }
                         Sentry.addBreadcrumb(breadcrumb)
                         messagesMap.remove(key)