Commit Graph

3232 Commits

Author SHA1 Message Date
SpiritCroc 709f8b0b05 Ensure proper grouping for notifications tab query
Change-Id: I58e8a85fd5e2c938d55189825daf7820f826da1e
2021-05-05 12:35:04 +02:00
SpiritCroc 2605c6ac9b Properly sort rooms according to events previewed in summary
Change-Id: Id17385a4d17869b0356aa7242407581e2193845e
2021-05-01 11:56:03 +02:00
SpiritCroc 3ee98f3c94 Fix missing sender information after edits
Fixes https://github.com/vector-im/element-android/issues/3184

Change-Id: I27de01c29b31fbd49c8d2b0d4dacf13ba932d5b9
2021-05-01 11:56:03 +02:00
SpiritCroc 28c5f036c8 Merge tag 'v1.1.5' into sc
Change-Id: I263852c42cfa21935890bee435f063d7fa43edfa
2021-04-15 12:29:59 +02:00
Benoit Marty 59637c4a6b Revert to Realm 10.3.1 to fix issue with migration
Waiting for https://github.com/realm/realm-java/issues/7402
2021-04-14 21:54:07 +02:00
SpiritCroc 20e185ef48 Restore setting functionality for unimportant unread type and count
Change-Id: Ied403f8fad4a7fa4e9dd1422c9ca08690183c1b1
2021-04-14 13:58:37 +02:00
SpiritCroc 04c0d7c121 Add back chats marked unread to notifications tab
Likely also required for the "mark all as read" feature to work properly
since v1.1.4

Change-Id: I375860e55e3f188526f90cf7ffdccf192871e745
2021-04-14 13:26:35 +02:00
SpiritCroc 811950cb18 Various fixes after merge
- Fix compile
- Fix counting chats marked unread
- Fix counting chats with unread messages

Change-Id: Ibf928c5380a1b7ec25f2c510b97ee4f726fe7c0d
2021-04-14 13:20:50 +02:00
SpiritCroc 0e601aa8f0 Merge tag 'v1.1.4' into sc
Note: this merge needs more work, since upstream changed implementations
affecting following features:
- Mark unread
- Notification count badges
- Overview list filtering / combined overview
- Remember expanded categories
- Read receipt layout

Change-Id: If728bb54dd7c423b57bd3f59d23d86a1a0e5e435

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_base_state.xml
2021-04-13 09:28:13 +02:00
SpiritCroc 6aa6f3e01b Merge tag 'v1.1.3' into sc
Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13

Conflicts:
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
2021-04-09 11:57:11 +02:00
Benoit Marty ee3eb8e1d6 Cleanup 2021-04-08 18:52:53 +02:00
Benoit Marty 2a1e52745f Some cleanup after merge of #3084 2021-04-08 18:50:28 +02:00
Aleks 9d96f90e49 keyword-spacing fix + wildcard-imports fix 2021-04-08 18:50:28 +02:00
Aleks 4451b682b1 merge + register/available endpoint corrections 2021-04-08 18:50:28 +02:00
Aleks 2e9f8ae6ae registration availability endpoint added 2021-04-08 18:50:05 +02:00
Benoit Marty 7b1d313e8e Small cleanup 2021-04-08 12:46:55 +02:00
Benoit Marty 8dead986a5 Always try to retry Http requests in case of 429 (#1300) 2021-04-08 10:59:51 +02:00
Benoit Marty 9b5bc60fa9 Remove unused parameter and use same value than the JS SDK 2021-04-08 09:54:51 +02:00
Benoit Marty 3b6234a9a2
Merge pull request #3133 from vector-im/feature/bma/wl_fixes
Weblate fixes
2021-04-07 19:11:16 +02:00
Benoit Marty e7608469ca Import SAS strings 2021-04-07 18:42:52 +02:00
Benoit Marty eef6d92b89
Merge pull request #3129 from vector-im/feature/bma/dn_iteration
Empty room name small iteration
2021-04-07 18:41:08 +02:00
Benoit Marty 7309c1066c Move WifiDetector to the app side
And protect the call to getEvent()
2021-04-07 17:35:46 +02:00
Benoit Marty dead57b9fe Cleanup 2021-04-07 17:35:46 +02:00
Benoit Marty b89a258fdf FastLane: Only is Wifi is detected 2021-04-07 17:35:46 +02:00
Benoit Marty c46f7fed5f Avoid code duplication 2021-04-07 17:35:46 +02:00
Benoit Marty 3a1b8bc33d FastLane: handle push rules 2021-04-07 17:35:46 +02:00
Benoit Marty f0f66cbd0e Add comment 2021-04-07 17:35:46 +02:00
Benoit Marty 4a0a6e9f01 FastLane: Ignore message edition 2021-04-07 17:35:46 +02:00
Benoit Marty 7f7f90f89e ktlint 2021-04-07 17:35:46 +02:00
Benoit Marty 96153fe92a Get Event after a Push for a faster notification display in some conditions 2021-04-07 17:35:46 +02:00
Benoit Marty 923715aeb3 Add method for name fallback when there is only one member 2021-04-07 15:19:33 +02:00
Benoit Marty 15c51cad17 Improve interface, name are not nullable 2021-04-07 15:17:02 +02:00
Benoit Marty 2495fa49f3 Improve code clarity 2021-04-07 12:39:36 +02:00
Benoit Marty c459c4f90c Change snow chat effect message type from "nic.custom.snow" to "io.element.effect.snowfall" 2021-04-07 11:17:46 +02:00
Benoit Marty 3a81521eab Restore previous log when a request fails 2021-04-07 11:17:46 +02:00
Benoit Marty e3cd916105 Fix mandatory parameter in API (#3065) 2021-04-06 16:25:16 +02:00
Benoit Marty 8b15008eba
Merge branch 'develop' into feature/bma/displayname_fallback 2021-04-06 14:31:32 +02:00
Benoit Marty 7d88d038f5
Merge pull request #3102 from vector-im/dependabot/gradle/moshi_version-1.12.0
Bump moshi_version from 1.11.0 to 1.12.0
2021-04-06 14:22:12 +02:00
Benoit Marty c30bcfeba0
Merge pull request #3121 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.21
Bump libphonenumber from 8.12.20 to 8.12.21
2021-04-06 14:20:42 +02:00
Benoit Marty 33c1da5aa1 Fix copyright 2021-04-06 14:15:05 +02:00
Benoit Marty 3109d111a4
Merge pull request #3092 from vector-im/feature/bca/paged_room_list
Room List performance PR (use Live PagedList via Monarchy)
2021-04-06 14:13:47 +02:00
Benoit Marty f42d143679
Merge pull request #3097 from vector-im/feature/bma/retrofit_suspend
Migrate Retrofit interface to coroutine calls
2021-04-06 14:11:07 +02:00
Benoit Marty 5dc28c0564 Fix avatar for DM when other user has left 2021-04-06 09:57:33 +02:00
Benoit Marty 15a463d748 Small rework 2021-04-06 09:57:33 +02:00
Benoit Marty 7e74e6a6f4 Call getFixedRoomMemberContent() when loading room members of a room
It fixes bad names for Empty room
2021-04-06 09:57:33 +02:00
Benoit Marty 2d4866cdc5 Add better support for empty room name fallback 2021-04-06 09:57:33 +02:00
dependabot[bot] 0addb3aeee
Bump libphonenumber from 8.12.20 to 8.12.21
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.20 to 8.12.21.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.20...v8.12.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-06 07:20:12 +00:00
Benoit Marty bd14c77ff0 Improve room name for invitation 2021-04-02 12:44:30 +02:00
Valere 4829298255 ktlint 2021-04-02 11:44:10 +02:00
dependabot[bot] fcc635ac8f
Bump moshi_version from 1.11.0 to 1.12.0
Bumps `moshi_version` from 1.11.0 to 1.12.0.

Updates `moshi-adapters` from 1.11.0 to 1.12.0
- [Release notes](https://github.com/square/moshi/releases)
- [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/moshi/compare/moshi-parent-1.11.0...parent-1.12.0)

Updates `moshi-kotlin-codegen` from 1.11.0 to 1.12.0
- [Release notes](https://github.com/square/moshi/releases)
- [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/moshi/compare/moshi-parent-1.11.0...parent-1.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-02 07:19:53 +00:00