Benoit Marty
9122d96fc6
Merge remote-tracking branch 'origin/develop' into develop
2022-10-19 17:17:33 +02:00
Benoit Marty
36eb538a93
Version++
2022-10-19 17:17:21 +02:00
Johannes Marbach
451f5f824a
Merge pull request #7369 from vector-im/feature/hughns/qr_code_login
...
Implement logic for sign in with QR
2022-10-19 17:10:19 +02:00
Hugh Nimmo-Smith
4f652f1026
Request changes from review
2022-10-19 09:12:09 +01:00
Benoit Marty
f5fe5cce62
Merge pull request #7372 from vector-im/feature/bma/fix_getUser_null
...
Handle properly when getUser returns null - prefer using getUserOrDefault
2022-10-19 08:40:44 +02:00
Florian Renaud
fbf242756e
Allow additional content when sending an event
2022-10-18 21:08:08 +02:00
ericdecanini
ed9ecb7fc9
Merge remote-tracking branch 'origin/develop' into feature/eric/msc3773
2022-10-18 11:03:41 -04:00
Hugh Nimmo-Smith
67be8c3c40
The one that got away
2022-10-18 12:44:05 +01:00
Florian Renaud
16c27ba174
Voice Broadcast - Get voice messages events related to a given VB
2022-10-18 13:41:05 +02:00
Florian Renaud
5f35926ce6
Voice Broadcast - Hide related voice message events
2022-10-18 13:41:04 +02:00
Florian Renaud
ce14270fab
Introduce MessageAudioEvent
2022-10-18 13:41:04 +02:00
Hugh Nimmo-Smith
f7e0a19833
Remove redundant annotations
2022-10-18 12:29:48 +01:00
Hugh Nimmo-Smith
811d6d87ae
Reuse getDecimalCodeRepresentation from SAS instead of duplicating code
2022-10-18 12:23:21 +01:00
Hugh Nimmo-Smith
a83fb8bf83
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
...
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-18 12:09:17 +01:00
Hugh Nimmo-Smith
8530f8f280
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
...
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-18 12:09:06 +01:00
Hugh Nimmo-Smith
0d1df3f66e
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
...
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-18 12:08:09 +01:00
NIkita Fedrunov
6f5fefba56
lint
2022-10-18 10:44:20 +02:00
Hugh Nimmo-Smith
376cd1cb36
Missing throws
2022-10-18 09:34:28 +01:00
Hugh Nimmo-Smith
57a8dd4a1f
Whitespce
2022-10-18 09:31:13 +01:00
Hugh Nimmo-Smith
a1d2944c32
Always check master key when provided by verifying device
2022-10-18 09:08:40 +01:00
Hugh Nimmo-Smith
f297117df2
Use mutex
2022-10-18 08:48:28 +01:00
Hugh Nimmo-Smith
8a62dfb34a
Lint
2022-10-18 00:35:43 +01:00
Florian Renaud
fb9c747a20
Reformat and add trailing commas
2022-10-17 22:33:43 +02:00
Florian Renaud
33a021c8ed
Add sdk entry to attach reference to the outgoing events
2022-10-17 22:33:42 +02:00
Florian Renaud
dbc61971df
Reduce duplicated code
2022-10-17 22:33:42 +02:00
Hugh Nimmo-Smith
6d17d51fe9
remove nullability
2022-10-17 17:36:35 +01:00
Hugh Nimmo-Smith
8f4d998362
Lint
2022-10-17 17:33:43 +01:00
Hugh Nimmo-Smith
d3e61a23a9
Fix generator
2022-10-17 17:29:45 +01:00
NIkita Fedrunov
eec99e65bd
thread read receipts and unread notifications support is added to homeserver capatibilities
2022-10-17 18:09:45 +02:00
Hugh Nimmo-Smith
c3669318c1
Merge branch 'feature/hughns/qr_code_login' of https://github.com/vector-im/element-android into feature/hughns/qr_code_login
2022-10-17 16:37:35 +01:00
Hugh Nimmo-Smith
1863e4c3ef
Use unstable prefixes
2022-10-17 16:34:51 +01:00
Onuray Sahin
b2dc0b33b5
Implement try again button action.
2022-10-17 18:32:35 +03:00
Hugh Nimmo-Smith
3d37e0b2a5
Fix enum JsonClass generateAdapter = false
2022-10-17 16:19:03 +01:00
Hugh Nimmo-Smith
623277e31f
Lint
2022-10-17 16:13:49 +01:00
Hugh Nimmo-Smith
e877feed6e
Add @JsonClass to all enums
2022-10-17 16:06:08 +01:00
Hugh Nimmo-Smith
29065b819f
Remove unused class
2022-10-17 16:03:47 +01:00
Hugh Nimmo-Smith
e01ee619d3
Refactor error handling and report E2EE errors
2022-10-17 16:02:25 +01:00
Onuray Sahin
47c87141b2
Merge pull request #7338 from vector-im/feature/ons/qr_code_login_ui
...
QR Code Login UI
2022-10-17 17:20:07 +03:00
Benoit Marty
997341b962
Merge pull request #7282 from vector-im/feature/bma/remove_original_event
...
Stop using `original_event` field
2022-10-17 14:43:22 +02:00
Hugh Nimmo-Smith
d616251f26
Fix merge
2022-10-17 13:41:27 +01:00
Hugh Nimmo-Smith
e89774e160
Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login
2022-10-17 13:26:35 +01:00
Hugh Nimmo-Smith
eb30ef166a
Improve 404 handling
2022-10-17 12:32:40 +01:00
Hugh Nimmo-Smith
1976451c81
Lint
2022-10-17 12:23:14 +01:00
Onuray Sahin
91bb86d3c6
Code review fixes.
2022-10-17 14:16:29 +03:00
Hugh Nimmo-Smith
fb86ab70a2
Comments and error mapping
2022-10-17 12:05:32 +01:00
Hugh Nimmo-Smith
4306c57236
Thread safe use of OlmSAS
2022-10-17 12:01:12 +01:00
Hugh Nimmo-Smith
506fa729ea
Cleanup
2022-10-17 11:50:56 +01:00
Hugh Nimmo-Smith
48de8f4e34
Fix bad merge
2022-10-17 11:48:35 +01:00
Hugh Nimmo-Smith
33be5c257d
Refactor into dedicated files and companion objects
2022-10-17 11:24:48 +01:00
Hugh Nimmo-Smith
ed6bc01bef
Resolve TODO
2022-10-17 10:54:28 +01:00
Hugh Nimmo-Smith
d979b50b2c
Logging cleanup
2022-10-17 10:52:24 +01:00
Benoit Marty
b7570a3c5e
Fix compilation error
2022-10-17 11:31:48 +02:00
Benoit Marty
0cdc21649e
Fix unused import
2022-10-17 11:27:40 +02:00
dependabot[bot]
93a346392b
Bump gradle from 7.2.2 to 7.3.1 ( #7364 )
...
* Bump gradle from 7.2.2 to 7.3.1
Bumps gradle from 7.2.2 to 7.3.1.
---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Try to fix build issue caused by KSP workaround
* Add missing dependency
* Suppress false positive in linter
* Suppress more false positives, fix 2 possible leaks
* Fix tests
* Ignore flaky test
* Use namespaces instead of packagenames in AndroidManifest files
* Reorder dependency groups
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
2022-10-17 09:14:28 +02:00
SpiritCroc
6a626ea3be
Old layout: Sort order setting to show unreads on top
...
Setting is in options menu.
Different setting for home than for spaces, to allow e.g. having unreads on
top only for home.
Change-Id: Ib390a5601ab78ba8372a4c3161311a52d1016b48
2022-10-15 10:12:12 +02:00
Hugh Nimmo-Smith
fdc55965ca
Linting
2022-10-14 17:23:26 +01:00
Hugh Nimmo-Smith
dc9b41d19a
Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login
2022-10-14 17:12:08 +01:00
Jorge Martin Espinosa
f1acb4712c
Fix editing formatted messages in plain text editor ( #7360 )
...
* Fix editing formatted messages in plain text editor
* Update changelog.d/7359.sdk
Co-authored-by: Benoit Marty <benoitm@matrix.org>
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-14 15:15:12 +00:00
Onuray Sahin
6c10a9bf2d
Code review fixes.
2022-10-14 18:10:18 +03:00
Hugh Nimmo-Smith
6426ff40d3
Linting
2022-10-14 14:18:50 +01:00
Hugh Nimmo-Smith
411b766890
Refactor to camelcase
2022-10-14 14:17:19 +01:00
Hugh Nimmo-Smith
4325600d27
Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login
2022-10-14 13:57:04 +01:00
Hugh Nimmo-Smith
e439b72e48
Handle master key trust during E2EE set up
2022-10-14 13:46:57 +01:00
Onuray Sahin
5953346b3d
Merge branch 'develop' into feature/ons/qr_code_login_ui
...
# Conflicts:
# library/ui-strings/src/main/res/values/strings.xml
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
# 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/database/migration/MigrateSessionTo038.kt
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
# vector/src/main/java/im/vector/app/features/VectorFeatures.kt
2022-10-14 15:17:55 +03:00
Benoit Marty
032fa37b64
Create UserDataSource.getUserOrDefault().
2022-10-14 12:13:21 +02:00
Benoit Marty
5a2d74443d
Let GetProfileInfoTask store result into DB, except when we want to do bulk insertion.
2022-10-14 12:07:52 +02:00
Hugh Nimmo-Smith
c00ce91214
Linting
2022-10-14 01:11:25 +01:00
Hugh Nimmo-Smith
c18439f99b
Refactor code into api from internal
2022-10-14 01:07:19 +01:00
Hugh Nimmo-Smith
5abb786b6b
Fix copyright on SDK
2022-10-14 00:59:31 +01:00
Hugh Nimmo-Smith
370652c04b
Revert "Revert "Implementations of MSC3886 and MSC3903""
...
This reverts commit 489dfd7354
.
2022-10-13 22:37:19 +01:00
Hugh Nimmo-Smith
6399032312
Fix bad merge
2022-10-13 22:23:26 +01:00
Hugh Nimmo-Smith
7bc0bd3b57
Reduce logging
2022-10-13 22:15:07 +01:00
Hugh Nimmo-Smith
dd47297dfd
QR login + E2EE set up
2022-10-13 22:14:55 +01:00
Hugh Nimmo-Smith
bc0843eddf
Another default value fix
2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith
ac80ae5632
Set default value for optional params
2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith
ca7a6efade
Add missing binding
2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith
e2f3dde5c1
Use correct var name
2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith
1e60f3c25b
Make initialDeviceName optional
2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith
d0898a2b89
Linting
2022-10-13 22:13:30 +01:00
Hugh Nimmo-Smith
88238c0f04
Support for login by m.login.token during QR code sign in
2022-10-13 22:13:03 +01:00
Hugh Nimmo-Smith
489dfd7354
Revert "Implementations of MSC3886 and MSC3903"
...
This reverts commit 1235db7895
.
2022-10-13 21:48:27 +01:00
Hugh Nimmo-Smith
e554b43bc6
Merge branch 'feature/ons/qr_code_login_ui' of https://github.com/vector-im/element-android into feature/ons/qr_code_login_ui
2022-10-13 21:27:09 +01:00
Onuray Sahin
fb2776dca4
Cherry pick previous commits.
2022-10-13 20:33:52 +03:00
Hugh Nimmo-Smith
81f2197199
Another default value fix
2022-10-13 16:11:41 +01:00
Hugh Nimmo-Smith
c6e7185f8b
Set default value for optional params
2022-10-13 16:08:50 +01:00
Hugh Nimmo-Smith
8c86b3d297
Add missing binding
2022-10-13 16:02:57 +01:00
Hugh Nimmo-Smith
b5b32b7fda
Use correct var name
2022-10-13 15:58:19 +01:00
Hugh Nimmo-Smith
5bff9ceec4
Make initialDeviceName optional
2022-10-13 15:35:45 +01:00
Hugh Nimmo-Smith
09da74b029
Linting
2022-10-13 15:19:39 +01:00
Hugh Nimmo-Smith
8645f74c77
Support for login by m.login.token during QR code sign in
2022-10-13 15:11:15 +01:00
Benoit Marty
92a2420952
Merge pull request #7293 from vector-im/feature/bma/android13
...
Android 13
2022-10-13 13:52:52 +02:00
Eric Decanini
963c0e5a50
Local Notification Settings Event ( #7300 )
...
* Adds push notifications switch
* Adds functionality to Push notification toggle
* Adds DefaultPushersServiceTest for togglePusher
* Adds DefaultTogglePusherTaskTest
* Adds SessionOverviewViewModelTest for toggling pusher
* Hides pusher toggle if there are no pushers of the device
* Adds changelog file
* Edits changelog file
* Fixes copyrights
* Unregisters checkedChangelistener in onDetachedFromWindow for switch view
* Links notification settings toggle to pusher service
* Adds changelog file
* Adds error handling to VectorSettingsNotificationPreferenceFragment
* Removes comment in FakePushersService
* Adds parsing for LocalNotificationSettings event
* Adds changelog file
* Fixes post merge errors
* Fixes imports and improves string name
* Fixes legal copies
* Fixes kdoc punctuation
* Fixes string error
* Removes unused imports
* Moves LocalNotificationSettingsContent
* Fixes lint errors
* Fixes test errors
* Fixes test errors
* Fixes error
* Fixes error
* Fixes error
* Fixes error
* Fixes error
* Fixes error
* Fixes error
* Adds lost tests
* Adds PusherEntity migration
* Fixes session overview layout overlap
* Fixes switch being enabled by default
* Adds device id and unstable prefix
2022-10-12 23:11:27 -04:00
Benoit Marty
beb334babe
Merge pull request #7335 from vector-im/feature/bma/upgrade_arrow
...
Remove Arrow-kt dependency
2022-10-12 16:26:02 +02:00
Maxime NATUREL
6626732b3b
Merge pull request #7276 from vector-im/feature/mna/device-manager-account-data
...
[Device Management] Save matrix_client_information events on login/registration (PSG-769, PSG-771)
2022-10-12 15:41:40 +02:00
Eric Decanini
9857fa6ca4
Makes "Enable Notifications for this session" respond to enabled value in pusher ( #7281 )
...
* Adds push notifications switch
* Adds functionality to Push notification toggle
* Adds DefaultPushersServiceTest for togglePusher
* Adds DefaultTogglePusherTaskTest
* Adds SessionOverviewViewModelTest for toggling pusher
* Hides pusher toggle if there are no pushers of the device
* Adds changelog file
* Edits changelog file
* Fixes copyrights
* Unregisters checkedChangelistener in onDetachedFromWindow for switch view
* Links notification settings toggle to pusher service
* Adds changelog file
* Adds error handling to VectorSettingsNotificationPreferenceFragment
* Removes comment in FakePushersService
* Fixes post merge errors
* Fixes imports and improves string name
* Fixes legal copies
* Fixes kdoc punctuation
* Fixes string error
* Removes unused imports
* Fixes lint errors
* Fixes test errors
* Fixes test errors
* Fixes error
* Fixes error
* Fixes error
* Fixes error
* Fixes error
* Adds lost tests
* Adds PusherEntity migration
* Fixes session overview layout overlap
* Fixes switch being enabled by default
* Binds entire view to toggle switch
2022-10-12 09:27:55 -04:00
Onuray Sahin
1e1affbb7b
Merge branch 'develop' into feature/ons/qr_code_login_ui
...
# Conflicts:
# library/ui-strings/src/main/res/values/strings.xml
# library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
# vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
# vector/src/main/java/im/vector/app/features/VectorFeatures.kt
# vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
# vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
# vector/src/main/res/layout/fragment_other_sessions.xml
# vector/src/main/res/layout/fragment_settings_devices.xml
2022-10-12 14:32:09 +03:00
Benoit Marty
1669316682
Remove dependency to arrow. Please use org.matrix.android.sdk.api.util.Optional
instead.
2022-10-12 10:20:52 +02:00
Hugh Nimmo-Smith
1235db7895
Implementations of MSC3886 and MSC3903
2022-10-11 23:33:30 +01:00
Jorge Martin Espinosa
def67b2e7d
Integrate WYSIWYG editor ( #7288 )
...
* Add WYSIWYG lib dependency
* Replace EditText with RichTextEditor
* Add bold button, fix sending formatting messages issues
* Add missing inline formatting buttons, make scrollview horizontal
* Disable autocomplete for rich text editor
* Add formatted text to messages sent, replies, quotes and edited messages.
* Several fixes
* Add changelog
* Try to fix lint issues
* Address review comments.
* Exclude Epoxy KSP generated files from ktlint checks
2022-10-11 17:05:47 +02:00
Maxime NATUREL
5649933b03
Removing some TODOs
2022-10-11 14:03:12 +02:00
Maxime NATUREL
9877e90df6
Adding use cases to get and set the extra matrix client Info
2022-10-11 14:01:43 +02:00
Eric Decanini
2fe636e93b
Adds Push Notification toggle to Device Manager ( #7261 )
...
* Adds push notifications switch
* Adds functionality to Push notification toggle
* Adds DefaultPushersServiceTest for togglePusher
* Adds DefaultTogglePusherTaskTest
* Adds SessionOverviewViewModelTest for toggling pusher
* Hides pusher toggle if there are no pushers of the device
* Adds changelog file
* Edits changelog file
* Fixes copyrights
* Unregisters checkedChangelistener in onDetachedFromWindow for switch view
* Fixes post merge errors
* Fixes legal copies
* Removes unused imports
* Fixes lint errors
* Fixes test errors
* Fixes error
* Fixes error
* Fixes error
* Fixes error
* Fixes error
2022-10-10 19:21:34 -04:00
ericdecanini
4af2e62150
Merge branch 'develop' into feature/eric/msc3881
2022-10-09 12:45:19 -04:00
ericdecanini
cd2e693f0c
Fixes legal copy
2022-10-09 09:48:36 -04:00
ericdecanini
11e251fc1d
Fixes legal copy
2022-10-09 09:48:18 -04:00
ericdecanini
d191bfeaf7
Fixes legal copy
2022-10-09 09:46:07 -04:00
SpiritCroc
fe785613e7
Merge tag 'v1.5.2' into sc
...
Change-Id: I0fe8262be9f2e5852815ad5f93329ffa17970b0e
Conflicts:
vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
vector/src/main/res/layout/composer_layout.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
2022-10-07 20:32:26 +02:00
SpiritCroc
c634bb74e5
Merge tag 'v1.5.1' into sc
...
Note: we already had picked the internal v1.5.1 patch for the security
release, but we still do this merge to make git merge happy again for
future merges, and also clean up a little bit of UI things that I did
for that patch but abandonned later.
Change-Id: I51b674093e6f32e19fc9556109fb0d231d8f8f3e
2022-10-07 19:45:09 +02:00
ericdecanini
a2382c6a01
Adds thread notification fields to RoomSummary
2022-10-07 11:47:18 -04:00
ericdecanini
c2ae75d9bd
Changes thread notifications saved to entity from sum to size
2022-10-07 11:45:58 -04:00
ericdecanini
ebd8461724
Adds thread notifications and highlights to RoomSummaryEntity
2022-10-07 11:42:18 -04:00
ericdecanini
00bfbe9bc6
Adds API parsing of unread threads notifications
2022-10-07 11:16:41 -04:00
Benoit Marty
e9e2e5011b
Fix test compilation.
2022-10-07 10:08:33 +02:00
Florian Renaud
4091d27311
Add "io.element.voice_broadcast_info" state event
2022-10-06 16:23:40 +02:00
Benoit Marty
15616ecc7c
Fix compilation issue after rebase
2022-10-05 17:35:05 +02:00
Benoit Marty
f2bbdc3906
API 33: fix compilation warnings
2022-10-05 17:35:05 +02:00
Benoit Marty
80c210e62d
Merge pull request #7292 from vector-im/feature/mna/device-manager-type-icons
...
[Device Management] Show correct device type icons (PSG-775)
2022-10-05 17:30:42 +02:00
Benoit Marty
38ca3b6cdb
Version++
2022-10-05 17:20:05 +02:00
Valere
502b12a07e
Merge pull request #7290 from vector-im/feature/bca/hinder_verification
...
E2ee dos not hinder verification
2022-10-05 14:34:34 +02:00
Valere
fddeddacc7
fix outdated doc
2022-10-05 10:42:29 +02:00
Valere
37458d41f2
E2ee dos not hinder verification
2022-10-05 10:42:29 +02:00
Valere
68d4ac34c7
Move setting to room profile
2022-10-05 10:27:12 +02:00
Valere
f7d8356327
post rebase fix & cleaning
2022-10-05 10:27:12 +02:00
Valere
92a72cb1e9
cleaning
2022-10-05 10:27:12 +02:00
Valere
e9b33f6234
Per room block unverified devices
2022-10-05 10:27:12 +02:00
Maxime NATUREL
f02b689ce0
Adding unit tests for mapper
2022-10-05 10:14:05 +02:00
Maxime NATUREL
b23520ea40
Adding new field for last seen user agent in DB with migration
2022-10-05 10:14:04 +02:00
ericdecanini
034046701d
Merge remote-tracking branch 'origin/develop' into feature/eric/msc3881
...
# Conflicts:
# vector/src/test/java/im/vector/app/test/fakes/FakeCryptoService.kt
2022-10-04 14:05:23 -04:00
Benoit Marty
fdcc7506de
Homeservers will not return RelationsResponse.original_event
in the future.
2022-10-04 09:28:44 +02:00
Valere
005e712396
Merge pull request #6703 from vector-im/feature/bca/crosssigning_reset_warning
...
warn on cross signing reset
2022-10-03 09:25:52 +02:00
Onuray Sahin
d0dd446af8
Merge pull request #7247 from vector-im/feature/ons/parse_user_agent
...
[Device Manager] Parse user agents (PSG-762)
2022-09-30 18:36:33 +03:00
Valere
b4f7e1381d
fix test post rebase
2022-09-30 16:00:34 +02:00
Valere
59afe434f8
more tests
2022-09-30 16:00:34 +02:00
Valere
ac0e5e9dec
fix broken test, userId confustion
...
cleaning
cleaning
add tests
cleaning
2022-09-30 16:00:34 +02:00
Valere
c8f0792997
warn on cross signing reset
2022-09-30 16:00:34 +02:00
Onuray Sahin
1238f31cdf
Merge pull request #7209 from vector-im/feature/ons/extend_user_agent
...
[Device Manager] Extend user agent to include device information (PSG-755)
2022-09-29 13:11:20 +03:00
Onuray Sahin
0f0ec54ed1
Code review fixes.
2022-09-29 12:20:01 +03:00
Valere
8132a7902b
post merge code quality
2022-09-29 09:21:06 +02:00
Valere
ce86e29122
Merge branch 'main' into develop
2022-09-28 18:16:39 +02:00
Onuray Sahin
5666383134
Add unit test for desktop and web user agents.
2022-09-28 18:19:25 +03:00
Valere
aa42746034
version 1.5.1
2022-09-28 16:28:43 +02:00
Valere
5c442296ef
Security fix CVE-2022-39246 CVE-2022-39248
2022-09-28 16:26:47 +02:00
SpiritCroc
87eaf85224
Security patch v1.5.1
...
Conflicts:
library/ui-styles/src/main/res/values/colors.xml
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
Change-Id: I0c8f5e098f92d0bf42e5ddc41bb6ad43c69bfdd2
2022-09-28 10:41:00 +02:00
Adam Brown
fad02062d8
Instrumentation test coroutines ( #7207 )
...
Converting SDK instrumentation tests from CountdownLatch to suspending functions
2022-09-27 13:37:23 +01:00
Onuray Sahin
c70b6206d0
Add user agent into device info.
2022-09-26 14:39:23 +03:00
ericdecanini
1f28a2acae
Adds PushersMapperTest
2022-09-25 10:45:59 -04:00
SpiritCroc
bb6595110b
Merge tag 'v1.5.0' into merge-v1.5.0
...
Change-Id: Ifaa56941340ac1774d8b7bd470e32c5203d15f69
Conflicts:
library/ui-styles/src/main/res/values/colors.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt
vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
vector/build.gradle
vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt
vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteEmojiDataItem.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/RoomListViewState.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/res/menu/menu_new_home.xml
vector/src/main/res/xml/vector_settings_labs.xml
2022-09-23 16:28:00 +02:00
ericdecanini
65c89638ab
Fixes lint error with comments
2022-09-23 09:24:20 -04:00
Onuray Sahin
33eeb721bf
Merge branch 'develop' into feature/ons/extend_user_agent
2022-09-23 16:17:06 +03:00
Onuray Sahin
42983f5ce4
Write unit test for computing user agent user case.
2022-09-23 15:55:02 +03:00
Onuray Sahin
c7108f3ac3
Create use case to compute user agent.
2022-09-23 13:05:16 +03:00
ericdecanini
8c7901177e
Adds comments to new fields in HttpPusher
2022-09-22 20:44:46 -04:00
ericdecanini
75935c824b
Implements MSC3881 (enabled and device_id fields for Pusher API)
2022-09-22 20:35:04 -04:00
Benoit Marty
60bfd0dd42
Merge pull request #7159 from vector-im/feature/bma/fix_new_lint_warning
...
Fix lint warning
2022-09-22 17:35:10 +02:00
Adam Brown
65156a8ece
Merge pull request #7198 from vector-im/feature/adm/configurable-sync-timeout
...
Allow configurable sync timeout
2022-09-22 15:40:58 +01:00
Benoit Marty
7f5c712e88
No need to use @SuppressLint("NewApi")
when @ChecksSdkIntAtLeast
is used - more cleanup
2022-09-22 16:34:07 +02:00
Benoit Marty
658a09ea6a
No need to use @SuppressLint("NewApi")
when @ChecksSdkIntAtLeast
is used.
2022-09-22 16:32:14 +02:00
Benoit Marty
bb2eb56ee6
Add @ChecksSdkIntAtLeast
annotation.
2022-09-22 16:32:14 +02:00
Benoit Marty
151f6245db
Merge pull request #6929 from vector-im/feature/bma/android12
...
Target API 32 (Android 12)
2022-09-22 16:30:04 +02:00
Onuray Sahin
c37a6842fe
Update format to be consistent with Element iOS.
2022-09-22 15:53:29 +03:00
Onuray Sahin
ea78f504d7
Small refactoring.
2022-09-22 15:28:26 +03:00
Onuray Sahin
b2e7cc2208
Extend user agent by adding device manufacturer and model to the beginning.
2022-09-22 15:18:20 +03:00
ganfra
fabfe36ede
Update versions to 1.5.2
2022-09-22 10:31:31 +02:00
Adam Brown
600588dbbb
adding trailing commas
2022-09-21 16:37:31 +01:00
Adam Brown
9ab78c93e2
reducing sync timeout for instrumentation tests to speed them up
2022-09-21 15:39:13 +01:00
Adam Brown
7f31098ba1
lifting the sync timeout to the matrix configuration
2022-09-21 15:39:09 +01:00
Benoit Marty
b9c28ba4ce
Merge branch 'develop' into feature/bma/android12
2022-09-21 16:24:30 +02:00
Florian Renaud
8624199be3
Merge pull request #7154 from vector-im/bugfix/fre/start_dm_app_layout
...
Deferred DMs - Handle the local rooms within the new AppLayout
2022-09-20 10:53:51 +02:00
Florian Renaud
5e504942ca
Delete the local read receipts when deleting the local rooms
2022-09-19 15:58:14 +02:00
Florian Renaud
648498e2de
Move local room check from UpdateBreadcrumbsTask to RoomService
2022-09-19 15:58:14 +02:00
Florian Renaud
3c68222fd7
Do not save local room into recent rooms
2022-09-19 15:58:14 +02:00
Florian Renaud
eac74bda09
Improve nullability check in CreateRoomFromLocalRoomTask
2022-09-19 09:38:05 +02:00
Florian Renaud
3f88811590
remove unused import
2022-09-19 09:38:05 +02:00
Florian Renaud
e2f0e14133
Start DM - Add loading wheel while creating the room
2022-09-19 09:38:05 +02:00
Florian Renaud
824a4bcae5
Add comment to explain the replacementRoom behaviour
2022-09-19 09:38:05 +02:00
Florian Renaud
e76793781d
Use LocalRoomSummaryEntity.where extension
2022-09-19 09:38:05 +02:00
SpiritCroc
7d4c489816
Disable timeline cleanup mechanisms that are no longer necessary
...
Element's new timeline alg should keep is free from timeline loops and
empty chunks.
Thus, removing these checks should give us back a little bit of faster
room loading.
Change-Id: I7c6bc314b98410dd47af44e958422860f26771ce
2022-09-17 17:24:19 +02:00
Benoit Marty
cde7096928
Restore this annotation
2022-09-16 23:00:39 +02:00
Benoit Marty
536b9cf926
Move @Suppress("DEPRECATION")
closer to the deprecated usage. Will help to detect other deprecated API usage.
2022-09-16 23:00:39 +02:00
Benoit Marty
3f3c83a43d
Remove deprecated internal class.
2022-09-16 23:00:39 +02:00
Benoit Marty
73e061e472
Merge pull request #7130 from vector-im/feature/bma/fix_verification
...
Fix empty verification bottom sheet
2022-09-16 19:00:39 +02:00
Benoit Marty
3ddaf0c51f
Ensure MatrixItem.UserItem
is not null at other places
2022-09-15 11:29:38 +02:00
Florian Renaud
3b1599763c
Start DM - Fix glitch by not showing the local rooms in the room list
2022-09-14 16:41:09 +02:00
Benoit Marty
ec0770434d
Merge pull request #7035 from vector-im/feature/bma/space_response_model
...
Space response model
2022-09-12 17:24:10 +02:00
SpiritCroc
083bc6df0e
Better fallback for inline images without alt description text
...
Use same text as for plain images sent
Change-Id: I675558618332f4a0053db5b3f40195b046b5682c
2022-09-11 11:06:45 +02:00
SpiritCroc
387d2e12bb
Inline images: Use alt text in room previews and notifications
...
Change-Id: I6649794d31582c3f5e6ab3e151a866663d4645ee
2022-09-11 09:41:52 +02:00
SpiritCroc
bc1f3cb24d
Merge tag 'v1.4.36' into merge-v1.4.36
...
Change-Id: I6fa1182a07b7b8ad507124fad3a8971ac38f2ac5
Conflicts:
library/ui-strings/src/main/res/values-bg/strings_sc.xml
library/ui-strings/src/main/res/values-cs/strings_sc.xml
library/ui-strings/src/main/res/values-de/strings_sc.xml
library/ui-strings/src/main/res/values-de/strings_sc_donottranslate.xml
library/ui-strings/src/main/res/values-es/strings_sc.xml
library/ui-strings/src/main/res/values-et/strings_sc.xml
library/ui-strings/src/main/res/values-eu/strings_sc.xml
library/ui-strings/src/main/res/values-fa/strings_sc.xml
library/ui-strings/src/main/res/values-fr/strings_sc.xml
library/ui-strings/src/main/res/values-hu/strings_sc.xml
library/ui-strings/src/main/res/values-it/strings_sc.xml
library/ui-strings/src/main/res/values-nb-rNO/strings_sc.xml
library/ui-strings/src/main/res/values-nl/strings_sc.xml
library/ui-strings/src/main/res/values-pl/strings_sc.xml
library/ui-strings/src/main/res/values-pt-rBR/strings_sc.xml
library/ui-strings/src/main/res/values-ro/strings_sc.xml
library/ui-strings/src/main/res/values-ru/strings_sc.xml
library/ui-strings/src/main/res/values-sk/strings_sc.xml
library/ui-strings/src/main/res/values-sv/strings_sc.xml
library/ui-strings/src/main/res/values-tr/strings_sc.xml
library/ui-strings/src/main/res/values-vi/strings_sc.xml
library/ui-strings/src/main/res/values-zh-rCN/strings_sc.xml
library/ui-strings/src/main/res/values-zh-rTW/strings_sc.xml
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/RoomSummaryUpdater.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml
vector-app/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png
vector-app/src/main/res/mipmap-hdpi/ic_launcher_sc.png
vector-app/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png
vector-app/src/main/res/mipmap-mdpi/ic_launcher_sc.png
vector-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png
vector-app/src/main/res/mipmap-xhdpi/ic_launcher_sc.png
vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png
vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png
vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png
vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png
vector/build.gradle
vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.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/TimelineViewModel.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/list/RoomCategoryItem.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/RoomSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
vector/src/main/res/xml/vector_settings_labs.xml
vector/src/main/res/xml/vector_settings_preferences.xml
2022-09-10 15:24:40 +02:00
Benoit Marty
e37344a059
Version++
2022-09-10 08:15:31 +02:00
Maxime NATUREL
669beb1156
Fix missing mapper in CryptoStoreHelper for tests
2022-09-07 10:27:19 +02:00
Maxime NATUREL
fb8d4668d8
Fixing wrong copyright title
2022-09-07 09:32:47 +02:00
Maxime NATUREL
611749c08f
Adding unit tests for mapper
2022-09-07 09:32:47 +02:00
Maxime NATUREL
e542dc4aac
Adding a method to retrieve livedata of crypto device info for a given device id
2022-09-07 09:32:47 +02:00
Maxime NATUREL
f74a0b0901
Adding a method to retrieve livedata of device info for a given device id
2022-09-07 09:32:47 +02:00
Maxime NATUREL
2a599d9760
Small renamings/reorganization in CryptoService
2022-09-07 09:32:47 +02:00
Benoit Marty
8f69c5e0bc
Split long lines and improve readability.
2022-09-06 12:10:21 +02:00
Benoit Marty
3c7889c95d
Some cleanup
2022-09-06 11:36:44 +02:00
Benoit Marty
9347bc8cf4
Use a dedicated model for rooms/{roomId}/hierarchy
endpoint result.
...
`rooms.children_state` is now a list of `SpaceChildSummaryEvent` instead of a list of `Event`.
2022-09-06 11:36:28 +02:00
Adam Brown
5c994ebfdd
lifting the phonenumber dependency to the deps file and exposing as api for the app level module
2022-08-31 09:16:00 +01:00
Benoit Marty
456d831a7d
Merge pull request #6917 from vector-im/feature/bma/incr_sync_perf
...
Feature/bma/incr sync perf
2022-08-31 09:06:32 +02:00
Benoit Marty
51dcaf7556
Merge pull request #6925 from vector-im/feature/bma/http_log
...
Feature/bma/http log
2022-08-29 15:04:46 +02:00