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
Michael Kaye
10125f4738
Merge pull request #6111 from vector-im/michaelk/sonarqube_fixes
...
Sonarqube including coverage on each PR.
2022-06-07 09:44:00 +01:00
Michael Kaye
c2ac07b1c9
Fix ktlint error
2022-06-06 18:56:05 +01:00
Michael Kaye
56608d564e
Retry ALL THE THINGS, and always send sonarqube
2022-06-06 17:08:02 +01: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
10016fcb15
using correct license for matrix sdk class
2022-06-01 13:45:59 +01:00
Adam Brown
3756b2d240
adding trailing commas to lists
2022-06-01 10:44:23 +01:00
Adam Brown
4501c7cf45
adding test case for trailing . on the version
2022-06-01 10:44:10 +01:00
Adam Brown
289ce7419d
supporting homeserver versions without a patch value
2022-06-01 10:41:37 +01:00
Adam Brown
ea151b37f0
adding test cases around parsing homeserver versions
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
ad60467ae7
Fix test compilation
2022-05-30 11:38:03 +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
Adam Brown
d18e7ad001
Merge branch 'develop' of github.com:vector-im/element-android into michaelk/sonarqube_fixes
2022-05-30 10:07:43 +01:00
Adam Brown
ead189a9c7
temporarily ignoring flaky test when ran on the CI
2022-05-30 09:37:39 +01:00
Maxime NATUREL
066c540eb7
Filter event id in the DB query for active lives
2022-05-30 10:06:04 +02:00
Maxime NATUREL
f707f177d9
Improving mapper tests
2022-05-30 10:03:27 +02:00
ericdecanini
a5dc8ec181
Only gets flattenParents if specifically requested
2022-05-27 15:05:39 +02:00
Valere
c8b44bfd4c
fix test post rebase
2022-05-27 10:17:40 +02:00
Valere
5735b094ac
post rebase fix
2022-05-25 18:41:37 +02:00
Valere
e1292c03a1
code review
2022-05-25 18:40:33 +02:00
Valere
adb5b4c1b9
Fix closing deactivated accounts in tests
2022-05-25 18:40:33 +02:00
Valere
3332d827f0
rename testHelpers and make constructor private
2022-05-25 18:40:33 +02:00
Valere
29ff4d1e84
use withTestHelpers in sanity tests
2022-05-25 18:40:33 +02:00
Valere
e18402f834
Improve test stability
2022-05-25 18:40:33 +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
abb335c43d
Improve redaction test
2022-05-25 16:52:56 +02:00
Valere
136d2e330a
added change log
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
Michael Kaye
9f4f3f482c
Merge branch 'develop' into michaelk/sonarqube_fixes
2022-05-25 14:22:10 +01:00
Michael Kaye
f5b4e897fa
Merge pull request #6099 from vector-im/michaelk/retry_keys_backup_test
...
Track number of retries of tests,retry KeysBackupTest, Ignore E2eeSanityTests
2022-05-25 14:16:47 +01: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
1b8440d7c8
Removing unused imports
2022-05-25 14:05:14 +02:00
Maxime NATUREL
095cc12e10
Fixing unit tests of the mapper
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
5efe26c7dd
Fix code quality issues
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
Michael Kaye
c59c5cfb4a
Ignore all tests that have failed during testing.
2022-05-25 12:36:21 +01: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
8d74acf060
Fix post rebase issue
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
ariskotsomitopoulos
2081e2c45b
Reduce log visibility to verbose
2022-05-20 13:32:55 +03:00
Benoit Marty
4094a66f3c
Merge pull request #6084 from vector-im/feature/bma/detekt_outdated_doc
...
Feature/bma/detekt outdated doc
2022-05-20 12:06:34 +02:00
Benoit Marty
b547a49ab3
Merge pull request #6089 from vector-im/feature/bma/real_fail
...
Ensure calling 'fail()' is not caught by the Exception handler
2022-05-20 10:33:02 +02:00
Benoit Marty
f5d0663b06
Remove non needed extra spaces
2022-05-20 09:48:17 +02:00
Benoit Marty
dae0b66c90
PR review
2022-05-20 09:48:05 +02:00
Benoit Marty
51fe7b9a93
Detekt: Fix OutdatedDocumentation
2022-05-20 09:48:05 +02:00
Benoit Marty
2a66e03742
Kdoc: remove unnecessary :
2022-05-20 09:47:54 +02:00
Michael Kaye
a4fa65b4fd
Fix linting
2022-05-19 12:37:41 +01:00
Michael Kaye
fe793798fa
Ignore E2eeSanityTests.
...
They fail infrequently, but in a way that takes the entire test framework down,
so ignore them for now and open an issue to fix.
2022-05-19 12:06:54 +01:00
Onuray Sahin
9adbeb8dd2
Fix import.
2022-05-19 14:04:37 +03:00
Onuray Sahin
1605ae1607
Merge branch 'develop' into feature/ons/poll_refactoring
...
* develop: (251 commits)
Space explore rooms screen alignment with design in figma (#5834 )
leaving space aligned with ios (#5942 )
Fix usage of System.currentTimeMillis(). This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
Update TimelinePreviousLastForwardTest.kt
Changelog.d
Rename 'getDomain' to 'getServerName'.
Well-known lookups should not include the port of a server.
Ah it was used in Gplay variant. Anyway I think we can still remove this now.
Fix parsing of location data in non encrypted room
Additionally increment for TimelinePreviousLastForwardTest
Notify other devices of acceptance of verification request
Instead of using a magic number, explicitly test for the events we expect.
Adding comments on some strings and removing non necessary plural
Remove ShortcutBadger lib and usage (it was dead code)
Version++
Fastlane file
Towncrier
Add `.login` to get the username of the PR merger.
Rename folder for the PlayStore
Remove empty translations
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
2022-05-19 13:39:43 +03:00
Michael Kaye
28c4abb505
Track number of retries of tests, and retry KeysBackupTest
2022-05-19 10:34:38 +01:00
Michael Kaye
5260e729ac
Merge pull request #6095 from vector-im/michaelk/correct_well_known_behaviour
...
Well known lookups should be to port 443 only.
2022-05-18 16:50:43 +01:00
Michael Kaye
d57841c0d0
Merge pull request #6088 from vector-im/michaelk/fix_forward_pagination_test
...
In TimelineForwardPaginationTest, explicitly test for the events we expect
2022-05-18 16:50:09 +01:00
Michael Kaye
94411ed60e
Update TimelinePreviousLastForwardTest.kt
...
Update comments in line with code changes.
2022-05-18 16:34:39 +01:00
Michael Kaye
e66284fbd3
Rename 'getDomain' to 'getServerName'.
...
In the context of matrix IDs, this removes the leading @name: leaving the hostname or hostname and port.
2022-05-18 15:21:33 +01:00
Michael Kaye
7efd41e17a
Well-known lookups should not include the port of a server.
2022-05-18 15:21:12 +01:00
Maxime NATUREL
738ce18a2f
Merge pull request #5989 from vector-im/feature/mna/PSF-884-location-view
...
[Location sharing] - Message for live sharing in timeline (PSF-884)
2022-05-18 15:39:51 +02:00
Benoit Marty
99d4bbe74b
Fix bad copyright
2022-05-18 14:12:44 +02:00
Maxime NATUREL
4ebd1ea138
Fix parsing of location data in non encrypted room
2022-05-18 13:58:42 +02:00
ariskotsomitopoulos
5532e7dfa1
Fix copyright
2022-05-18 14:57:50 +03:00
Michael Kaye
261dadb986
Additionally increment for TimelinePreviousLastForwardTest
2022-05-18 12:37:07 +01:00
Onuray Sahin
3bf9ea5b06
Lint fixes.
2022-05-18 14:13:53 +03:00
ariskotsomitopoulos
b9adbb7d60
PR remarks
2022-05-18 14:05:58 +03:00
Onuray Sahin
7ce093e239
Code review fixes.
2022-05-18 13:39:12 +03:00
Jorge Martín
123ad87eda
Notify other devices of acceptance of verification request
2022-05-18 12:31:32 +02:00
Benoit Marty
5c9281bc7e
Ensure calling 'fail()' is not caught by the Exception handler
2022-05-18 12:26:09 +02:00
Michael Kaye
5a1545058b
Instead of using a magic number, explicitly test for the events we expect.
...
This permits a clear error when the events are missing / extra and while
not making the test invulnerable to future changes in events, should be
explicit on what's changed.
2022-05-18 11:25:07 +01:00
ericdecanini
fe27451532
Fixes lint error
2022-05-18 12:09:34 +02:00
ericdecanini
61b8053b9b
Moves LoginType to sdk api package
2022-05-18 11:23:34 +02:00
ariskotsomitopoulos
a0a7d3e7f6
Enhance reply attack to prevent DUPLICATED_MESSAGE_INDEX while decrypting the same event
2022-05-17 16:28:30 +03:00
ericdecanini
6a3044cb2e
Fixes post merge errors
2022-05-17 14:46:02 +02:00
Onuray Sahin
edd35872f3
Fix ending poll power level condition.
2022-05-17 15:44:39 +03:00
ericdecanini
b12549831e
Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
# vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
# vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
# vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
2022-05-17 14:24:35 +02:00
Onuray Sahin
4c079cc0ac
Write unit tests for poll end event aggregation.
2022-05-17 14:59:14 +03:00
Onuray Sahin
00e800459d
Write unit tests for poll response event aggregation.
2022-05-17 14:13:38 +03:00
Michael Kaye
868c33a8b4
Correct var -> val for @get:Rules
2022-05-17 12:12:49 +01:00
Michael Kaye
1f89cfbe44
Lint fixes
2022-05-16 16:55:36 +01:00
Michael Kaye
a19c1d6fbe
Make test consistent wiht assert message.
2022-05-16 16:01:21 +01:00
Michael Kaye
096cf9272a
Rather than ignore them, put tests on a retry loop.
...
I'm reliably getting passing tests locally with just these ignores.
2022-05-16 16:01:15 +01:00
Michael Kaye
8950aa38ea
Address repeated initializatin of WorkManagerImpl in #5887
2022-05-16 16:01:09 +01:00
Michael Kaye
4ced6ca179
Fix linting error.
2022-05-16 15:59:41 +01:00
Michael Kaye
fa26e2a23e
Revert "@Ignore all tests currently failing in CI"
...
This reverts commit 8d234b4b65a7a899abdeed9c5167a8c09c9af3e0.
2022-05-16 15:59:41 +01:00
Michael Kaye
70682b4931
Increase timeout. Log timeout.
2022-05-16 15:59:41 +01:00
Michael Kaye
78140af3f3
Crypto tests are failing due to slow initialSync. Increase timeout by 60s.
2022-05-16 15:59:41 +01:00
Michael Kaye
e06682dcda
@Ignore all tests currently failing in CI
2022-05-16 15:59:41 +01:00
Benoit Marty
afd2804ed3
Merge branch 'develop' into feature/mna/PSF-884-location-view
2022-05-16 14:42:38 +02:00
Onuray Sahin
4065bce47a
Write unit tests for poll start event aggregation.
2022-05-16 15:05:17 +03:00
Benoit Marty
12eb23b198
Merge branch 'develop' into feature/bma/detekt_end_period
2022-05-16 13:14:37 +02:00
Benoit Marty
dcbc85484c
Remove ambiguity
2022-05-16 13:05:26 +02:00
Benoit Marty
0ed647d379
Add missing end period.
2022-05-16 12:25:10 +02:00
Benoit Marty
26e6d56cf1
Improve doc
2022-05-16 12:23:10 +02:00
Benoit Marty
6f29a7ab94
Also update TextMatrix
2022-05-16 12:23:10 +02:00
Benoit Marty
08c67eaf0e
Remove unecessary indirection
2022-05-16 12:23:10 +02:00
Benoit Marty
3fc4083aca
Make the constructor public
2022-05-16 12:23:10 +02:00
Benoit Marty
11e1fdf332
Remove the deprecated way to create a Matrix object
2022-05-16 12:23:10 +02:00
Benoit Marty
92c0d97110
Rename API
2022-05-16 12:22:18 +02:00
Benoit Marty
7040369529
Add documentation to the class Matrix
2022-05-16 12:22:18 +02:00
ariskotsomitopoulos
2e08c07dad
Enhance decryption to prevent DUPLICATED_MESSAGE_INDEX when decrypting the same eventId
...
Improve code format
2022-05-16 13:05:38 +03:00
Benoit Marty
90035de5f2
Merge pull request #6047 from chagai95/add-presence-indicator-busy-and-away
...
add presence indicator busy and away
2022-05-16 11:26:11 +02:00
ericdecanini
83bd9bca86
Fixes lint error
2022-05-16 10:31:16 +02:00
Maxime NATUREL
4a2310954a
Removing non necessary LiveLocationAggregationProcessor interface
2022-05-16 10:11:14 +02:00
Benoit Marty
4c95aafe10
Detekt: enable and fix EndOfSentenceFormat
2022-05-16 08:54:07 +02:00
Benoit Marty
9234c60155
Merge pull request #6038 from vector-im/feature/bma/detekt
...
Detekt
2022-05-13 23:40:53 +02:00
ericdecanini
50839c206b
Adds flattenParents field to RoomSummary and corresponding mapping
2022-05-13 20:43:03 +02:00
chagai95
9f033ed623
add presence indicator busy and away
2022-05-13 13:55:10 +02:00
Onuray Sahin
47f43a88f4
Create dummy poll event for tests.
2022-05-13 14:04:33 +03:00
Onuray Sahin
85708b7c60
Fix related event id.
2022-05-13 12:59:41 +03:00
Valere
7d5570fd6f
quick format
2022-05-13 09:36:42 +02:00
Benoit Marty
03ec9946ff
Detekt: fix ConstructorParameterNaming
...
UserProperties fix is also in https://github.com/matrix-org/matrix-analytics-events/pull/62
2022-05-12 22:17:56 +02:00
Valere
8077406cba
code review
2022-05-12 18:45:35 +02:00
Valere
5a323db7dc
Unignore and improve tests
2022-05-12 18:45:35 +02:00
Valere
b25b30719a
Add test to check MSK signature on backup
2022-05-12 18:45:35 +02:00
Valere
22e0506814
Prevent 4S / megolm backup desync + sign with MSK
2022-05-12 18:45:35 +02:00
Benoit Marty
c3b5ba5639
Detekt: fix MatchingDeclarationName
2022-05-12 17:44:44 +02:00
Benoit Marty
3bc84f0d38
Detekt: fix MaxLineLength
...
@ouchadam your test fun names are too long!
2022-05-12 17:38:49 +02:00
Benoit Marty
aeb6495253
Detekt: fix RethrowCaughtException
2022-05-12 17:32:00 +02:00
Benoit Marty
21904054a5
Detekt: ignore EmptyCatchBlock
2022-05-12 17:29:10 +02:00
Benoit Marty
a09e893a0b
Detekt: fix MayBeConst
2022-05-12 17:24:15 +02:00
Benoit Marty
824f029e20
"TODO:" is forbidden by Detekt
2022-05-12 17:06:52 +02:00
Onuray Sahin
817428e295
Refactor ending polls.
2022-05-12 17:53:08 +03:00
Ahmed Radhouane Belkilani
6a523ccc38
Allow using the latest user avatar and display name for all messages in the timeline
...
Signed-off-by: Jorge Martín Espinosa <jorgem@element.io>
2022-05-12 15:43:20 +02:00
ericdecanini
52c404ac9c
Merge remote-tracking branch 'origin/develop' into feature/eric/replace-search-room-subheader
2022-05-12 14:36:04 +02:00
Onuray Sahin
704e86d843
Refactor editing polls.
2022-05-12 12:22:27 +03:00
Benoit Marty
deb0f1ad1b
Merge pull request #6000 from vector-im/dependabot/gradle/androidx.preference-preference-ktx-1.2.0
...
Bump preference-ktx from 1.1.1 to 1.2.0
2022-05-11 16:17:17 +02:00
Valere
304cb07858
Merge pull request #5559 from vector-im/feature/bca/crypto_better_key_share
...
Update/Revise SDK to implement reference flowchart for key sharing/forwarding + use backup
2022-05-11 12:05:58 +02:00
Valere
3948f263df
fix method visibility
2022-05-11 11:16:00 +02:00
Valere
992f477ab1
use clock time instead of system
2022-05-11 10:58:13 +02:00
Valere
546d6fe56d
post merge fix
2022-05-11 10:42:02 +02:00
Benoit Marty
ff386c3de6
Fix lint internal issue: remove object Params.
...
GetTurnServerTask.kt: Error: Unexpected failure during lint analysis of GetTurnServerTask.kt (this is a bug in lint or one of the libraries it depends on)
2022-05-11 10:22:07 +02:00
Travis Ralston
019ec6c1c8
Merge pull request #5997 from vector-im/travis/spec/v1.3-edit/nothreads
...
Remove spec v1.3 check for threads
2022-05-10 14:47:48 -06:00
Travis Ralston
8570a1e0ad
Fix missed test
2022-05-10 14:05:06 -06:00
Valere
12ab4787f1
Merge branch 'develop' into feature/bca/crypto_better_key_share
2022-05-10 19:30:52 +02:00
Benoit Marty
04cadb94cf
Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21
...
Bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
2022-05-10 18:23:51 +02:00
Benoit Marty
a3b6bb3ec3
Fix test compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
2022-05-10 17:46:59 +02:00
Benoit Marty
f54aa60803
Fix test compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
2022-05-10 17:00:54 +02:00
Benoit Marty
5c7ee5ef58
Fix compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
2022-05-10 16:05:46 +02:00
Travis Ralston
c63a5c0201
Remove spec v1.3 check for threads
...
Citation: https://matrix.to/#/!ewdjhNcPcEmYNKzlWp:t2l.io/$CkPuvKdFZyFL547JCy5J3MfvLaWUo_a1XEdmiop1PKc?via=matrix.org&via=element.io&via=envs.net
2022-05-09 16:36:43 -06:00
Maxime NATUREL
7aa958b9ff
Fix getting related eventId for location events
2022-05-09 16:11:36 +02:00
Maxime NATUREL
b577f6ab8e
Fix display in Bubble mode
2022-05-09 15:15:33 +02:00
Adam Brown
e97cdb03fa
updating the well known lookup to take into account certificate errors when triggered via the sign in with matrix id flow
2022-05-06 16:38:40 +01:00
ericdecanini
be0be699e4
Fixes formatting errors in ExportEncryptionTest and VectorBaseActivity
2022-05-06 10:10:25 +02:00
ericdecanini
4266c330de
Reverts change to when arrow alignment on some classes
2022-05-05 19:33:45 +02:00
ericdecanini
3fb03e2b2c
Reformats project based on editorconfig
2022-05-05 19:10:35 +02:00
Adam Brown
0683085398
fixing crash on launch
...
- due to missing primary key migration in the live location
2022-05-05 17:11:48 +01:00
Benoit Marty
2d98cbd915
Rename now to more explicit currentTimeMillis
2022-05-04 17:48:36 +02:00
Benoit Marty
09e628f227
Merge branch 'develop' into feature/bma/currentTimeMillis
2022-05-04 17:43:03 +02:00
Adam Brown
1d59f69a57
Merge pull request #5909 from vector-im/defect/adm/crash-when-processing-call-events
...
Fixes crash when accepting VOIP calls
2022-05-04 11:16:51 +01:00
Benoit Marty
dcc20bbfeb
Merge pull request #5854 from vector-im/feature/bma/small_fixies
...
Documentation update
2022-05-04 11:57:19 +02:00
Benoit Marty
5076b2cdbd
Merge pull request #5858 from vector-im/feature/bma/room_api
...
Room now exposes methods to get the various Services
2022-05-04 11:55:04 +02:00
Benoit Marty
b5a0c944d1
Merge pull request #5869 from vector-im/feature/mna/PSF-884-live-location-aggregation
...
[Live location sharing] Improve aggregation process of events
2022-05-04 11:11:39 +02:00
Benoit Marty
2ff6604555
Merge pull request #5890 from vector-im/feature/bma/another_cleanup
...
This is not necessary to map the EventId
2022-05-04 10:47:05 +02:00
Maxime NATUREL
3b022eee83
Adding return type description in doc of StateService
2022-05-03 15:20:06 +02:00
Maxime NATUREL
e5bb7ae5cd
Return the created eventId in methods to send state events
2022-05-03 15:06:04 +02:00
Benoit Marty
6a61e639e0
SDK: Replace usage of System.currentTimeMillis() by a Clock interface ( #4562 )
...
Sometimes move to UUID or Random numbers instead.
2022-05-03 15:02:34 +02:00
Benoit Marty
40e26900b0
Create a Clock SDK side ( #4562 )
2022-05-03 15:02:34 +02:00
Adam Brown
c09a93c171
fixes crash when accepting calls
...
- the event insert logic is designed to be single threaded however the scope will allow coroutine continuation which leads to unintended multiple thread access for processing and post processing
- the fix is to convert the launching to a flow which will sequentially process the launch logic on the single threaded scope
2022-05-03 12:26:13 +01:00
Maxime NATUREL
a971b19f5c
Removing location info from log
2022-05-02 15:06:13 +02:00
Benoit Marty
672023e94b
This is not necessary to map the EventId, it does not bring any new information.
2022-05-02 15:01:02 +02:00
ericdecanini
c9b32fec44
Changes ordering of room subtitles used
2022-05-02 14:42:56 +02:00
Maxime NATUREL
1720dc1fac
Removing non necessary fields when mapping from DB model
2022-05-02 14:23:24 +02:00
ericdecanini
47493fcfa1
Replaces method for getting the space parents of rooms
2022-05-02 14:11:17 +02:00
Maxime NATUREL
3201308125
Renaming other timestamps with shorter names
2022-05-02 14:05:05 +02:00
Maxime NATUREL
11ebab094b
Fixing aggregation and adding debug logs
2022-05-02 12:24:30 +02:00
Maxime NATUREL
0fc2352c07
Adding docs to describe message contents
2022-05-02 11:21:41 +02:00
Maxime NATUREL
a27569770b
Renaming timestamp fields
2022-05-02 11:10:36 +02:00
Maxime NATUREL
e82e79d7e2
Fixing code quality issues
2022-04-29 14:21:44 +02:00
Maxime NATUREL
e8556ec830
Renaming aggregated summary model
2022-04-29 14:17:35 +02:00
Maxime NATUREL
1db0e71796
Moving beacon info structure into message package
2022-04-29 14:01:01 +02:00
Maxime NATUREL
444d2c6491
Renaming message contents
2022-04-29 13:59:47 +02:00
Maxime NATUREL
3460df7ac8
Rename isLive field to isActive
2022-04-29 13:47:12 +02:00
Maxime NATUREL
f9220e4185
Adding helper method to avoid adding comment
2022-04-29 13:37:14 +02:00
Maxime NATUREL
61b1e84e61
Making eventId as primary key
2022-04-29 13:10:37 +02:00
