filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/1.3.12' into main

Browse Source
This commit is contained in:
ganfra 2021-12-20 15:32:27 +01:00
commit 1695fde15b
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGES.md
View File

@ -1,3 +1,11 @@
Changes in Element v1.3.12 (2021-12-20)
=======================================
Bugfixes 🐛
----------
- Fixing emoji related crashes on android 8.1.1 and below ([#4769](https://github.com/vector-im/element-android/issues/4769))
Changes in Element v1.3.11 (2021-12-17) Changes in Element v1.3.11 (2021-12-17)
======================================= =======================================

2
fastlane/metadata/android/en-US/changelogs/40103120.txt Normal file
View File

@ -0,0 +1,2 @@
Main changes in this version: Bug fixes!
Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.3.12

2
matrix-sdk-android/build.gradle
View File

@ -31,7 +31,7 @@ android {
// that the app's state is completely cleared between tests. // that the app's state is completely cleared between tests.
testInstrumentationRunnerArguments clearPackageData: 'true' testInstrumentationRunnerArguments clearPackageData: 'true'
buildConfigField "String", "SDK_VERSION", "\"1.3.11\"" buildConfigField "String", "SDK_VERSION", "\"1.3.12\""
buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\"" buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
resValue "string", "git_sdk_revision", "\"${gitRevision()}\"" resValue "string", "git_sdk_revision", "\"${gitRevision()}\""

2
vector/build.gradle
View File

@ -15,7 +15,7 @@ kapt {
// Note: 2 digits max for each value // Note: 2 digits max for each value
ext.versionMajor = 1 ext.versionMajor = 1
ext.versionMinor = 3 ext.versionMinor = 3
ext.versionPatch = 11 ext.versionPatch = 12
static def getGitTimestamp() { static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct' def cmd = 'git show -s --format=%ct'

11
vector/src/main/java/im/vector/app/features/html/SpanUtils.kt
View File

@ -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 }