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
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
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
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
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
