From 38651353aa10542facd46f1240d49e63b9a85b25 Mon Sep 17 00:00:00 2001 From: NIkita Fedrunov Date: Mon, 7 Nov 2022 16:16:51 +0100 Subject: [PATCH 1/4] temporary workaround for a failing sync due to unexpected `enableUnreadThreadNotifications` param --- .../android/sdk/internal/session/filter/FilterFactory.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt index 77c5649709..e0919c52e3 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt @@ -67,7 +67,9 @@ internal object FilterFactory { } private fun createElementTimelineFilter(): RoomEventFilter? { - return RoomEventFilter(enableUnreadThreadNotifications = true) +// we need to check if homeserver supports thread notifications before setting this param +// return RoomEventFilter(enableUnreadThreadNotifications = true) + return null } private fun createElementStateFilter(): RoomEventFilter { From c323326a5897115981c69db40c346f5fbcf79e8f Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 7 Nov 2022 17:14:18 +0100 Subject: [PATCH 2/4] Version 1.5.7 --- matrix-sdk-android/build.gradle | 2 +- vector-app/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 968d8515ac..8bfcef3643 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -62,7 +62,7 @@ android { // that the app's state is completely cleared between tests. testInstrumentationRunnerArguments clearPackageData: 'true' - buildConfigField "String", "SDK_VERSION", "\"1.5.6\"" + buildConfigField "String", "SDK_VERSION", "\"1.5.7\"" buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\"" buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\"" diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 9a0bfdfa63..b1b7e5f748 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -37,7 +37,7 @@ ext.versionMinor = 5 // Note: even values are reserved for regular release, odd values for hotfix release. // When creating a hotfix, you should decrease the value, since the current value // is the value for the next regular release. -ext.versionPatch = 6 +ext.versionPatch = 7 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' From e450c06f7cc63a962dc7feb8dd3d6ffc1b8fb820 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 7 Nov 2022 17:16:55 +0100 Subject: [PATCH 3/4] Changelog --- CHANGES.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index cfea189c21..18bb2480c3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,10 @@ +Changes in Element v1.5.7 (2022-11-07) +====================================== + +Bugfixes 🐛 +---------- +- Fix regression when syncing with homeserver < 1.4. ([#7534](https://github.com/vector-im/element-android/issues/7534)) + Changes in Element v1.5.6 (2022-11-02) ====================================== From 203bd2abbdc85542f1c2f1e20e5f23156381701d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 7 Nov 2022 17:18:26 +0100 Subject: [PATCH 4/4] fastlane file --- fastlane/metadata/android/en-US/changelogs/40105070.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/40105070.txt diff --git a/fastlane/metadata/android/en-US/changelogs/40105070.txt b/fastlane/metadata/android/en-US/changelogs/40105070.txt new file mode 100644 index 0000000000..8269f7145c --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40105070.txt @@ -0,0 +1,2 @@ +Main changes in this version: new UI for selecting an attachment. +Full changelog: https://github.com/vector-im/element-android/releases