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
..
fastlane/metadata/android	[TMP] Automatic upstream merge preparation	2021-04-12 15:58:23 +02:00
metadata/android	[TMP] Automatic upstream merge preparation	2021-04-12 15:58:23 +02:00