mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-17 11:48:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix BetterLinkMovementMethod crash

Browse source 
Change-Id: Ife4a55f596b7fb844dbc3f0cb3e56f1e9daffa05
This commit is contained in:
Tiago Loureiro 2022-03-17 13:29:27 +00:00 • committed by SpiritCroc
parent 58dd1dedc9
commit 29b7a3a2ff
4 changed files with 46 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt
View file

@ -28,6 +28,7 @@ import im.vector.app.R
import im.vector.app.core.epoxy.onClick
import im.vector.app.core.error.ResourceLimitErrorFormatter
import im.vector.app.core.utils.DimensionConverter
import im.vector.app.core.utils.SafeBetterLinkMovementMethod
import im.vector.app.databinding.ViewNotificationAreaBinding
import im.vector.app.features.themes.ThemeUtils
import me.gujun.android.span.span
@ -156,7 +157,7 @@ class NotificationAreaView @JvmOverloads constructor(
onClick = { delegate?.onTombstoneEventClicked() }
}
}
views.roomNotificationMessage.movementMethod = BetterLinkMovementMethod.getInstance()
views.roomNotificationMessage.movementMethod = SafeBetterLinkMovementMethod
views.roomNotificationMessage.text = message
}

13
vector/src/main/java/im/vector/app/core/utils/EvenBetterLinkMovementMethod.kt
View file

@ -36,11 +36,16 @@ class EvenBetterLinkMovementMethod(private val onLinkClickListener: OnLinkClickL
}
override fun dispatchUrlClick(textView: TextView, clickableSpan: ClickableSpan) {
val spanned = textView.text as Spanned
val actualText = textView.text.subSequence(spanned.getSpanStart(clickableSpan), spanned.getSpanEnd(clickableSpan)).toString()
val url = (clickableSpan as? URLSpan)?.url ?: actualText
try {
val spanned = textView.text as Spanned
val actualText = textView.text.subSequence(spanned.getSpanStart(clickableSpan), spanned.getSpanEnd(clickableSpan)).toString()
val url = (clickableSpan as? URLSpan)?.url ?: actualText
if (onLinkClickListener == null || !onLinkClickListener.onLinkClicked(textView, clickableSpan, url, actualText)) {
if (onLinkClickListener == null || !onLinkClickListener.onLinkClicked(textView, clickableSpan, url, actualText)) {
// Let Android handle this long click as a short-click.
clickableSpan.onClick(textView)
}
} catch (e: StringIndexOutOfBoundsException) {
// Let Android handle this long click as a short-click.
clickableSpan.onClick(textView)
}

33
vector/src/main/java/im/vector/app/core/utils/SafeBetterLinkMovementMethod.kt Normal file
View file

@ -0,0 +1,33 @@
package im.vector.app.core.utils
import android.text.style.ClickableSpan
import android.widget.TextView
import me.saket.bettermovementmethod.BetterLinkMovementMethod
import timber.log.Timber
object SafeBetterLinkMovementMethod: BetterLinkMovementMethod() {
override fun dispatchUrlClick(textView: TextView?, clickableSpan: ClickableSpan?) {
try {
super.dispatchUrlClick(textView, clickableSpan)
} catch (e: StringIndexOutOfBoundsException) {
Timber.w("BetterLinkMovement dispatchUrlClick StringIndexOutOfBoundsException $e")
// Let Android handle this click.
textView?.let {
clickableSpan?.onClick(it)
}
}
}
override fun dispatchUrlLongClick(textView: TextView?, clickableSpan: ClickableSpan?) {
try {
super.dispatchUrlLongClick(textView, clickableSpan)
} catch (e: StringIndexOutOfBoundsException) {
Timber.w("BetterLinkMovement dispatchUrlLongClick StringIndexOutOfBoundsException $e")
// Let Android handle this long click as a short-click.
textView?.let {
clickableSpan?.onClick(it)
}
}
}
}

4
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RoomCreateItem.kt
View file

@ -22,8 +22,8 @@ import com.airbnb.epoxy.EpoxyModelClass
import im.vector.app.R
import im.vector.app.core.epoxy.VectorEpoxyHolder
import im.vector.app.core.epoxy.VectorEpoxyModel
import im.vector.app.core.utils.SafeBetterLinkMovementMethod
import im.vector.lib.core.utils.epoxy.charsequence.EpoxyCharSequence
import me.saket.bettermovementmethod.BetterLinkMovementMethod
@EpoxyModelClass
abstract class RoomCreateItem : VectorEpoxyModel<RoomCreateItem.Holder>(R.layout.item_timeline_event_create) {
@ -32,7 +32,7 @@ abstract class RoomCreateItem : VectorEpoxyModel<RoomCreateItem.Holder>(R.layout
override fun bind(holder: Holder) {
super.bind(holder)
holder.description.movementMethod = BetterLinkMovementMethod.getInstance()
holder.description.movementMethod = SafeBetterLinkMovementMethod
holder.description.text = text.charSequence
}