Merge pull request #4770 from vector-im/feature/adm/emoji-27-and-below-crash
Fixing Android 8.1.1 / 27 and below emoji crash
This commit is contained in:
commit
721bf4fbd1
|
@ -0,0 +1 @@
|
||||||
|
Fixing emoji related crashes on android 8.1.1 and below
|
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
package im.vector.app.features.html
|
package im.vector.app.features.html
|
||||||
|
|
||||||
import android.os.Build
|
|
||||||
import android.text.Spanned
|
import android.text.Spanned
|
||||||
import android.text.style.MetricAffectingSpan
|
import android.text.style.MetricAffectingSpan
|
||||||
import android.text.style.StrikethroughSpan
|
import android.text.style.StrikethroughSpan
|
||||||
|
@ -41,13 +40,11 @@ class SpanUtils @Inject constructor(
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Workaround for https://issuetracker.google.com/issues/188454876
|
/**
|
||||||
|
* TextFutures do not support StrikethroughSpan, UnderlineSpan or MetricAffectingSpan
|
||||||
|
* Workaround for https://issuetracker.google.com/issues/188454876
|
||||||
|
*/
|
||||||
private fun canUseTextFuture(spanned: Spanned): Boolean {
|
private fun canUseTextFuture(spanned: Spanned): Boolean {
|
||||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
|
|
||||||
// On old devices, it works correctly
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
return spanned
|
return spanned
|
||||||
.getSpans(0, spanned.length, Any::class.java)
|
.getSpans(0, spanned.length, Any::class.java)
|
||||||
.all { it !is StrikethroughSpan && it !is UnderlineSpan && it !is MetricAffectingSpan }
|
.all { it !is StrikethroughSpan && it !is UnderlineSpan && it !is MetricAffectingSpan }
|
||||||
|
|
Loading…
Reference in New Issue