SpiritCroc
49663a1154
Merge tag 'v1.4.18' into sc
...
Change-Id: I58667aa99a8eb99b0b1e7f0784d811061c2086a5
Conflicts:
dependencies.gradle
library/attachment-viewer/build.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
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/session/room/summary/RoomSummaryDataSource.kt
vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
vector/src/main/java/im/vector/app/AppStateHandler.kt
vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
vector/src/main/java/im/vector/app/core/utils/Emoji.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
vector/src/main/res/xml/vector_settings_labs.xml
2022-06-01 13:54:34 +02:00
Benoit Marty
ae94f45f34
Merge pull request #5952 from vector-im/feature/bma/sdk_user_story
...
Sdk user story
2022-05-30 18:30:56 +02:00
SpiritCroc
0393dd51c9
Bring back downstream "Update room previews once we have decryption keys"
...
This reverts commit 130fe7f887 .
Also update to some newer decryption logic, and disable the new upstream
logic, to avoid duplicate decryption attempts.
Change-Id: Ibcea8b825d94284dfcf2d305b5f57423366601e5
2022-05-30 17:39:20 +02:00
Maxime NATUREL
eeaf9fd616
Merge pull request #6129 from vector-im/feature/mna/PSF-1019-user-pins
...
[Location sharing] - Show user live location pins in map view (PSF-1019)
2022-05-30 12:32:09 +02:00
Benoit Marty
c071dc502e
Create extension String?.toActiveSpaceOrOrphanRooms() to reduce noise.
2022-05-30 11:38:31 +02:00
Benoit Marty
cffdb7f7a6
Add some Kdoc
2022-05-30 11:38:03 +02:00
Benoit Marty
5fbcec0c9c
Add some Kdoc
2022-05-30 11:34:55 +02:00
Benoit Marty
0b6f35b256
Create SpaceFilter.OrphanRooms to improve the API.
...
Not 100% of the side effect. There is probably some (fixed?) bugs here.
2022-05-30 11:34:55 +02:00
Benoit Marty
c7997edf9a
Rename ActiveSpaceFilter to SpaceFilter
2022-05-30 11:34:55 +02:00
Benoit Marty
00809027c1
Remove ActiveSpaceFilter.None
...
Prefer nullability for API coherency of `RoomSummaryQueryParams`
2022-05-30 11:34:55 +02:00
Benoit Marty
289f27b738
Add some Kdoc
2022-05-30 11:34:55 +02:00
Benoit Marty
3442829e11
Remove duplicated lines of code (the same code is done a few lines later)
2022-05-30 11:34:55 +02:00
Benoit Marty
8843fe0a54
Remove RoomCategoryFilter.ALL
...
Prefer nullability for API coherency of `RoomSummaryQueryParams`
2022-05-30 11:34:55 +02:00
Benoit Marty
8d7a54a6cf
displayName default value is now QueryStringValue.NoCondition.
...
It was working fine since in the DB we always have a name using `RoomDisplayNameFallbackProvider`, which in our current implementation always return a non empty String.
2022-05-30 11:34:55 +02:00
Benoit Marty
2b0077b138
Small rework for nicer code
2022-05-30 11:34:55 +02:00
Benoit Marty
bfdc885d7f
Remove roomId from RoomSummaryQueryParams.Builder().
...
Create a new API in RoomService to observe a room summary from a roomId.
2022-05-30 11:34:55 +02:00
Benoit Marty
49a29fb56f
Always use roomSummaryQueryParams, and not directly a RoomSummaryQueryParams.Builder()
...
Also format and add some Kdoc
2022-05-30 11:34:55 +02:00
Benoit Marty
12b3afbc50
Always use roomSummaryQueryParams, and not directly a RoomSummaryQueryParams.Builder()
...
Also format and add some Kdoc
2022-05-30 11:34:55 +02:00
Eric Decanini
eeb7d60e59
Merge pull request #5860 from vector-im/feature/eric/replace-search-room-subheader
...
Replaces subtitle in Search Rooms with room context rather than last event
2022-05-30 11:13:10 +02:00
Maxime NATUREL
066c540eb7
Filter event id in the DB query for active lives
2022-05-30 10:06:04 +02:00
ericdecanini
a5dc8ec181
Only gets flattenParents if specifically requested
2022-05-27 15:05:39 +02:00
Valere
d7c8abbe98
quick format
2022-05-25 16:52:56 +02:00
Valere
755da616ed
Fix decrypting redacted event
2022-05-25 16:52:56 +02:00
Valere
52eb48d808
Merge pull request #6077 from vector-im/feature/aris/crypto_replay_attack
...
Feature/aris/crypto replay attack
2022-05-25 16:20:26 +02:00
Maxime NATUREL
eda0aa97d0
Fixing code quality issues
2022-05-25 14:11:18 +02:00
Maxime NATUREL
33151eef73
Move the default implementation of location sharing service into internal package
2022-05-25 14:05:14 +02:00
Maxime NATUREL
8d2debf47e
Adding missing ending dots in comments
2022-05-25 14:05:14 +02:00
Maxime NATUREL
d9480bb136
Adding todo to add unit tests on aggregation process
2022-05-25 14:05:14 +02:00
Maxime NATUREL
c07bc0890f
WIP - unit tests
2022-05-25 14:05:14 +02:00
Maxime NATUREL
79212321a2
Deactivate all previous active beacons when receiving one from user
2022-05-25 14:05:12 +02:00
Maxime NATUREL
bec3f793f3
Improve query of current running live location shares
2022-05-25 14:04:22 +02:00
Maxime NATUREL
ca9591e423
Fix set of userId in aggregation process
2022-05-25 14:04:22 +02:00
Maxime NATUREL
3b06f18ccb
Remove unused imports
2022-05-25 14:04:22 +02:00
Maxime NATUREL
7a7af40d61
Creation of LocationSharingService to get current users sharing their live locations
2022-05-25 14:04:20 +02:00
Maxime NATUREL
791d4fb1e8
Improve computation of the work name to limit its length
2022-05-25 11:10:54 +02:00
Maxime NATUREL
8864a3cf2c
Using replace instead of keep strategy for the worker
2022-05-25 11:06:02 +02:00
Maxime NATUREL
cfdc18d421
Improve code readability in aggregation processor
2022-05-25 11:05:28 +02:00
Maxime NATUREL
b081429725
Replace getOrCreate() by get() in worker
2022-05-25 10:59:08 +02:00
SpiritCroc
a2486fccf5
Do not fully discard chunks that start with duplicate events
...
If we already have some events in a previously linked chunk, that
doesn't mean we have all of them. So we still want to continue
processing later events in that case.
Change-Id: I95e864ad7e786ea71b9facdbbf52c2685b36ee26
2022-05-24 11:54:21 +02:00
SpiritCroc
d3addc24f1
Add some missing log spaces
...
Change-Id: I36cfbaa49f1e7703d23eacefeeafda380eb99e65
2022-05-24 11:53:38 +02:00
Maxime NATUREL
683a9cdfff
Schedule work during aggregation
2022-05-23 17:34:52 +02:00
Maxime NATUREL
47eb7173f0
Creation of a worker to deactivate a live after timeout
2022-05-23 17:34:52 +02:00
Maxime NATUREL
d76b93ced3
Adding comment on isActive field
2022-05-23 17:34:51 +02:00
SpiritCroc
a95e41056d
Improve room preview generation
...
- Also look into past chunks for previewable events
- Better timestamp guesses if not enough history loaded yet
- Update missing previews when more chunks loaded
Change-Id: I27a420b9564e091db0e322751c798e205e26fd47
2022-05-22 20:26:25 +02:00
SpiritCroc
8a1da1c02f
Avoid mismatch between hasUnread and notificationCount because of unreadCount
...
With MSC2654 unread counts, it is possible such count is zero while the
notification count isn't. So also respect the notification count when
deciding if a chat has unread messages.
Change-Id: I1b9f6ae907eb468c27fc0bb75b711db04268560a
2022-05-22 13:12:46 +02:00
SpiritCroc
c214e5daf1
Avoid missing timestamps due to missing previewable event
...
Just use a non-previewable event instead.
Improves sorting of the room list: don't drop rooms to the bottom
because of too much un-previewable activity.
Change-Id: Ib1ad8050caae85a3e7c8a686c2fa63a2924db890
2022-05-22 12:23:11 +02:00
Benoit Marty
53c83ab8d8
Add missing punctuation
2022-05-20 21:22:47 +02:00
Benoit Marty
92d54dc733
Fix compilation issue
2022-05-20 21:14:42 +02:00
Benoit Marty
b86693580e
class with private constructor instead of object
2022-05-20 21:14:42 +02:00
Benoit Marty
8218d8f267
Typo: isStucked -> isStuck
2022-05-20 21:14:42 +02:00