Merge branch 'hotfix/1.5.7' into main

element-hq · Nov 7, 2022 · 4b7f030 · 4b7f030
2 parents 3b27189 + 203bd2a
commit 4b7f030
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git 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)
 ======================================
 

diff --git a/fastlane/metadata/android/en-US/changelogs/40105070.txt 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
diff --git 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/...sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt b/...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 {

diff --git 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'