From dfd00321cdab56aef8bfb55736b4f1f137c32bc1 Mon Sep 17 00:00:00 2001
From: Nicolas Pomepuy <nicolas@videolabs.io>
Date: Fri, 14 Mar 2025 08:15:40 +0100
Subject: [PATCH] Prevent a crash in the DuplicationWarningDialog
---
.../videolan/vlc/gui/dialogs/DuplicationWarningDialog.kt | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/dialogs/DuplicationWarningDialog.kt b/application/vlc-android/src/org/videolan/vlc/gui/dialogs/DuplicationWarningDialog.kt
index f1dd0d10f2..bb8b9e362f 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/dialogs/DuplicationWarningDialog.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/dialogs/DuplicationWarningDialog.kt
@@ -7,6 +7,7 @@ import android.text.SpannableString
import android.text.Spanned
import android.text.style.ForegroundColorSpan
import android.text.style.StyleSpan
+import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@@ -92,8 +93,12 @@ class DuplicationWarningDialog : VLCBottomSheetDialogFragment(), View.OnClickLis
val styledText = SpannableString.valueOf(secondaryMessage)
val startIndex = styledText.indexOf(searchTitle)
val endIndex = startIndex + searchTitle.length
- styledText.setSpan(StyleSpan(Typeface.BOLD), startIndex, endIndex, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
- styledText.setSpan(ForegroundColorSpan(MaterialColors.getColor(requireContext(), R.attr.font_default, Color.BLACK)), startIndex, endIndex, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+ try {
+ styledText.setSpan(StyleSpan(Typeface.BOLD), startIndex, endIndex, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+ styledText.setSpan(ForegroundColorSpan(MaterialColors.getColor(requireContext(), R.attr.font_default, Color.BLACK)), startIndex, endIndex, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+ } catch (e: Exception) {
+ Log.e("DupWarningDialog", "setupSecondaryText: $e")
+ }
finalMessage = SpannableString.valueOf(finalMessage.toString() + styledText.toString()+"\n")
}
--
GitLab