refactor: Factorize use of getStartAndEndOfPlusEmail()

Author: KevinBoulongne

app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt

@@ -27,6 +27,7 @@ import com.infomaniak.mail.data.models.thread.Thread
 import com.infomaniak.mail.data.models.thread.Thread.ThreadFilter
 import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.LocalStorageUtils.deleteDraftUploadDir
+import com.infomaniak.mail.utils.extensions.getStartAndEndOfPlusEmail
 import io.realm.kotlin.MutableRealm
 import io.realm.kotlin.Realm
 import io.realm.kotlin.TypedRealm
@@ -63,9 +64,7 @@ class MessageController @Inject constructor(private val mailboxContentRealm: Rea
         val isNotFromRealMe = "SUBQUERY(${Message::from.name}, \$recipient, " +
                 "\$recipient.${Recipient::email.name} != '${AccountUtils.currentMailboxEmail}').@count > 0"
 
-        val splittedEmail = AccountUtils.currentMailboxEmail?.split("@")
-        val start = splittedEmail?.first() + "+"
-        val end = "@" + splittedEmail?.last()
+        val (start, end) = AccountUtils.currentMailboxEmail.getStartAndEndOfPlusEmail()
         val isNotFromPlusMe = "SUBQUERY(${Message::from.name}, \$recipient," +
                 " \$recipient.${Recipient::email.name} BEGINSWITH '${start}'" +
                 " AND \$recipient.${Recipient::email.name} ENDSWITH '${end}'" +

app/src/main/java/com/infomaniak/mail/data/models/correspondent/Correspondent.kt

@@ -22,6 +22,7 @@ import android.os.Parcelable
 import com.infomaniak.lib.core.utils.firstOrEmpty
 import com.infomaniak.mail.R
 import com.infomaniak.mail.utils.AccountUtils
+import com.infomaniak.mail.utils.extensions.getStartAndEndOfPlusEmail
 import io.sentry.Sentry
 
 interface Correspondent : Parcelable {
@@ -36,9 +37,7 @@ interface Correspondent : Parcelable {
 
         val isRealMe = userEmail == correspondentEmail
 
-        val splittedEmail = userEmail?.split("@")
-        val start = splittedEmail?.first() + "+"
-        val end = "@" + splittedEmail?.last()
+        val (start, end) = userEmail.getStartAndEndOfPlusEmail()
         val isPlusMe = correspondentEmail.startsWith(start) && correspondentEmail.endsWith(end)
 
         return isRealMe || isPlusMe

app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt

@@ -143,6 +143,13 @@ fun String.removeLineBreaksFromHtml(): Document = jsoupParseWithLog(replace("\r"
 
 fun String.htmlToText(): String = removeLineBreaksFromHtml().wholeText()
 
+fun String?.getStartAndEndOfPlusEmail(): Pair<String, String> {
+    val splittedEmail = this?.split("@")
+    val fromStartToPlus = splittedEmail?.first() + "+"
+    val fromArobaseToEnd = "@" + splittedEmail?.last()
+    return fromStartToPlus to fromArobaseToEnd
+}
+
 //region Date
 fun RealmInstant.toDate(): Date = Date(epochSeconds * 1_000L + nanosecondsOfSecond / 1_000L)