8f4d998362
Lint
2022-10-17 17:33:43 +01:00
d3e61a23a9
Fix generator
2022-10-17 17:29:45 +01:00
eec99e65bd
thread read receipts and unread notifications support is added to homeserver capatibilities
2022-10-17 18:09:45 +02:00
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
1863e4c3ef
Use unstable prefixes
2022-10-17 16:34:51 +01:00
b2dc0b33b5
Implement try again button action.
2022-10-17 18:32:35 +03:00
3d37e0b2a5
Fix enum JsonClass generateAdapter = false
2022-10-17 16:19:03 +01:00
623277e31f
Lint
2022-10-17 16:13:49 +01:00
e877feed6e
Add @JsonClass to all enums
2022-10-17 16:06:08 +01:00
29065b819f
Remove unused class
2022-10-17 16:03:47 +01:00
e01ee619d3
Refactor error handling and report E2EE errors
2022-10-17 16:02:25 +01:00
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
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
d616251f26
Fix merge
2022-10-17 13:41:27 +01:00
e89774e160
Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login
2022-10-17 13:26:35 +01:00
eb30ef166a
Improve 404 handling
2022-10-17 12:32:40 +01:00
1976451c81
Lint
2022-10-17 12:23:14 +01:00
91bb86d3c6
Code review fixes.
2022-10-17 14:16:29 +03:00
fb86ab70a2
Comments and error mapping
2022-10-17 12:05:32 +01:00
4306c57236
Thread safe use of OlmSAS
2022-10-17 12:01:12 +01:00
506fa729ea
Cleanup
2022-10-17 11:50:56 +01:00
48de8f4e34
Fix bad merge
2022-10-17 11:48:35 +01:00
33be5c257d
Refactor into dedicated files and companion objects
2022-10-17 11:24:48 +01:00
ed6bc01bef
Resolve TODO
2022-10-17 10:54:28 +01:00
d979b50b2c
Logging cleanup
2022-10-17 10:52:24 +01:00
b7570a3c5e
Fix compilation error
2022-10-17 11:31:48 +02:00
0cdc21649e
Fix unused import
2022-10-17 11:27:40 +02:00
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
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
fdc55965ca
Linting
2022-10-14 17:23:26 +01:00
dc9b41d19a
Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login
2022-10-14 17:12:08 +01:00
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
6c10a9bf2d
Code review fixes.
2022-10-14 18:10:18 +03:00
6426ff40d3
Linting
2022-10-14 14:18:50 +01:00
411b766890
Refactor to camelcase
2022-10-14 14:17:19 +01:00
4325600d27
Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login
2022-10-14 13:57:04 +01:00
e439b72e48
Handle master key trust during E2EE set up
2022-10-14 13:46:57 +01:00
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
032fa37b64
Create UserDataSource.getUserOrDefault().
2022-10-14 12:13:21 +02:00
5a2d74443d
Let GetProfileInfoTask store result into DB, except when we want to do bulk insertion.
2022-10-14 12:07:52 +02:00
c00ce91214
Linting
2022-10-14 01:11:25 +01:00
c18439f99b
Refactor code into api from internal
2022-10-14 01:07:19 +01:00
5abb786b6b
Fix copyright on SDK
2022-10-14 00:59:31 +01:00
370652c04b
Revert "Revert "Implementations of MSC3886 and MSC3903""
...
This reverts commit 489dfd7354
2022-10-13 22:37:19 +01:00
6399032312
Fix bad merge
2022-10-13 22:23:26 +01:00
7bc0bd3b57
Reduce logging
2022-10-13 22:15:07 +01:00
dd47297dfd
QR login + E2EE set up
2022-10-13 22:14:55 +01:00
bc0843eddf
Another default value fix
2022-10-13 22:13:56 +01:00
ac80ae5632
Set default value for optional params
2022-10-13 22:13:56 +01:00
ca7a6efade
Add missing binding
2022-10-13 22:13:56 +01:00
e2f3dde5c1
Use correct var name
2022-10-13 22:13:56 +01:00
1e60f3c25b
Make initialDeviceName optional
2022-10-13 22:13:56 +01:00
d0898a2b89
Linting
2022-10-13 22:13:30 +01:00
88238c0f04
Support for login by m.login.token during QR code sign in
2022-10-13 22:13:03 +01:00
489dfd7354
Revert "Implementations of MSC3886 and MSC3903"
...
This reverts commit 1235db7895
2022-10-13 21:48:27 +01:00
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
fb2776dca4
Cherry pick previous commits.
2022-10-13 20:33:52 +03:00
81f2197199
Another default value fix
2022-10-13 16:11:41 +01:00
c6e7185f8b
Set default value for optional params
2022-10-13 16:08:50 +01:00
8c86b3d297
Add missing binding
2022-10-13 16:02:57 +01:00
b5b32b7fda
Use correct var name
2022-10-13 15:58:19 +01:00
5bff9ceec4
Make initialDeviceName optional
2022-10-13 15:35:45 +01:00
09da74b029
Linting
2022-10-13 15:19:39 +01:00
8645f74c77
Support for login by m.login.token during QR code sign in
2022-10-13 15:11:15 +01:00
92a2420952
Merge pull request #7293 from vector-im/feature/bma/android13
...
Android 13
2022-10-13 13:52:52 +02:00
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
beb334babe
Merge pull request #7335 from vector-im/feature/bma/upgrade_arrow
...
Remove Arrow-kt dependency
2022-10-12 16:26:02 +02:00
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
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
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
1669316682
Remove dependency to arrow. Please use `org.matrix.android.sdk.api.util.Optional` instead.
2022-10-12 10:20:52 +02:00
1235db7895
Implementations of MSC3886 and MSC3903
2022-10-11 23:33:30 +01:00
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
5649933b03
Removing some TODOs
2022-10-11 14:03:12 +02:00
9877e90df6
Adding use cases to get and set the extra matrix client Info
2022-10-11 14:01:43 +02:00
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
4af2e62150
Merge branch 'develop' into feature/eric/msc3881
2022-10-09 12:45:19 -04:00
cd2e693f0c
Fixes legal copy
2022-10-09 09:48:36 -04:00
11e251fc1d
Fixes legal copy
2022-10-09 09:48:18 -04:00
d191bfeaf7
Fixes legal copy
2022-10-09 09:46:07 -04:00
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
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
a2382c6a01
Adds thread notification fields to RoomSummary
2022-10-07 11:47:18 -04:00
c2ae75d9bd
Changes thread notifications saved to entity from sum to size
2022-10-07 11:45:58 -04:00
ebd8461724
Adds thread notifications and highlights to RoomSummaryEntity
2022-10-07 11:42:18 -04:00
00bfbe9bc6
Adds API parsing of unread threads notifications
2022-10-07 11:16:41 -04:00
e9e2e5011b
Fix test compilation.
2022-10-07 10:08:33 +02:00
4091d27311
Add "io.element.voice_broadcast_info" state event
2022-10-06 16:23:40 +02:00
15616ecc7c
Fix compilation issue after rebase
2022-10-05 17:35:05 +02:00
f2bbdc3906
API 33: fix compilation warnings
2022-10-05 17:35:05 +02:00
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
38ca3b6cdb
Version++
2022-10-05 17:20:05 +02:00
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
fddeddacc7
fix outdated doc
2022-10-05 10:42:29 +02:00
37458d41f2
E2ee dos not hinder verification
2022-10-05 10:42:29 +02:00
68d4ac34c7
Move setting to room profile
2022-10-05 10:27:12 +02:00
f7d8356327
post rebase fix & cleaning
2022-10-05 10:27:12 +02:00
92a72cb1e9
cleaning
2022-10-05 10:27:12 +02:00
e9b33f6234
Per room block unverified devices
2022-10-05 10:27:12 +02:00
f02b689ce0
Adding unit tests for mapper
2022-10-05 10:14:05 +02:00
Hugh Nimmo-Smith
NIkita Fedrunov
Onuray Sahin
Onuray Sahin
Benoit Marty
Benoit Marty
dependabot[bot]
SpiritCroc
Jorge Martin Espinosa
Eric Decanini
Maxime NATUREL
Maxime NATUREL
Florian Renaud
Valere