mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-19 15:58:27 +03:00
Code Issues Projects Releases Packages Wiki Activity
20354 commits 163 branches 158 tags 270 MiB
Commit graph

5607 commits

Author SHA1 Message Date
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
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
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
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
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
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
Benoit Marty
a8eb7d95ac Create a new fun for code clarity 2022-08-29 14:32:12 +02:00
Benoit Marty
f668be5266
Remove tmp comment 2022-08-29 12:39:58 +02:00
Florian Renaud
ee7c0593ba Fix copyright 2022-08-25 14:37:06 +02:00
Florian Renaud
cac4df7d66 Improve createRoomThreePidEvents for clarity 2022-08-25 14:28:17 +02:00
Florian Renaud
eab4ebc3b1 Remove roomCreatorUserId and use current userId by default 2022-08-25 14:16:20 +02:00
Florian Renaud
90d688c222 Remove useless explicit field type 2022-08-25 14:07:50 +02:00
Florian Renaud
2be2a05795 Change visibility of LocalRoomThirdPartyInviteContent to internal 2022-08-25 14:05:25 +02:00
Florian Renaud
110cabaca1 Remove useless apply in CreateLocalRoomStateEventsTask 2022-08-25 14:00:58 +02:00
Florian Renaud
5d1124aa95 Update doc 2022-08-25 13:57:50 +02:00
Florian Renaud
128ff0d6ec Extract condition to reduce code complexity 2022-08-25 13:57:50 +02:00
Florian Renaud
cbf9dbf290 Verify tombstone event 2022-08-25 13:57:50 +02:00
Florian Renaud
725537d8fe Remove safe call 2022-08-25 13:57:50 +02:00
Florian Renaud
3905e564bd Add unit tests for CreateRoomFromLocalRoomTask 2022-08-25 13:57:49 +02:00
Florian Renaud
882065f6cd Add unit tests for CreateLocalRoomStateEventsTask 2022-08-25 13:57:49 +02:00
Florian Renaud
e22ce0d842 Set stateKey as empty by default 2022-08-25 13:57:49 +02:00
Florian Renaud
dee8484618 Create local room state events in dedicated task 2022-08-25 13:57:49 +02:00
Florian Renaud
7216f6bd64 Fix local events generation following the specification 2022-08-25 13:57:49 +02:00
Florian Renaud
5df71c6161 Update CreateRoomParams from the potential FeaturePreset before persisting 2022-08-25 13:57:49 +02:00
Florian Renaud
c96343f1d7 Persists CreateRoomParams into LocalRoomSummaryEntity 2022-08-25 13:57:49 +02:00
Florian Renaud
69917ebc2e Start DM - Handle third party invites 2022-08-25 13:57:49 +02:00
Florian Renaud
b14e3c61b3 Start DM - Fix first message not encrypted 2022-08-25 13:57:49 +02:00
Florian Renaud
72896f1c8a Create the DM when sending an event 2022-08-25 13:57:49 +02:00
Benoit Marty
66a6018a93 Detekt 2022-08-24 14:06:35 +02:00
Benoit Marty
2c63dee86a Avoid trying to log formatted Json if Http bodies are not logged. 2022-08-24 10:16:57 +02:00
Benoit Marty
8cec528ac7 Only one FormatterJsonHttpLogger implementation is required. 2022-08-24 10:11:24 +02:00
Benoit Marty
973a5f1d6e Version++ 2022-08-23 17:02:24 +02:00
Benoit Marty
6c2885ff39 Granfra's review 2022-08-23 16:36:39 +02:00
Benoit Marty
58954ed590 Fix Exception: java.lang.IllegalArgumentException: Configurations cannot be different if used to open the same file. 
See for instance https://github.com/matrix-org/element-android-rageshakes/issues/41975
 2022-08-23 15:36:17 +02:00
Benoit Marty
aa750cccbf typo 2022-08-23 12:03:25 +02:00
Benoit Marty
1a79828aa5 Update comment 2022-08-23 12:01:43 +02:00