ganfra
c1961d1fda
DeviceId should be non-null so we can inject it properly and OlmMachine too.
2022-06-06 14:53:56 +02:00
SpiritCroc
a1e6e50ad4
Raise sync timing log level
...
Change-Id: I6b7d98675c2a5d03510d357ea147d46d35f5a903
2022-06-05 12:46:35 +02: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
ericdecanini
f6b0e8d13c
Adds isUpgraded method to VersioningState
2022-06-03 12:02:50 +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
ganfra
14ed4692dc
Merge branch 'rust' into feature/fga/device_verification
2022-06-02 15:42:25 +02:00
ganfra
022057dd6f
Merge pull request #10 from poljar/feature/fga/backup_recovery_key
...
Feature/fga/backup recovery key
2022-06-02 15:39:10 +02:00
ganfra
eb0faa3484
Fix some E2E tests
2022-06-02 15:38:28 +02:00
ganfra
47bc597b99
OKHttp: rise maxRequestsPerHost to 64 (instead of default 5)
2022-06-02 15:38:19 +02:00
ganfra
797dc9ccbb
Crypto: fix tracking onRoomMembershipEvent
2022-06-02 15:36:06 +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
SpiritCroc
49663a1154
Merge tag 'v1.4.18' into sc
...
Change-Id: I58667aa99a8eb99b0b1e7f0784d811061c2086a5
Conflicts:
dependencies.gradle
library/attachment-viewer/build.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
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/session/room/summary/RoomSummaryDataSource.kt
vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
vector/src/main/java/im/vector/app/AppStateHandler.kt
vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
vector/src/main/java/im/vector/app/core/utils/Emoji.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.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
vector/src/main/res/xml/vector_settings_labs.xml
2022-06-01 13:54:34 +02: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
ganfra
c253f6b06f
Clean more code
2022-05-31 16:16:56 +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
ganfra
3e116ad065
Add RequestDeviceVerification method
2022-05-30 19:55:48 +02:00
ganfra
466260bc6a
Fix one test and ignore another one
2022-05-30 19:55:37 +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
SpiritCroc
0393dd51c9
Bring back downstream "Update room previews once we have decryption keys"
...
This reverts commit 130fe7f887
2022-05-30 17:39:20 +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
