From c6a118fc1f97fd7d0f7c8f50b02daffaaf57f255 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 17 Dec 2021 19:05:17 +0100 Subject: [PATCH 1/4] Update versions to 1.3.12 --- matrix-sdk-android/build.gradle | 2 +- vector/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index d0dee31e9d..9674bdd372 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -31,7 +31,7 @@ android { // that the app's state is completely cleared between tests. testInstrumentationRunnerArguments clearPackageData: 'true' - buildConfigField "String", "SDK_VERSION", "\"1.3.11\"" + buildConfigField "String", "SDK_VERSION", "\"1.3.12\"" buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\"" resValue "string", "git_sdk_revision", "\"${gitRevision()}\"" diff --git a/vector/build.gradle b/vector/build.gradle index 490057192e..fce2c97f6b 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -15,7 +15,7 @@ kapt { // Note: 2 digits max for each value ext.versionMajor = 1 ext.versionMinor = 3 -ext.versionPatch = 11 +ext.versionPatch = 12 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' From f1dff33dc22d18578fe49a82118b006226f1b316 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Mon, 20 Dec 2021 10:09:17 +0000 Subject: [PATCH 2/4] removing android version bypass for using text futures - the emoji span changes affect all android versions --- .../java/im/vector/app/features/html/SpanUtils.kt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/html/SpanUtils.kt b/vector/src/main/java/im/vector/app/features/html/SpanUtils.kt index e668f29a6a..6e2485071a 100644 --- a/vector/src/main/java/im/vector/app/features/html/SpanUtils.kt +++ b/vector/src/main/java/im/vector/app/features/html/SpanUtils.kt @@ -16,7 +16,6 @@ package im.vector.app.features.html -import android.os.Build import android.text.Spanned import android.text.style.MetricAffectingSpan 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 { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) { - // On old devices, it works correctly - return true - } - return spanned .getSpans(0, spanned.length, Any::class.java) .all { it !is StrikethroughSpan && it !is UnderlineSpan && it !is MetricAffectingSpan } From 18df540487a28e58a7b1729e1207941a4ab34533 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Mon, 20 Dec 2021 10:10:07 +0000 Subject: [PATCH 3/4] adding changelog entry --- changelog.d/4769.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4769.bugfix diff --git a/changelog.d/4769.bugfix b/changelog.d/4769.bugfix new file mode 100644 index 0000000000..ec4fc96994 --- /dev/null +++ b/changelog.d/4769.bugfix @@ -0,0 +1 @@ +Fixing emoji related crashes on android 8.1.1 and below \ No newline at end of file From 4b2dd73d1953644e90a10441e8c26b7e6ab8813e Mon Sep 17 00:00:00 2001 From: ganfra Date: Mon, 20 Dec 2021 14:56:27 +0100 Subject: [PATCH 4/4] Release: prepare CHANGES --- CHANGES.md | 8 ++++++++ changelog.d/4769.bugfix | 1 - fastlane/metadata/android/en-US/changelogs/40103120.txt | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) delete mode 100644 changelog.d/4769.bugfix create mode 100644 fastlane/metadata/android/en-US/changelogs/40103120.txt diff --git a/CHANGES.md b/CHANGES.md index a776f483e6..e0dd3298d8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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) ======================================= diff --git a/changelog.d/4769.bugfix b/changelog.d/4769.bugfix deleted file mode 100644 index ec4fc96994..0000000000 --- a/changelog.d/4769.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixing emoji related crashes on android 8.1.1 and below \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/40103120.txt b/fastlane/metadata/android/en-US/changelogs/40103120.txt new file mode 100644 index 0000000000..90d55f5f48 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40103120.txt @@ -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 \ No newline at end of file