3f087eb632
Merge branch 'develop' into feature/fre/start_dm_on_first_msg
...
* develop: (174 commits)
Bump libphonenumber from 8.12.50 to 8.12.51
LoadRoomMember: fix presence
Cleanup
LoadRoomMembers: add changelog
LoadRoomMembers: handle room member event a bit more efficiently
LoadRoomMembers: exclude Membership.Leave
LoadRoomMembers: divide by chunk
Bump soloader from 0.10.3 to 0.10.4
Code review fix.
Try no using the gradle daemon on CI
Harmonize values of `CI_GRADLE_ARG_PROPERTIES`
removing unused dependencies and marking soloader and ignored from dependency check (as it's dynamic)
Remove non necessary prefix in logs
Adding changelog entry
Updating the unit tests
Stopping existing active live when starting a new one
Avoid multiple PR from Dependabot when Flipper is upgraded.
Change context inside the get live summary use case
Use a TestDispatcher in the FakeSession
Code review fixes.
...
2022-06-30 11:48:55 +02:00
8da88f9263
Merge pull request #6417 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.51
...
Bump libphonenumber from 8.12.50 to 8.12.51
2022-06-30 09:07:47 +02:00
5a02bca442
Bump libphonenumber from 8.12.50 to 8.12.51
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.50 to 8.12.51.
- [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.50...v8.12.51 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-06-29 23:09:57 +00:00
b446ceded8
LoadRoomMember: fix presence
2022-06-29 19:01:23 +02:00
cb400b660d
Fixes post merge error
2022-06-29 17:07:37 +02:00
9350053214
Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent
...
# 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/migration/MigrateSessionTo030.kt
2022-06-29 17:05:28 +02:00
4cf97d48c9
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/DefaultAuthenticationService.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
2022-06-29 15:53:22 +02:00
e75070be91
Use a DataSrouce instead of a Task and return a non Optional Boolean.
2022-06-29 15:35:00 +02:00
a0025bc99b
Update after PR review.
2022-06-29 15:05:26 +02:00
f5d3bcbb94
Sending a reply to a live location share
2022-06-29 15:04:57 +02:00
f278e2884a
Fix detekt issue.
2022-06-29 14:18:36 +02:00
e91be2b599
Show a loader if all the Room Member are not yet loaded.
2022-06-29 12:19:17 +02:00
e87d97083f
Merge remote-tracking branch 'origin/develop' into bugfix/eric/upgrade-room-deduplication
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
2022-06-29 12:02:34 +02:00
1a33f6e094
Merge branch 'develop' into feature/fga/load_room_members_by_chunk
2022-06-29 11:45:52 +02:00
7d349bdfc3
Cleanup
2022-06-29 11:38:15 +02:00
61c5bbc444
LoadRoomMembers: handle room member event a bit more efficiently
2022-06-29 11:35:31 +02:00
63f0cce561
LoadRoomMembers: exclude Membership.Leave
2022-06-29 11:34:43 +02:00
3a216759a1
LoadRoomMembers: divide by chunk
2022-06-29 11:32:38 +02:00
e7a68907f9
Merge pull request #6365 from vector-im/feature/mna/start-lls-from-other-device
...
[Location sharing] - Stop any active live before starting a new one (PSF-942)
2022-06-29 09:47:26 +02:00
d112f860a2
Merge pull request #6356 from vector-im/fix/mna/stop-lls-from-other-device
...
[Location sharing] - Make stop of a live from another device possible (PSF-1060)
2022-06-29 09:45:44 +02:00
324b3cc68c
Updating the unit tests
2022-06-28 14:36:38 +02:00
c2c58f81d8
Stopping existing active live when starting a new one
2022-06-28 14:36:36 +02:00
a2aa0471c5
Merge pull request #6328 from vector-im/feature/bca/verif_resist_no_age
...
Feature/bca/verif resist no age
2022-06-28 14:13:37 +02:00
86b888c336
Display specific message when verif code malformed
2022-06-28 12:17:18 +02:00
9866bfefed
Ensure clearWith lambda is deleting all the list item, else we will get an infinite loop. This specific error will help to figure out what is happening.
2022-06-28 11:56:41 +02:00
82e68472dc
code review update
2022-06-28 11:28:06 +02:00
69920a6e46
Split long line
2022-06-28 09:26:29 +02:00
af3718d202
Merge pull request #6376 from vector-im/fix/mna/geo-uri-pattern
...
[Location Share] - Adding missing prefix "u=" for uncertainty in geo URI (PSF-945)
2022-06-28 09:24:55 +02:00
a398391908
Merge pull request #6366 from vector-im/feature/ons/poll_view_state_unit_tests
...
Poll view state unit tests [PSF-1130]
2022-06-27 19:59:13 +02:00
2f8aeb991e
Merge hotfix 1.4.25 to develop
2022-06-27 18:03:22 +02:00
e0b378e2be
Delete all the chunks in one step.
2022-06-27 17:37:04 +02:00
d17152cbe2
Delete all the timelineEvents
2022-06-27 17:23:30 +02:00
5fa3b3f168
Fix pseudo code in comments
2022-06-27 17:18:28 +02:00
95969253b5
Prepare hotfix 1.4.25
2022-06-27 14:50:05 +02:00
c9a28c1cf1
Fix migration issue. We had an infinite migration, since `clearWith` wait for the list to be empty.
2022-06-27 14:50:05 +02:00
622ada7125
ensure ageLocalTs is set
2022-06-27 09:14:20 +02:00
c6ef972e3c
adding missing fullstop and removing unused import
2022-06-24 15:08:48 +01:00
7ac46a2fd1
using consistent parameter name
2022-06-24 15:08:48 +01:00
4f09160697
adding logout_devices parameter to the password change sdk api, matching reset password
2022-06-24 15:08:48 +01:00
d9fd627bb1
passing the control of logout devices to the homeserver capabilities model from the entity
2022-06-24 15:08:48 +01:00
6e3283cb34
moving homeserver feature for logout all devices to the selected homeserver state via the LoginFlowResult
2022-06-24 15:08:48 +01:00
2d44e47e6a
adding can control sign out homeserver version flag to the HomeserverCapabilities
...
- Includes DB version update and HomeserverCapability migration
2022-06-24 15:08:47 +01:00
f21e30f7c7
passing the logout devices parameters to the account/password endpoint
2022-06-24 15:05:18 +01:00
c10254dbfa
exposing if the homeserver supports signing out all devices when starting the reset process
2022-06-24 15:05:18 +01:00
81e14c7c3b
Observing live status in DB from location sharing Android service
2022-06-24 10:45:49 +02:00
3cffedd353
Changing in API to get livedata on a live of a given id
2022-06-24 10:45:49 +02:00
96da695473
Service API to listen live summaries given a list of event ids
2022-06-24 10:45:48 +02:00
a4cae9ef07
Fixing missing "u=" in geo URI pattern for uncertainty
2022-06-23 17:40:16 +02:00
9925cf9996
Merge pull request #6362 from vector-im/bugfix/adm/dispatch-to-crash
...
Fixing concurrent `dispatchTo` crash
2022-06-22 14:00:20 +01:00
0aacde9d9d
updating version for next development cycle
...
- also fixes wrong version in changes doc
2022-06-22 13:48:56 +01:00
8ada26529a
updating version for 1.4.24 hotfix
...
- is a hotfix for 1.4.22
2022-06-22 12:37:17 +01:00
23cd6dae42
fixing concurrent dispatch crash by using copy on write set
...
- whilst closing the session, we iterate through all the listeners calling onSessionStopped however some implementations also use this callback to remove themselves from the listeners, causing the concurrent modification crash
2022-06-22 12:19:06 +01:00
a525ede25d
Fix migration to 30. Seems that `isNull` with long path is not working correctly.
2022-06-22 11:50:43 +01:00
0fe4b9f07f
Test undisclosed poll state.
2022-06-22 12:57:50 +03:00
8bea64bc0c
Fix migration to 30. Seems that `isNull` with long path is not working correctly.
2022-06-22 11:56:54 +02:00
f56703abc4
updating version for hotfix release
2022-06-21 14:48:14 +01:00
0f29f7848b
Feature/fga/simplify timeline logic ( #6318 )
...
* Sync: delete all previous chunks in case of gappy sync
* Chunk: dont link chunks if we find existing timeline event (keep multiple timeline events in db)
* Timeline : remove some unused code
* Clean and add changelog
* Timeline: set named argument
* Timeline: avoid restarting the timeline when there is a CancellationException due to permalink
* Timeline: add migration to clean up old (broken) chunks
* Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo030.kt
Co-authored-by: Benoit Marty <benoitm@matrix.org>
* Timeline: try to fix test
* ignoring broken instrumentation test in order to release
Co-authored-by: ganfra <francoisg@element.io>
Co-authored-by: Benoit Marty <benoitm@matrix.org>
Co-authored-by: Adam Brown <adampsbrown@gmail.com>
2022-06-21 14:47:13 +01:00
b07e0a47e8
Feature/fga/simplify timeline logic ( #6318 )
...
* Sync: delete all previous chunks in case of gappy sync
* Chunk: dont link chunks if we find existing timeline event (keep multiple timeline events in db)
* Timeline : remove some unused code
* Clean and add changelog
* Timeline: set named argument
* Timeline: avoid restarting the timeline when there is a CancellationException due to permalink
* Timeline: add migration to clean up old (broken) chunks
* Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo030.kt
Co-authored-by: Benoit Marty <benoitm@matrix.org>
* Timeline: try to fix test
* ignoring broken instrumentation test in order to release
Co-authored-by: ganfra <francoisg@element.io>
Co-authored-by: Benoit Marty <benoitm@matrix.org>
Co-authored-by: Adam Brown <adampsbrown@gmail.com>
2022-06-21 14:42:50 +01:00
8754f230d3
removing debug log
2022-06-21 09:15:28 +01:00
a76b6e522b
splitting unit and instrumentation test tasks so that we can configure the android plugin testCoverage parameter
...
- there's a bug that causes the output to be invalid for unit tests
2022-06-21 09:15:27 +01:00
b5aedd4626
Re-implement lock screen feature using our own implementation.
2022-06-20 17:38:05 +02:00
9047d9d62c
Fixing coding style issues
2022-06-20 11:17:30 +02:00
082b39e651
Adding return type in the doc for stop API
2022-06-20 11:17:30 +02:00
e1fc6fa727
Adding tests to cover errors thrown during start/stop process
2022-06-20 11:17:30 +02:00
3e05431e6f
Fixing unit tests
2022-06-20 11:17:30 +02:00
9eba3034db
Catching crash when offline during stop of a live location share
2022-06-20 11:17:30 +02:00
e55c378683
Catching crash when offline during start of a live location share
2022-06-20 11:17:30 +02:00
b16ccf5098
Fix unit tests after rebase
2022-06-20 10:16:27 +02:00
dcca546c4b
Fixing pusherTask tests
2022-06-20 09:28:35 +02:00
d0b598463f
Adding test for stop live location share task
2022-06-20 09:28:35 +02:00
af039371e1
Adding test for start live location share task
2022-06-20 09:28:35 +02:00
8860dac759
Improving send locations tasks tests
2022-06-20 09:28:35 +02:00
8d2a914c64
Wip
2022-06-20 09:28:35 +02:00
707507202d
Renaming method to create static location event
2022-06-20 09:28:35 +02:00
879cafc8d1
Unit test for send live location task
2022-06-20 09:28:35 +02:00
1ecc42c903
Unit test for send static location task
2022-06-20 09:28:35 +02:00
f981900cf3
Unit test for start/stop live location share
2022-06-20 09:28:35 +02:00
fb7fbced39
Unit test for live location sending
2022-06-20 09:28:35 +02:00
7332c08bb4
Unit test for static location sending
2022-06-20 09:28:35 +02:00
7d4df8be09
Unit test for method to get live data of active lives
2022-06-20 09:28:35 +02:00
7b159c5b71
Send live location API
2022-06-20 09:28:35 +02:00
9b61c1aead
Send static location API
2022-06-20 09:28:35 +02:00
632064ffde
Stop live location share API
2022-06-20 09:28:33 +02:00
29f48249e2
Start live location share API
2022-06-20 09:26:51 +02:00
539d134b77
Merge pull request #6267 from vector-im/feature/mna/6155-tests-lls-aggregation
...
Adding unit tests for live location sharing aggregation code (PSF-1063)
2022-06-20 09:19:38 +02:00
398e98ae85
Remove useless variable
2022-06-18 00:49:28 +02:00
7ea2d0a86d
Delete the local rooms when the room list is shown
2022-06-18 00:49:24 +02:00
10d683ad5d
Start DM - display a local room before creating the real one
...
Add CreateLocalRoomTask interface and remove DI annotations
2022-06-18 00:48:35 +02:00
ac4b33647d
Mutualizing some similar tests with different parameters
2022-06-17 17:55:43 +02:00
2c96179383
Renaming helpers to clarify purpose
2022-06-17 17:55:43 +02:00
e3981f42e9
Introducing FakeWorkManager
2022-06-17 17:55:43 +02:00
b9b1e2b397
Adding tests on location data aggregation
2022-06-17 17:55:43 +02:00
6386c1603f
Adding tests on beacon info aggregation
2022-06-17 17:55:43 +02:00
dccc3b457d
Adding more tests on ignored cases
2022-06-17 17:55:43 +02:00
51b930147a
Adding some tests on ignored cases
2022-06-17 17:55:43 +02:00
8238cd7f57
Merge pull request #6319 from vector-im/feature/bma/stateEventQuery
...
Enforce query on state event
2022-06-16 17:13:17 +02:00
fe7515761a
Merge pull request #6300 from vector-im/feature/bma/flipper
...
Setup Flipper
2022-06-16 16:44:05 +02:00
3557121758
Fix test compilation
2022-06-16 14:13:03 +02:00
7558d71ec2
removing extra blank line
2022-06-16 12:47:40 +01:00
6a66125286
formatting
2022-06-16 11:19:14 +01:00
30f5e2bb6c
adding test around matrix user id check
2022-06-16 11:18:38 +01:00
a4dd279352
Ensure we do not use `QueryStringValue.NoCondition` or `QueryStringValue.IsNull` to query for State Event.
...
Also remove default value for those parameters.
2022-06-15 19:20:26 +02:00
0abeb3306e
Bad copy paste in comment
2022-06-15 16:14:20 +02:00
514c4234f2
Add MatrixConfiguration network interceptors after all the other, to ensure to view all the network request headers in Flipper.
2022-06-15 16:14:20 +02:00
e12103387d
Setup Flipper
...
Move getLastSession() to the SessionManager
Create `DebugService`
Move `logDbUsageInfo()` to `DebugService`
2022-06-15 16:14:20 +02:00
9766b62539
Fixes lint error
2022-06-15 16:00:00 +02:00
7f3325e8df
Fixes wrong user id in search room summary item
2022-06-15 14:47:26 +02:00
d40c2f8c78
Fixes migration error
2022-06-15 14:42:08 +02:00
d5c5c5734f
Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent
2022-06-15 14:22:24 +02:00
385720b89d
Replaces flatten parents with direct parent name in RoomSummary
2022-06-15 11:46:57 +02:00
ded7b1e0d0
updating current version
2022-06-14 15:16:56 +01:00
eba52ea54f
Bump okhttp-bom from 4.9.3 to 4.10.0
...
Bumps [okhttp-bom](https://github.com/square/okhttp ) from 4.9.3 to 4.10.0.
- [Release notes](https://github.com/square/okhttp/releases )
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md )
- [Commits](https://github.com/square/okhttp/compare/parent-4.9.3...parent-4.10.0 )
---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp-bom
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 12:24:55 +00:00
4ea4990177
Merge remote-tracking branch 'origin/develop' into develop
2022-06-13 14:12:00 +02:00
aac2df85bb
Version++
2022-06-13 14:10:48 +02:00
d876690fc7
Merge branch 'hotfix/1.4.20' into develop
2022-06-13 14:08:49 +02:00
eb49ceb803
Merge pull request #6280 from vector-im/feature/ons/live_location_sharing_report
...
Add report action for live location messages [PSF-1067]
2022-06-13 14:23:11 +03:00
4fa8e70276
Prepare hotfix 1.4.20
2022-06-13 12:37:39 +02:00
2a9ac539e4
Change after PR review
2022-06-13 12:35:39 +02:00
c384a3de8d
Fix EventInsertLiveObserver gets blocked by reverting and adding lock instead
2022-06-13 12:35:20 +02:00
75a6986770
Remove comment referencing msc2432
...
Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
2022-06-13 09:57:33 +02:00
d07557a5ee
Fix overlooked path as well
...
Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
2022-06-12 18:05:26 +02:00
0c3ea4f923
Use stable endpoint for alias management
...
This increases compatibility with homeservers and allows them to remove
Element Android specific workaround.
fixes #4830
see https://github.com/ruma/ruma/pull/936
see https://github.com/matrix-org/synapse/issues/8334
see https://github.com/matrix-org/synapse/pull/9224
Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
2022-06-12 15:05:15 +02:00
5689006c81
Bump libphonenumber from 8.12.49 to 8.12.50
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.49 to 8.12.50.
- [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.49...v8.12.50 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-06-10 13:38:47 +00:00
2d654da691
Bump realm-gradle-plugin from 10.9.0 to 10.11.0
...
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java ) from 10.9.0 to 10.11.0.
- [Release notes](https://github.com/realm/realm-java/releases )
- [Changelog](https://github.com/realm/realm-java/blob/v10.11.0/CHANGELOG.md )
- [Commits](https://github.com/realm/realm-java/compare/v10.9.0...v10.11.0 )
---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-06-10 13:25:27 +02:00
d8947f5c0b
Add report action for live location messages.
2022-06-10 14:01:43 +03:00
87053f2c70
Reformats after merging
2022-06-08 13:01:26 +02:00
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
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
a4721033c8
Merge pull request #6229 from vector-im/dependabot/gradle/org.matrix.android-olm-sdk-3.2.12
...
Bump olm-sdk from 3.2.11 to 3.2.12
2022-06-08 10:04:08 +01:00
1bad8f7741
Introduce `SessionState` to be able to check the Session state from several places.
2022-06-08 09:55:28 +02:00
de960116b3
Rename internal fun.
2022-06-08 09:55:28 +02:00
dd22cdf7f2
Rename existing SyncService to SyncAndroidService to avoid confusion
2022-06-08 09:55:28 +02:00
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
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
c290dd6c1d
Merge branch 'develop' into task/eric/when-arrow-alignment
2022-06-07 23:03:36 +02:00
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
26dcc9bc52
Merge hotfix 1.4.19 into develop
2022-06-07 15:14:29 +02:00
b2f67f971b
Prepare v1.4.19
2022-06-07 15:11:46 +02:00
a6113526d0
code review
2022-06-07 15:01:57 +02:00
2fa25f8b5e
Fix param name
2022-06-07 15:01:29 +02:00
d67f86a1e0
fix slow paged room list
2022-06-07 15:00:54 +02:00
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
c2ac07b1c9
Fix ktlint error
2022-06-06 18:56:05 +01:00
56608d564e
Retry ALL THE THINGS, and always send sonarqube
2022-06-06 17:08:02 +01:00
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
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
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
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
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
7d8590d85f
Disables when arrow alignment post merge with develop
2022-06-03 12:14:47 +02:00
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
f6b0e8d13c
Adds isUpgraded method to VersioningState
2022-06-03 12:02:50 +02:00
941d5844b5
Bump olm-sdk from 3.2.11 to 3.2.12
...
Bumps olm-sdk from 3.2.11 to 3.2.12.
---
updated-dependencies:
- dependency-name: org.matrix.android:olm-sdk
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-06-03 01:03:37 +00:00
4f8aedb038
moving and updating duplicated service function doc
2022-06-01 16:48:10 +01:00
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
10016fcb15
using correct license for matrix sdk class
2022-06-01 13:45:59 +01:00
3756b2d240
adding trailing commas to lists
2022-06-01 10:44:23 +01:00
4501c7cf45
adding test case for trailing . on the version
2022-06-01 10:44:10 +01:00
289ce7419d
supporting homeserver versions without a patch value
2022-06-01 10:41:37 +01:00
ea151b37f0
adding test cases around parsing homeserver versions
2022-06-01 10:41:37 +01:00
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
884525bef0
Merge pull request #6125 from vector-im/task/eric/code-style-parenthesis
...
Code Style - New line before and after method parentheses
2022-05-31 18:17:07 +02:00
1c73e28226
Version++
2022-05-31 17:58:09 +02:00
b1750c1c21
Adding log in worker
2022-05-31 15:56:36 +02:00
102684ed88
Fixing aggregation process
2022-05-31 15:56:23 +02:00
8af49891ff
Post merge conflict reformatting
2022-05-31 14:23:02 +02:00
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
ae94f45f34
Merge pull request #5952 from vector-im/feature/bma/sdk_user_story
...
Sdk user story
2022-05-30 18:30:56 +02:00
0806e7358a
Merge pull request #5780 from ofalvai/dependency-cleanup
...
Remove unused dependencies
2022-05-30 15:41:10 +02:00
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
c071dc502e
Create extension `String?.toActiveSpaceOrOrphanRooms()` to reduce noise.
2022-05-30 11:38:31 +02:00
ad60467ae7
Fix test compilation
2022-05-30 11:38:03 +02:00
cffdb7f7a6
Add some Kdoc
2022-05-30 11:38:03 +02:00
5fbcec0c9c
Add some Kdoc
2022-05-30 11:34:55 +02:00
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
c7997edf9a
Rename ActiveSpaceFilter to SpaceFilter
2022-05-30 11:34:55 +02:00
00809027c1
Remove `ActiveSpaceFilter.None`
...
Prefer nullability for API coherency of `RoomSummaryQueryParams`
2022-05-30 11:34:55 +02:00
289f27b738
Add some Kdoc
2022-05-30 11:34:55 +02:00
3442829e11
Remove duplicated lines of code (the same code is done a few lines later)
2022-05-30 11:34:55 +02:00
8843fe0a54
Remove `RoomCategoryFilter.ALL`
...
Prefer nullability for API coherency of `RoomSummaryQueryParams`
2022-05-30 11:34:55 +02:00
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
2b0077b138
Small rework for nicer code
2022-05-30 11:34:55 +02:00
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
49a29fb56f
Always use `roomSummaryQueryParams`, and not directly a `RoomSummaryQueryParams.Builder()`
...
Also format and add some Kdoc
2022-05-30 11:34:55 +02:00
12b3afbc50
Always use `roomSummaryQueryParams`, and not directly a `RoomSummaryQueryParams.Builder()`
...
Also format and add some Kdoc
2022-05-30 11:34:55 +02:00
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
d18e7ad001
Merge branch 'develop' of github.com:vector-im/element-android into michaelk/sonarqube_fixes
2022-05-30 10:07:43 +01:00
ead189a9c7
temporarily ignoring flaky test when ran on the CI
2022-05-30 09:37:39 +01:00
066c540eb7
Filter event id in the DB query for active lives
2022-05-30 10:06:04 +02:00
f707f177d9
Improving mapper tests
2022-05-30 10:03:27 +02:00
c6751f00ab
Bump libphonenumber from 8.12.48 to 8.12.49
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.48 to 8.12.49.
- [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.48...v8.12.49 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-05-27 23:07:12 +00:00
a5dc8ec181
Only gets flattenParents if specifically requested
2022-05-27 15:05:39 +02:00
c8b44bfd4c
fix test post rebase
2022-05-27 10:17:40 +02:00
9ce9ad6d3a
Merge remote-tracking branch 'origin/develop' into dependency-cleanup
2022-05-26 14:04:39 +02:00
5735b094ac
post rebase fix
2022-05-25 18:41:37 +02:00
e1292c03a1
code review
2022-05-25 18:40:33 +02:00
adb5b4c1b9
Fix closing deactivated accounts in tests
2022-05-25 18:40:33 +02:00
3332d827f0
rename testHelpers and make constructor private
2022-05-25 18:40:33 +02:00
29ff4d1e84
use withTestHelpers in sanity tests
2022-05-25 18:40:33 +02:00
e18402f834
Improve test stability
2022-05-25 18:40:33 +02:00
927f526c6c
Post merge conflict reformatting
2022-05-25 17:35:54 +02:00
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
d7c8abbe98
quick format
2022-05-25 16:52:56 +02:00
abb335c43d
Improve redaction test
2022-05-25 16:52:56 +02:00
136d2e330a
added change log
2022-05-25 16:52:56 +02:00
755da616ed
Fix decrypting redacted event
2022-05-25 16:52:56 +02:00
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
9f4f3f482c
Merge branch 'develop' into michaelk/sonarqube_fixes
2022-05-25 14:22:10 +01:00
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
ba109a486f
Update to build scripts to enable sonarqube reporting including coverage.
2022-05-25 13:35:40 +01:00
eda0aa97d0
Fixing code quality issues
2022-05-25 14:11:18 +02:00
33151eef73
Move the default implementation of location sharing service into internal package
2022-05-25 14:05:14 +02:00
8d2debf47e
Adding missing ending dots in comments
2022-05-25 14:05:14 +02:00
1b8440d7c8
Removing unused imports
2022-05-25 14:05:14 +02:00
095cc12e10
Fixing unit tests of the mapper
2022-05-25 14:05:14 +02:00
d9480bb136
Adding todo to add unit tests on aggregation process
2022-05-25 14:05:14 +02:00
5efe26c7dd
Fix code quality issues
2022-05-25 14:05:14 +02:00
c07bc0890f
WIP - unit tests
2022-05-25 14:05:14 +02:00
79212321a2
Deactivate all previous active beacons when receiving one from user
2022-05-25 14:05:12 +02:00
bec3f793f3
Improve query of current running live location shares
2022-05-25 14:04:22 +02:00
ca9591e423
Fix set of userId in aggregation process
2022-05-25 14:04:22 +02:00
3b06f18ccb
Remove unused imports
2022-05-25 14:04:22 +02:00
7a7af40d61
Creation of LocationSharingService to get current users sharing their live locations
2022-05-25 14:04:20 +02:00
c59c5cfb4a
Ignore all tests that have failed during testing.
2022-05-25 12:36:21 +01:00
791d4fb1e8
Improve computation of the work name to limit its length
2022-05-25 11:10:54 +02:00
8864a3cf2c
Using replace instead of keep strategy for the worker
2022-05-25 11:06:02 +02:00
cfdc18d421
Improve code readability in aggregation processor
2022-05-25 11:05:28 +02:00
b081429725
Replace getOrCreate() by get() in worker
2022-05-25 10:59:08 +02:00
c3209d7049
Manually fixes more formatting issues
2022-05-24 15:31:20 +02:00
6c21a6b48d
Separates some method parameters
2022-05-24 15:26:24 +02:00
683a9cdfff
Schedule work during aggregation
2022-05-23 17:34:52 +02:00
47eb7173f0
Creation of a worker to deactivate a live after timeout
2022-05-23 17:34:52 +02:00
d76b93ced3
Adding comment on isActive field
2022-05-23 17:34:51 +02:00
b3fdb5ed17
Changes code style when arrow alignment
2022-05-23 12:57:57 +02:00
3f3662e605
Changes code style method parameters new line around parentheses to true
2022-05-23 12:30:42 +02:00
53c83ab8d8
Add missing punctuation
2022-05-20 21:22:47 +02:00
92d54dc733
Fix compilation issue
2022-05-20 21:14:42 +02:00
b86693580e
`class` with `private constructor` instead of `object`
2022-05-20 21:14:42 +02:00
827c7e58f6
Package have been renamed, so also rename it here.
...
Dokka does not complain about unknown package in this file :/
2022-05-20 21:14:42 +02:00
8218d8f267
Typo: isStucked -> isStuck
2022-05-20 21:14:42 +02:00
8d74acf060
Fix post rebase issue
2022-05-20 21:14:42 +02:00
dc1eba2847
Improve documentation
2022-05-20 21:14:42 +02:00
d92875e3c2
Improve documentation
2022-05-20 21:14:42 +02:00
740acda60b
Please ktlint. Ok, the user story will appear at the end of the doc.
2022-05-20 21:14:42 +02:00
853c0a25bf
Method `onSecretKeyGossip` doe snot have to be in the public interface
2022-05-20 21:14:42 +02:00
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
1ab4ae9eac
Extract KeyRef to its own file
2022-05-20 21:14:42 +02:00
d3d17ebbcb
Extract HttpPusher to its own file
2022-05-20 21:14:42 +02:00
768df330b5
Rename `currentThreePid` to `getCurrentThreePid`
2022-05-20 21:14:42 +02:00
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
cfd6456614
Add other user stories (with TODO)
2022-05-20 21:14:42 +02:00
96c825e265
Create _userstories package and add the 2 first user stories
2022-05-20 21:14:42 +02:00
bad62be497
Use Kdoc format, else it's not extracted to the documentation by dokka
2022-05-20 21:14:42 +02:00
85f3592938
PR remarks
2022-05-20 17:03:15 +03:00
1bea28e27a
fix documentation format
2022-05-20 16:03:39 +03:00
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
c958d3a383
Merge branch 'develop' into feature/aris/crypto_replay_attack
2022-05-20 15:43:08 +03:00
7bc880e6bf
Improve documentation
2022-05-20 15:33:29 +03:00
2081e2c45b
Reduce log visibility to verbose
2022-05-20 13:32:55 +03:00
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
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
f5d0663b06
Remove non needed extra spaces
2022-05-20 09:48:17 +02:00
dae0b66c90
PR review
2022-05-20 09:48:05 +02:00
51fe7b9a93
Detekt: Fix OutdatedDocumentation
2022-05-20 09:48:05 +02:00
2a66e03742
Kdoc: remove unnecessary `:`
2022-05-20 09:47:54 +02:00
a4fa65b4fd
Fix linting
2022-05-19 12:37:41 +01:00
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
9adbeb8dd2
Fix import.
2022-05-19 14:04:37 +03:00
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
f036d35829
Merge branch 'develop' into dependency-cleanup
2022-05-19 12:27:09 +02:00
28c4abb505
Track number of retries of tests, and retry KeysBackupTest
2022-05-19 10:34:38 +01:00
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
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
94411ed60e
Update TimelinePreviousLastForwardTest.kt
...
Update comments in line with code changes.
2022-05-18 16:34:39 +01:00
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
7efd41e17a
Well-known lookups should not include the port of a server.
2022-05-18 15:21:12 +01:00
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
99d4bbe74b
Fix bad copyright
2022-05-18 14:12:44 +02:00
4ebd1ea138
Fix parsing of location data in non encrypted room
2022-05-18 13:58:42 +02:00
5532e7dfa1
Fix copyright
2022-05-18 14:57:50 +03:00
261dadb986
Additionally increment for TimelinePreviousLastForwardTest
2022-05-18 12:37:07 +01:00
3bf9ea5b06
Lint fixes.
2022-05-18 14:13:53 +03:00
b9adbb7d60
PR remarks
2022-05-18 14:05:58 +03:00
7ce093e239
Code review fixes.
2022-05-18 13:39:12 +03:00
123ad87eda
Notify other devices of acceptance of verification request
2022-05-18 12:31:32 +02:00
5c9281bc7e
Ensure calling 'fail()' is not caught by the Exception handler
2022-05-18 12:26:09 +02:00
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
fe27451532
Fixes lint error
2022-05-18 12:09:34 +02:00
2dcc120cf7
Merge remote-tracking branch 'origin/develop' into dependency-cleanup
...
# Conflicts:
# build.gradle
# dependencies.gradle
2022-05-18 11:47:21 +02:00
61b8053b9b
Moves LoginType to sdk api package
2022-05-18 11:23:34 +02:00
f7303789a0
Merge pull request #6025 from vector-im/michaelk/skip_tests_failing_on_ci
...
Improve test handling in CI
2022-05-18 09:51:17 +01:00
8f7789f269
Version++
2022-05-17 21:28:11 +02:00
a0a7d3e7f6
Enhance reply attack to prevent DUPLICATED_MESSAGE_INDEX while decrypting the same event
2022-05-17 16:28:30 +03:00
6a3044cb2e
Fixes post merge errors
2022-05-17 14:46:02 +02:00
edd35872f3
Fix ending poll power level condition.
2022-05-17 15:44:39 +03:00
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
4c079cc0ac
Write unit tests for poll end event aggregation.
2022-05-17 14:59:14 +03:00
00e800459d
Write unit tests for poll response event aggregation.
2022-05-17 14:13:38 +03:00
868c33a8b4
Correct var -> val for @get:Rules
2022-05-17 12:12:49 +01:00
1f89cfbe44
Lint fixes
2022-05-16 16:55:36 +01:00
Florian Renaud
Benoit Marty
dependabot[bot]
ganfra
ericdecanini
Benoit Marty
Maxime NATUREL
ganfra
Maxime NATUREL
Valere
Adam Brown
Onuray Sahin
Jorge Martín
Nicolas Werner
Michael Kaye
Olivér Falvai
ariskotsomitopoulos