Fix a crash on API25 when using the get method on MatchResult

Infomaniak · Jul 11, 2024 · 9f3be64 · 9f3be64
1 parent 831d992
commit 9f3be64
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 14 deletions.
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
@@ -88,7 +88,7 @@ class AiPropositionFragment : Fragment() {
         return FragmentAiPropositionBinding.inflate(inflater, container, false).also { _binding = it }.root
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setSystemBarsColors(statusBarColor = R.color.backgroundColor)
 
@@ -175,7 +175,7 @@ class AiPropositionFragment : Fragment() {
             findNavController().popBackStack()
         }
 
-        val (subject, content) = splitBodyAndSubject(getLastMessage())
+        val (subject, content) = aiViewModel.splitBodyAndSubject(getLastMessage())
 
         if (subject == null || navigationArgs.isSubjectBlank) {
             applyProposition(subject, content)
@@ -208,17 +208,6 @@ class AiPropositionFragment : Fragment() {
         }
     }
 
-    private fun splitBodyAndSubject(proposition: String): Pair<String?, String> {
-        val match = MATCH_SUBJECT_REGEX.find(proposition)
-
-        val content = match?.groups?.get("content")?.value ?: return null to proposition
-        val subject = match.groups["subject"]?.value?.trim()
-
-        if (subject.isNullOrBlank()) return null to proposition
-
-        return subject to content
-    }
-
     private fun onMenuItemClicked(menuItemId: Int) = with(aiViewModel) {
         val shortcut = Shortcut.entries.find { it.menuId == menuItemId }!!
         trackAiWriterEvent(shortcut.matomoValue)
@@ -381,6 +370,5 @@ class AiPropositionFragment : Fragment() {
 
     companion object {
         private const val REPLACEMENT_DURATION = 150L
-        private val MATCH_SUBJECT_REGEX = Regex("^[^:]+:(?<subject>.+?)\\n\\s*(?<content>.+)", RegexOption.DOT_MATCHES_ALL)
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiViewModel.kt
@@ -17,6 +17,7 @@
  */
 package com.infomaniak.mail.ui.newMessage
 
+import android.os.Build
 import androidx.annotation.IdRes
 import androidx.annotation.StringRes
 import androidx.lifecycle.MutableLiveData
@@ -89,6 +90,30 @@ class AiViewModel @Inject constructor(
         handleAiResult(apiResponse, userMessage, isUsingPreviousMessageAsContext = previousMessageBodyPlainText != null)
     }
 
+    fun splitBodyAndSubject(proposition: String): Pair<String?, String> {
+        return getSubjectAndContent(MATCH_SUBJECT_REGEX.find(proposition), proposition)
+    }
+
+    private fun getSubjectAndContent(match: MatchResult?, proposition: String): Pair<String?, String> {
+        val (subject, content) = match?.let {
+            // The method get on MatchGroupCollection is not available on API25
+            if (Build.VERSION.SDK_INT == Build.VERSION_CODES.N_MR1) {
+                val destructuredList = it.destructured.toList()
+                destructuredList[INDEX_AI_PROPOSITION_SUBJECT] to destructuredList[INDEX_AI_PROPOSITION_CONTENT].trim()
+            } else {
+                val subject = it.groups["subject"]?.value?.trim()
+                val content = it.groups["content"]?.value
+                subject to content
+            }
+        } ?: (null to proposition)
+
+        return if (subject.isNullOrBlank() || content == null) {
+            null to proposition
+        } else {
+            subject to content
+        }
+    }
+
     private fun handleAiResult(
         apiResponse: ApiResponse<AiResult>,
         promptMessage: AiMessage?,
@@ -162,4 +187,10 @@ class AiViewModel @Inject constructor(
         RATE_LIMIT_EXCEEDED(R.string.aiErrorTooManyRequests),
         MISSING_CONTENT(R.string.aiErrorUnknown),
     }
+
+    companion object {
+        private val MATCH_SUBJECT_REGEX = Regex("^[^:]+:(?<subject>.+?)\\n\\s*(?<content>.+)", RegexOption.DOT_MATCHES_ALL)
+        private val INDEX_AI_PROPOSITION_SUBJECT = 0
+        private val INDEX_AI_PROPOSITION_CONTENT = 1
+    }
 }