Benoit Marty
4ea4990177
Merge remote-tracking branch 'origin/develop' into develop
2022-06-13 14:12:00 +02:00
Benoit Marty
d876690fc7
Merge branch 'hotfix/1.4.20' into develop
2022-06-13 14:08:49 +02:00
ganfra
2a9ac539e4
Change after PR review
2022-06-13 12:35:39 +02:00
ganfra
c384a3de8d
Fix EventInsertLiveObserver gets blocked by reverting and adding lock instead
2022-06-13 12:35:20 +02:00
Onuray Sahin
d8947f5c0b
Add report action for live location messages.
2022-06-10 14:01:43 +03:00
ericdecanini
87053f2c70
Reformats after merging
2022-06-08 13:01:26 +02:00
ericdecanini
6df88fba59
Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/GroupSyncHandler.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
# vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
# vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
# vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
# vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
2022-06-08 12:59:54 +02:00
Benoit Marty
3b2f9d9404
Merge pull request #6029 from vector-im/feature/bma/sdk_sync_service
...
Feature/bma/sdk sync service
2022-06-08 11:58:38 +02:00
Benoit Marty
1bad8f7741
Introduce SessionState to be able to check the Session state from several places.
2022-06-08 09:55:28 +02:00
Benoit Marty
de960116b3
Rename internal fun.
2022-06-08 09:55:28 +02:00
Benoit Marty
dd22cdf7f2
Rename existing SyncService to SyncAndroidService to avoid confusion
2022-06-08 09:55:28 +02:00
Benoit Marty
f62d598b79
Create a SyncService and move some methods from Session there.
...
Merge SyncStatusService to SyncService, and rename some classes
2022-06-08 09:53:33 +02:00
Maxime NATUREL
73568dbc86
Merge pull request #6212 from vector-im/fix/mna/6209-wrong-live-status
...
Fix wrong status of live location sharing in timeline (PSF-1073)
2022-06-08 09:40:33 +02:00
Benoit Marty
c290dd6c1d
Merge branch 'develop' into task/eric/when-arrow-alignment
2022-06-07 23:03:36 +02:00
Adam Brown
462d3071de
Merge pull request #6171 from vector-im/feature/adm/sdk-new-password-on-confirmation
...
[SDK] Allow passwords to be set at the point of reset confirmation
2022-06-07 16:43:28 +01:00
Benoit Marty
26dcc9bc52
Merge hotfix 1.4.19 into develop
2022-06-07 15:14:29 +02:00
Valere
a6113526d0
code review
2022-06-07 15:01:57 +02:00
Valere
2fa25f8b5e
Fix param name
2022-06-07 15:01:29 +02:00
Valere
d67f86a1e0
fix slow paged room list
2022-06-07 15:00:54 +02:00
Adam Brown
0ef67b6b64
Merge pull request #6214 from vector-im/feature/adm/homeserver-version-parsing
...
Homeserver version without patch number parsing
2022-06-06 14:54:32 +01:00
Adam Brown
fa21b6d224
creating generic extension for converting empty strings to null and making use for finding option regex match
2022-06-06 14:16:01 +01:00
Adam Brown
edfabb0f26
adding missing loading state when confirming password reset
...
- adds reset test cases to the onboarding view model
2022-06-06 13:59:34 +01:00
Adam Brown
cc8f17b786
moving the reset password new password to the reset confirmation step
...
- the new password is moved to the in memory view model state
2022-06-06 13:57:59 +01:00
Adam Brown
35163f77ba
allow passing the new password when resetting passwords either upfront or as part of the confirmation step
2022-06-06 13:57:59 +01:00
ericdecanini
7d8590d85f
Disables when arrow alignment post merge with develop
2022-06-03 12:14:47 +02:00
ericdecanini
5cc7deea4e
Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
# vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
# vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
# vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
# vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
# vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
# vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
# vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.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/RoomListSectionBuilderSpace.kt
# vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
# vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
# vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
2022-06-03 12:06:23 +02:00
Adam Brown
4f8aedb038
moving and updating duplicated service function doc
2022-06-01 16:48:10 +01:00
Adam Brown
b0c294b41b
avoiding resetting pending state when starting a new login flow
...
- fixes selecting a incorrect homeserver and returning to the previous login page also failing
2022-06-01 16:48:10 +01:00
Adam Brown
289ce7419d
supporting homeserver versions without a patch value
2022-06-01 10:41:37 +01:00
Benoit Marty
8e709dbbdb
Merge pull request #5528 from SpiritCroc/chunk-modification-issue
...
Fix missing/swapped/duplicated messages due to wrong TimelineChunk modifications or insertions
2022-05-31 18:24:08 +02:00
Maxime NATUREL
b1750c1c21
Adding log in worker
2022-05-31 15:56:36 +02:00
Maxime NATUREL
102684ed88
Fixing aggregation process
2022-05-31 15:56:23 +02:00
ericdecanini
8af49891ff
Post merge conflict reformatting
2022-05-31 14:23:02 +02:00
ericdecanini
e6e05317e1
Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis
...
# Conflicts:
# matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.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
2022-05-31 14:21:16 +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
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
ericdecanini
927f526c6c
Post merge conflict reformatting
2022-05-25 17:35:54 +02:00
ericdecanini
8647400dda
Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
2022-05-25 17:35:31 +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
ericdecanini
c3209d7049
Manually fixes more formatting issues
2022-05-24 15:31:20 +02:00
ericdecanini
6c21a6b48d
Separates some method parameters
2022-05-24 15:26:24 +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
ericdecanini
b3fdb5ed17
Changes code style when arrow alignment
2022-05-23 12:57:57 +02:00
ericdecanini
3f3662e605
Changes code style method parameters new line around parentheses to true
2022-05-23 12:30:42 +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
Benoit Marty
dc1eba2847
Improve documentation
2022-05-20 21:14:42 +02:00
Benoit Marty
d92875e3c2
Improve documentation
2022-05-20 21:14:42 +02:00
Benoit Marty
740acda60b
Please ktlint. Ok, the user story will appear at the end of the doc.
2022-05-20 21:14:42 +02:00
Benoit Marty
853c0a25bf
Method onSecretKeyGossip doe snot have to be in the public interface
2022-05-20 21:14:42 +02:00
Benoit Marty
ede784684f
Change in KeysBackupService: isEnabled and isStucked are now fun, and state has been renamed to getState and is now a fun.
2022-05-20 21:14:42 +02:00
Benoit Marty
1ab4ae9eac
Extract KeyRef to its own file
2022-05-20 21:14:42 +02:00
Benoit Marty
d3d17ebbcb
Extract HttpPusher to its own file
2022-05-20 21:14:42 +02:00
Benoit Marty
768df330b5
Rename currentThreePid to getCurrentThreePid
2022-05-20 21:14:42 +02:00
Benoit Marty
e6c8ffd1b8
Change val to fun on the SDK interfaces.
...
Dokka will generate a better documentation (`Functions` and `Properties` are 2 distinct tab), and for Service it's better to have only `fun`
2022-05-20 21:14:42 +02:00
Benoit Marty
cfd6456614
Add other user stories (with TODO)
2022-05-20 21:14:42 +02:00
Benoit Marty
96c825e265
Create _userstories package and add the 2 first user stories
2022-05-20 21:14:42 +02:00
Benoit Marty
bad62be497
Use Kdoc format, else it's not extracted to the documentation by dokka
2022-05-20 21:14:42 +02:00
ariskotsomitopoulos
85f3592938
PR remarks
2022-05-20 17:03:15 +03:00
ariskotsomitopoulos
1bea28e27a
fix documentation format
2022-05-20 16:03:39 +03:00
ariskotsomitopoulos
e323caa233
Merge branch 'develop' into feature/aris/crypto_replay_attack
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
2022-05-20 15:46:15 +03:00
ariskotsomitopoulos
c958d3a383
Merge branch 'develop' into feature/aris/crypto_replay_attack
2022-05-20 15:43:08 +03:00
ariskotsomitopoulos
7bc880e6bf
Improve documentation
2022-05-20 15:33:29 +03:00
