Benoit Marty
a525ede25d
Fix migration to 30. Seems that isNull with long path is not working correctly.
2022-06-22 11:50:43 +01:00
Onuray Sahin
0fe4b9f07f
Test undisclosed poll state.
2022-06-22 12:57:50 +03:00
Benoit Marty
8bea64bc0c
Fix migration to 30. Seems that isNull with long path is not working correctly.
2022-06-22 11:56:54 +02:00
Adam Brown
f56703abc4
updating version for hotfix release
2022-06-21 14:48:14 +01:00
ganfra
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
ganfra
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
Adam Brown
8754f230d3
removing debug log
2022-06-21 09:15:28 +01:00
Adam Brown
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
Jorge Martín
b5aedd4626
Re-implement lock screen feature using our own implementation.
2022-06-20 17:38:05 +02:00
Maxime NATUREL
9047d9d62c
Fixing coding style issues
2022-06-20 11:17:30 +02:00
Maxime NATUREL
082b39e651
Adding return type in the doc for stop API
2022-06-20 11:17:30 +02:00
Maxime NATUREL
e1fc6fa727
Adding tests to cover errors thrown during start/stop process
2022-06-20 11:17:30 +02:00
Maxime NATUREL
3e05431e6f
Fixing unit tests
2022-06-20 11:17:30 +02:00
Maxime NATUREL
9eba3034db
Catching crash when offline during stop of a live location share
2022-06-20 11:17:30 +02:00
Maxime NATUREL
e55c378683
Catching crash when offline during start of a live location share
2022-06-20 11:17:30 +02:00
Maxime NATUREL
b16ccf5098
Fix unit tests after rebase
2022-06-20 10:16:27 +02:00
Maxime NATUREL
dcca546c4b
Fixing pusherTask tests
2022-06-20 09:28:35 +02:00
Maxime NATUREL
d0b598463f
Adding test for stop live location share task
2022-06-20 09:28:35 +02:00
Maxime NATUREL
af039371e1
Adding test for start live location share task
2022-06-20 09:28:35 +02:00
Maxime NATUREL
8860dac759
Improving send locations tasks tests
2022-06-20 09:28:35 +02:00
Maxime NATUREL
8d2a914c64
Wip
2022-06-20 09:28:35 +02:00
Maxime NATUREL
707507202d
Renaming method to create static location event
2022-06-20 09:28:35 +02:00
Maxime NATUREL
879cafc8d1
Unit test for send live location task
2022-06-20 09:28:35 +02:00
Maxime NATUREL
1ecc42c903
Unit test for send static location task
2022-06-20 09:28:35 +02:00
Maxime NATUREL
f981900cf3
Unit test for start/stop live location share
2022-06-20 09:28:35 +02:00
Maxime NATUREL
fb7fbced39
Unit test for live location sending
2022-06-20 09:28:35 +02:00
Maxime NATUREL
7332c08bb4
Unit test for static location sending
2022-06-20 09:28:35 +02:00
Maxime NATUREL
7d4df8be09
Unit test for method to get live data of active lives
2022-06-20 09:28:35 +02:00
Maxime NATUREL
7b159c5b71
Send live location API
2022-06-20 09:28:35 +02:00
Maxime NATUREL
9b61c1aead
Send static location API
2022-06-20 09:28:35 +02:00
Maxime NATUREL
632064ffde
Stop live location share API
2022-06-20 09:28:33 +02:00
Maxime NATUREL
29f48249e2
Start live location share API
2022-06-20 09:26:51 +02:00
Maxime NATUREL
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
Maxime NATUREL
ac4b33647d
Mutualizing some similar tests with different parameters
2022-06-17 17:55:43 +02:00
Maxime NATUREL
2c96179383
Renaming helpers to clarify purpose
2022-06-17 17:55:43 +02:00
Maxime NATUREL
e3981f42e9
Introducing FakeWorkManager
2022-06-17 17:55:43 +02:00
Maxime NATUREL
b9b1e2b397
Adding tests on location data aggregation
2022-06-17 17:55:43 +02:00
Maxime NATUREL
6386c1603f
Adding tests on beacon info aggregation
2022-06-17 17:55:43 +02:00
Maxime NATUREL
dccc3b457d
Adding more tests on ignored cases
2022-06-17 17:55:43 +02:00
Maxime NATUREL
51b930147a
Adding some tests on ignored cases
2022-06-17 17:55:43 +02:00
Benoit Marty
8238cd7f57
Merge pull request #6319 from vector-im/feature/bma/stateEventQuery
...
Enforce query on state event
2022-06-16 17:13:17 +02:00
Benoit Marty
fe7515761a
Merge pull request #6300 from vector-im/feature/bma/flipper
...
Setup Flipper
2022-06-16 16:44:05 +02:00
Benoit Marty
3557121758
Fix test compilation
2022-06-16 14:13:03 +02:00
Adam Brown
7558d71ec2
removing extra blank line
2022-06-16 12:47:40 +01:00
Adam Brown
6a66125286
formatting
2022-06-16 11:19:14 +01:00
Adam Brown
30f5e2bb6c
adding test around matrix user id check
2022-06-16 11:18:38 +01:00
Benoit Marty
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
Benoit Marty
0abeb3306e
Bad copy paste in comment
2022-06-15 16:14:20 +02:00
Benoit Marty
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
Benoit Marty
e12103387d
Setup Flipper
...
Move getLastSession() to the SessionManager
Create `DebugService`
Move `logDbUsageInfo()` to `DebugService`
2022-06-15 16:14:20 +02:00
Adam Brown
ded7b1e0d0
updating current version
2022-06-14 15:16:56 +01:00
dependabot[bot]
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
Benoit Marty
4ea4990177
Merge remote-tracking branch 'origin/develop' into develop
2022-06-13 14:12:00 +02:00
Benoit Marty
aac2df85bb
Version++
2022-06-13 14:10:48 +02:00
Benoit Marty
d876690fc7
Merge branch 'hotfix/1.4.20' into develop
2022-06-13 14:08:49 +02:00
Onuray Sahin
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
Benoit Marty
4fa8e70276
Prepare hotfix 1.4.20
2022-06-13 12:37:39 +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
Nicolas Werner
75a6986770
Remove comment referencing msc2432
...
Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
2022-06-13 09:57:33 +02:00
Nicolas Werner
d07557a5ee
Fix overlooked path as well
...
Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
2022-06-12 18:05:26 +02:00
Nicolas Werner
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
dependabot[bot]
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
dependabot[bot]
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
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
Adam Brown
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
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
Benoit Marty
b2f67f971b
Prepare v1.4.19
2022-06-07 15:11:46 +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
dependabot[bot]
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
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
Benoit Marty
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
Benoit Marty
1c73e28226
Version++
2022-05-31 17:58:09 +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
Benoit Marty
0806e7358a
Merge pull request #5780 from ofalvai/dependency-cleanup
...
Remove unused dependencies
2022-05-30 15:41:10 +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
dependabot[bot]
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
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
Olivér Falvai
9ce9ad6d3a
Merge remote-tracking branch 'origin/develop' into dependency-cleanup
2022-05-26 14:04:39 +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
Michael Kaye
ba109a486f
Update to build scripts to enable sonarqube reporting including coverage.
2022-05-25 13:35:40 +01:00
Maxime NATUREL
eda0aa97d0
Fixing code quality issues
2022-05-25 14:11:18 +02:00
