From ed80fe517d38f72989613d64b4269fd814359485 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 22 Feb 2022 21:06:41 +0100 Subject: [PATCH 1/5] Revert recent change to fix a crash `readReceiptsSummaryEntity.realm` is null --- .../mapper/ReadReceiptsSummaryMapper.kt | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ReadReceiptsSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ReadReceiptsSummaryMapper.kt index 5aaa49b9e8..f3770e4afe 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ReadReceiptsSummaryMapper.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ReadReceiptsSummaryMapper.kt @@ -23,18 +23,23 @@ import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntity import org.matrix.android.sdk.internal.database.query.where import javax.inject.Inject -internal class ReadReceiptsSummaryMapper @Inject constructor(private val realmSessionProvider: RealmSessionProvider) { +internal class ReadReceiptsSummaryMapper @Inject constructor( + private val realmSessionProvider: RealmSessionProvider +) { fun map(readReceiptsSummaryEntity: ReadReceiptsSummaryEntity?): List { if (readReceiptsSummaryEntity == null) { return emptyList() } val readReceipts = readReceiptsSummaryEntity.readReceipts - return readReceipts - .mapNotNull { - val roomMember = RoomMemberSummaryEntity.where(readReceiptsSummaryEntity.realm, roomId = it.roomId, userId = it.userId).findFirst() - ?: return@mapNotNull null - ReadReceipt(roomMember.asDomain(), it.originServerTs.toLong()) - } + + return realmSessionProvider.withRealm { realm -> + readReceipts + .mapNotNull { + val roomMember = RoomMemberSummaryEntity.where(realm, roomId = it.roomId, userId = it.userId).findFirst() + ?: return@mapNotNull null + ReadReceipt(roomMember.asDomain(), it.originServerTs.toLong()) + } + } } } From 6fd14c9ebc85d07fd8d1b9dd558027dce4fefbbf Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 22 Feb 2022 21:21:24 +0100 Subject: [PATCH 2/5] Typo in the filename --- changelog.d/{5198.buxfix => 5198.bugfix} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog.d/{5198.buxfix => 5198.bugfix} (100%) diff --git a/changelog.d/5198.buxfix b/changelog.d/5198.bugfix similarity index 100% rename from changelog.d/5198.buxfix rename to changelog.d/5198.bugfix From b746321bad42eab53eb2126cddddc3d0f3938912 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 22 Feb 2022 21:21:40 +0100 Subject: [PATCH 3/5] Towncrier --- CHANGES.md | 44 ++++++++++++++++++++++++++++++++++++++++ changelog.d/2782.misc | 1 - changelog.d/3771.feature | 1 - changelog.d/4640.bugfix | 1 - changelog.d/4643.misc | 1 - changelog.d/5104.misc | 1 - changelog.d/5123.feature | 1 - changelog.d/5136.misc | 1 - changelog.d/5178.bugfix | 1 - changelog.d/5183.sdk | 1 - changelog.d/5185.sdk | 1 - changelog.d/5195.bugfix | 1 - changelog.d/5198.bugfix | 1 - changelog.d/5201.bugfix | 1 - changelog.d/5204.feature | 1 - changelog.d/5207.sdk | 1 - changelog.d/5209.misc | 1 - changelog.d/5210.misc | 1 - changelog.d/5218.bugfix | 1 - changelog.d/5225.misc | 1 - changelog.d/5234.bugfix | 1 - changelog.d/5243.bugfix | 1 - changelog.d/5254.misc | 1 - changelog.d/5256.misc | 1 - changelog.d/5276.misc | 1 - changelog.d/5290.feature | 1 - changelog.d/5294.misc | 1 - changelog.d/5295.bugfix | 1 - changelog.d/5297.misc | 1 - 29 files changed, 44 insertions(+), 28 deletions(-) delete mode 100644 changelog.d/2782.misc delete mode 100644 changelog.d/3771.feature delete mode 100644 changelog.d/4640.bugfix delete mode 100644 changelog.d/4643.misc delete mode 100644 changelog.d/5104.misc delete mode 100644 changelog.d/5123.feature delete mode 100644 changelog.d/5136.misc delete mode 100644 changelog.d/5178.bugfix delete mode 100644 changelog.d/5183.sdk delete mode 100644 changelog.d/5185.sdk delete mode 100644 changelog.d/5195.bugfix delete mode 100644 changelog.d/5198.bugfix delete mode 100644 changelog.d/5201.bugfix delete mode 100644 changelog.d/5204.feature delete mode 100644 changelog.d/5207.sdk delete mode 100644 changelog.d/5209.misc delete mode 100644 changelog.d/5210.misc delete mode 100644 changelog.d/5218.bugfix delete mode 100644 changelog.d/5225.misc delete mode 100644 changelog.d/5234.bugfix delete mode 100644 changelog.d/5243.bugfix delete mode 100644 changelog.d/5254.misc delete mode 100644 changelog.d/5256.misc delete mode 100644 changelog.d/5276.misc delete mode 100644 changelog.d/5290.feature delete mode 100644 changelog.d/5294.misc delete mode 100644 changelog.d/5295.bugfix delete mode 100644 changelog.d/5297.misc diff --git a/CHANGES.md b/CHANGES.md index 3e0c5ff4ae..5ea3859177 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,47 @@ +Changes in Element v1.4.2 (2022-02-22) +====================================== + +Features ✨ +---------- + - Open the room when user accepts an invite from the room list ([#3771](https://github.com/vector-im/element-android/issues/3771)) + - Add completion for @room to notify everyone in a room ([#5123](https://github.com/vector-im/element-android/issues/5123)) + - Improve UI of reactions in timeline, including quick add reaction. ([#5204](https://github.com/vector-im/element-android/issues/5204)) + - Support creating disclosed polls ([#5290](https://github.com/vector-im/element-android/issues/5290)) + +Bugfixes 🐛 +---------- + - Right align the notifications badge in the rooms list (and DMs) so that it's always in a consistent place on the screen. ([#4640](https://github.com/vector-im/element-android/issues/4640)) + - Remove redundant highlight on add poll option button ([#5178](https://github.com/vector-im/element-android/issues/5178)) + - Reliably display crash report prompt ([#5195](https://github.com/vector-im/element-android/issues/5195)) + - Fix for rooms with virtual rooms not showing call status events in the timeline. ([#5198](https://github.com/vector-im/element-android/issues/5198)) + - Fix for call transfer with consult failing to make outgoing consultation call. ([#5201](https://github.com/vector-im/element-android/issues/5201)) + - Fix crash during account registration when redirecting to Web View ([#5218](https://github.com/vector-im/element-android/issues/5218)) + - Analytics: Fixes missing use case identity values from within the onboarding flow ([#5234](https://github.com/vector-im/element-android/issues/5234)) + - Increments database schema to take advantage of homeserver capabilities entity migration (fixes crash in pre-release builds) ([#5243](https://github.com/vector-im/element-android/issues/5243)) + - Fixing crash when adding room by QR code after accepting the camera permission for the first time ([#5295](https://github.com/vector-im/element-android/issues/5295)) + +SDK API changes ⚠️ +------------------ + - `join` and `leave` methods moved from MembershipService to RoomService and SpaceService to split logic for rooms and spaces ([#5183](https://github.com/vector-im/element-android/issues/5183)) + - Deprecates Matrix.initialize and Matrix.getInstance in favour of the client providing its own singleton instance via Matrix.createInstance ([#5185](https://github.com/vector-im/element-android/issues/5185)) + - Adds support for MSC3283, additional homeserver capabilities ([#5207](https://github.com/vector-im/element-android/issues/5207)) + +Other changes +------------- + - Collapse successive ACLs events in room timeline ([#2782](https://github.com/vector-im/element-android/issues/2782)) + - Home screen: Replacing search icon by filter icon in the top right menu ([#4643](https://github.com/vector-im/element-android/issues/4643)) + - Make Space creation screens more consistent ([#5104](https://github.com/vector-im/element-android/issues/5104)) + - Defensive coding to ensure encryption when room was once e2e ([#5136](https://github.com/vector-im/element-android/issues/5136)) + - Reduce verbosity of debug logging, ([#5209](https://github.com/vector-im/element-android/issues/5209)) + - Standardise emulator versions of GHA integration tests. ([#5210](https://github.com/vector-im/element-android/issues/5210)) + - Replacing color "vctr_unread_room_badge" by "vctr_content_secondary" ([#5225](https://github.com/vector-im/element-android/issues/5225)) + - Change preferred jitsi domain from `jitsi.riot.im` to `meet.element.io` ([#5254](https://github.com/vector-im/element-android/issues/5254)) + - Analytics screen events are now tracked on screen enter instead of screen leave ([#5256](https://github.com/vector-im/element-android/issues/5256)) + - Improves bitmap memory usage by caching the shortcut images ([#5276](https://github.com/vector-im/element-android/issues/5276)) + - Changes unread marker in room list from green to grey ([#5294](https://github.com/vector-im/element-android/issues/5294)) + - Improve some internal realm usages. ([#5297](https://github.com/vector-im/element-android/issues/5297)) + + Changes in Element v1.4.0 (2022-02-09) ====================================== diff --git a/changelog.d/2782.misc b/changelog.d/2782.misc deleted file mode 100644 index dc20050369..0000000000 --- a/changelog.d/2782.misc +++ /dev/null @@ -1 +0,0 @@ -Collapse successive ACLs events in room timeline diff --git a/changelog.d/3771.feature b/changelog.d/3771.feature deleted file mode 100644 index c480bb649d..0000000000 --- a/changelog.d/3771.feature +++ /dev/null @@ -1 +0,0 @@ -Open the room when user accepts an invite from the room list \ No newline at end of file diff --git a/changelog.d/4640.bugfix b/changelog.d/4640.bugfix deleted file mode 100644 index f5fa5a5bde..0000000000 --- a/changelog.d/4640.bugfix +++ /dev/null @@ -1 +0,0 @@ -Right align the notifications badge in the rooms list (and DMs) so that it's always in a consistent place on the screen. \ No newline at end of file diff --git a/changelog.d/4643.misc b/changelog.d/4643.misc deleted file mode 100644 index 3d86baa1a2..0000000000 --- a/changelog.d/4643.misc +++ /dev/null @@ -1 +0,0 @@ -Home screen: Replacing search icon by filter icon in the top right menu diff --git a/changelog.d/5104.misc b/changelog.d/5104.misc deleted file mode 100644 index 673614955b..0000000000 --- a/changelog.d/5104.misc +++ /dev/null @@ -1 +0,0 @@ -Make Space creation screens more consistent diff --git a/changelog.d/5123.feature b/changelog.d/5123.feature deleted file mode 100644 index cb1a7adf08..0000000000 --- a/changelog.d/5123.feature +++ /dev/null @@ -1 +0,0 @@ -Add completion for @room to notify everyone in a room diff --git a/changelog.d/5136.misc b/changelog.d/5136.misc deleted file mode 100644 index 43404acc31..0000000000 --- a/changelog.d/5136.misc +++ /dev/null @@ -1 +0,0 @@ -Defensive coding to ensure encryption when room was once e2e \ No newline at end of file diff --git a/changelog.d/5178.bugfix b/changelog.d/5178.bugfix deleted file mode 100644 index 73021a0485..0000000000 --- a/changelog.d/5178.bugfix +++ /dev/null @@ -1 +0,0 @@ -Remove redundant highlight on add poll option button \ No newline at end of file diff --git a/changelog.d/5183.sdk b/changelog.d/5183.sdk deleted file mode 100644 index 66d2c3793d..0000000000 --- a/changelog.d/5183.sdk +++ /dev/null @@ -1 +0,0 @@ -`join` and `leave` methods moved from MembershipService to RoomService and SpaceService to split logic for rooms and spaces \ No newline at end of file diff --git a/changelog.d/5185.sdk b/changelog.d/5185.sdk deleted file mode 100644 index 9eda2e7c9b..0000000000 --- a/changelog.d/5185.sdk +++ /dev/null @@ -1 +0,0 @@ -Deprecates Matrix.initialize and Matrix.getInstance in favour of the client providing its own singleton instance via Matrix.createInstance \ No newline at end of file diff --git a/changelog.d/5195.bugfix b/changelog.d/5195.bugfix deleted file mode 100644 index 50d47e089e..0000000000 --- a/changelog.d/5195.bugfix +++ /dev/null @@ -1 +0,0 @@ -Reliably display crash report prompt diff --git a/changelog.d/5198.bugfix b/changelog.d/5198.bugfix deleted file mode 100644 index 3fce6906d5..0000000000 --- a/changelog.d/5198.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix for rooms with virtual rooms not showing call status events in the timeline. \ No newline at end of file diff --git a/changelog.d/5201.bugfix b/changelog.d/5201.bugfix deleted file mode 100644 index f77ddcce84..0000000000 --- a/changelog.d/5201.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix for call transfer with consult failing to make outgoing consultation call. \ No newline at end of file diff --git a/changelog.d/5204.feature b/changelog.d/5204.feature deleted file mode 100644 index a107342de7..0000000000 --- a/changelog.d/5204.feature +++ /dev/null @@ -1 +0,0 @@ -Improve UI of reactions in timeline, including quick add reaction. \ No newline at end of file diff --git a/changelog.d/5207.sdk b/changelog.d/5207.sdk deleted file mode 100644 index 3ba3e06fb7..0000000000 --- a/changelog.d/5207.sdk +++ /dev/null @@ -1 +0,0 @@ -Adds support for MSC3283, additional homeserver capabilities \ No newline at end of file diff --git a/changelog.d/5209.misc b/changelog.d/5209.misc deleted file mode 100644 index a238da9d22..0000000000 --- a/changelog.d/5209.misc +++ /dev/null @@ -1 +0,0 @@ -Reduce verbosity of debug logging, diff --git a/changelog.d/5210.misc b/changelog.d/5210.misc deleted file mode 100644 index 0b68e8b23a..0000000000 --- a/changelog.d/5210.misc +++ /dev/null @@ -1 +0,0 @@ -Standardise emulator versions of GHA integration tests. diff --git a/changelog.d/5218.bugfix b/changelog.d/5218.bugfix deleted file mode 100644 index 4f92338a4f..0000000000 --- a/changelog.d/5218.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix crash during account registration when redirecting to Web View diff --git a/changelog.d/5225.misc b/changelog.d/5225.misc deleted file mode 100644 index 799a3a4d81..0000000000 --- a/changelog.d/5225.misc +++ /dev/null @@ -1 +0,0 @@ -Replacing color "vctr_unread_room_badge" by "vctr_content_secondary" diff --git a/changelog.d/5234.bugfix b/changelog.d/5234.bugfix deleted file mode 100644 index 2b5d4dee37..0000000000 --- a/changelog.d/5234.bugfix +++ /dev/null @@ -1 +0,0 @@ -Analytics: Fixes missing use case identity values from within the onboarding flow \ No newline at end of file diff --git a/changelog.d/5243.bugfix b/changelog.d/5243.bugfix deleted file mode 100644 index eb323c1ca4..0000000000 --- a/changelog.d/5243.bugfix +++ /dev/null @@ -1 +0,0 @@ -Increments database schema to take advantage of homeserver capabilities entity migration (fixes crash in pre-release builds) \ No newline at end of file diff --git a/changelog.d/5254.misc b/changelog.d/5254.misc deleted file mode 100644 index 2ae642e9b7..0000000000 --- a/changelog.d/5254.misc +++ /dev/null @@ -1 +0,0 @@ -Change preferred jitsi domain from `jitsi.riot.im` to `meet.element.io` \ No newline at end of file diff --git a/changelog.d/5256.misc b/changelog.d/5256.misc deleted file mode 100644 index e20f52c7aa..0000000000 --- a/changelog.d/5256.misc +++ /dev/null @@ -1 +0,0 @@ -Analytics screen events are now tracked on screen enter instead of screen leave \ No newline at end of file diff --git a/changelog.d/5276.misc b/changelog.d/5276.misc deleted file mode 100644 index 437bd28eb6..0000000000 --- a/changelog.d/5276.misc +++ /dev/null @@ -1 +0,0 @@ -Improves bitmap memory usage by caching the shortcut images \ No newline at end of file diff --git a/changelog.d/5290.feature b/changelog.d/5290.feature deleted file mode 100644 index 6f7e9aea7f..0000000000 --- a/changelog.d/5290.feature +++ /dev/null @@ -1 +0,0 @@ -Support creating disclosed polls \ No newline at end of file diff --git a/changelog.d/5294.misc b/changelog.d/5294.misc deleted file mode 100644 index 857110efab..0000000000 --- a/changelog.d/5294.misc +++ /dev/null @@ -1 +0,0 @@ -Changes unread marker in room list from green to grey \ No newline at end of file diff --git a/changelog.d/5295.bugfix b/changelog.d/5295.bugfix deleted file mode 100644 index c5e55cde5d..0000000000 --- a/changelog.d/5295.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixing crash when adding room by QR code after accepting the camera permission for the first time \ No newline at end of file diff --git a/changelog.d/5297.misc b/changelog.d/5297.misc deleted file mode 100644 index f45490ce3d..0000000000 --- a/changelog.d/5297.misc +++ /dev/null @@ -1 +0,0 @@ -Improve some internal realm usages. \ No newline at end of file From 70bb1004c146cceadb384c63747cb7fe75991c8b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 22 Feb 2022 21:27:06 +0100 Subject: [PATCH 4/5] Tidy up the changelog --- CHANGES.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 5ea3859177..255792f800 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,14 +10,12 @@ Features ✨ Bugfixes 🐛 ---------- - - Right align the notifications badge in the rooms list (and DMs) so that it's always in a consistent place on the screen. ([#4640](https://github.com/vector-im/element-android/issues/4640)) - Remove redundant highlight on add poll option button ([#5178](https://github.com/vector-im/element-android/issues/5178)) - Reliably display crash report prompt ([#5195](https://github.com/vector-im/element-android/issues/5195)) - Fix for rooms with virtual rooms not showing call status events in the timeline. ([#5198](https://github.com/vector-im/element-android/issues/5198)) - Fix for call transfer with consult failing to make outgoing consultation call. ([#5201](https://github.com/vector-im/element-android/issues/5201)) - Fix crash during account registration when redirecting to Web View ([#5218](https://github.com/vector-im/element-android/issues/5218)) - Analytics: Fixes missing use case identity values from within the onboarding flow ([#5234](https://github.com/vector-im/element-android/issues/5234)) - - Increments database schema to take advantage of homeserver capabilities entity migration (fixes crash in pre-release builds) ([#5243](https://github.com/vector-im/element-android/issues/5243)) - Fixing crash when adding room by QR code after accepting the camera permission for the first time ([#5295](https://github.com/vector-im/element-android/issues/5295)) SDK API changes ⚠️ @@ -28,6 +26,7 @@ SDK API changes ⚠️ Other changes ------------- + - Right align the notifications badge in the rooms list (and DMs) so that it's always in a consistent place on the screen. ([#4640](https://github.com/vector-im/element-android/issues/4640)) - Collapse successive ACLs events in room timeline ([#2782](https://github.com/vector-im/element-android/issues/2782)) - Home screen: Replacing search icon by filter icon in the top right menu ([#4643](https://github.com/vector-im/element-android/issues/4643)) - Make Space creation screens more consistent ([#5104](https://github.com/vector-im/element-android/issues/5104)) @@ -41,6 +40,10 @@ Other changes - Changes unread marker in room list from green to grey ([#5294](https://github.com/vector-im/element-android/issues/5294)) - Improve some internal realm usages. ([#5297](https://github.com/vector-im/element-android/issues/5297)) +Translations 🗣 +-------------- + - Improved Japanese translations (special thanks to Suguru Hirahara!) + Changes in Element v1.4.0 (2022-02-09) ====================================== From bb0955f809a3928fbda2d7a814d84472b2aaedcf Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 22 Feb 2022 21:29:16 +0100 Subject: [PATCH 5/5] change for fastlane --- fastlane/metadata/android/en-US/changelogs/40104000.txt | 2 +- fastlane/metadata/android/en-US/changelogs/40104020.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/40104020.txt diff --git a/fastlane/metadata/android/en-US/changelogs/40104000.txt b/fastlane/metadata/android/en-US/changelogs/40104000.txt index e102edbaad..4492b78882 100644 --- a/fastlane/metadata/android/en-US/changelogs/40104000.txt +++ b/fastlane/metadata/android/en-US/changelogs/40104000.txt @@ -1,2 +1,2 @@ -Main changes in this version: Initial implementation of thread messages. Message bubbles. +Main changes in this version: Initial implementation of thread messages. Message bubbles. Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.4.0 \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/40104020.txt b/fastlane/metadata/android/en-US/changelogs/40104020.txt new file mode 100644 index 0000000000..82d3197db3 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40104020.txt @@ -0,0 +1,2 @@ +Main changes in this version: add support to @room and undisclosed polls among many other little changes. +Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.4.2 \ No newline at end of file