Commit graph

3605 commits

Author SHA1 Message Date
ganfra
be8c6f1836 Merge branch 'develop' into feature/fga/expose_sync 2021-09-30 12:10:38 +02:00
Benoit Marty
3f7e810f14 Handle change from WorkManager 2.6.0.
https://developer.android.com/jetpack/androidx/releases/work#2.6.0
2021-09-30 12:06:57 +02:00
Benoit Marty
0033378f8b
Merge pull request #4050 from vector-im/dependabot/gradle/kotlin-1.5.31
Bump kotlin from 1.5.30 to 1.5.31
2021-09-29 17:09:39 +02:00
Benoit Marty
c0adde56df
Merge pull request #4027 from vector-im/feature/fre/permalink
Add client base url support for permalinks
2021-09-29 17:08:12 +02:00
Benoit Marty
045e4bbf76
Merge pull request #4052 from vector-im/feature/adm/email_notification_toggle
Add email notification toggle
2021-09-24 20:42:44 +02:00
Valere
1fed27961a Code review 2021-09-24 19:35:49 +02:00
Valere
0acf90d8cd Code review 2021-09-24 18:12:12 +02:00
Valere
d59aaa7611 Support entering mail in user invite screen 2021-09-24 18:12:12 +02:00
Adam Brown
4482cbdaa6 using dedicated pusher removal methods for the different types of pushers
- also adds a separate removePusher which supports removing any type of pusher
2021-09-24 17:00:48 +01:00
Adam Brown
95b4f99970 making the add email pusher append parameter configurable by clients, typically we wouldn't want to overwrite other accounts but we can expose the option to clients if they want that behaviour 2021-09-24 15:39:08 +01:00
Benoit Marty
f3c4e9a1df ktlint 2021-09-23 19:33:38 +02:00
Benoit Marty
80aad8a958
Merge pull request #4033 from vector-im/feature/bca/improve_store_key_throttling
Use in memory cache when adding inBoundGroupSession
2021-09-23 19:31:35 +02:00
Benoit Marty
a40cee337e Fix warning "This expression will be resolved to Int in future releases. Please add explicit conversion call" 2021-09-23 15:52:01 +02:00
Adam Brown
0302d19f47 formatting 2021-09-23 13:20:01 +01:00
Benoit Marty
75fb026289 Rename some classes after new feature implemented 2021-09-23 13:54:03 +02:00
Benoit Marty
306e3cf055 Improve log to track push and sync request
Also change some log level from d to v
2021-09-23 13:54:03 +02:00
Benoit Marty
05aff3314d Add error state 2021-09-23 13:54:03 +02:00
Benoit Marty
f5151463e2 Add the number of rooms and toDevice events in the debug data 2021-09-23 13:54:03 +02:00
Benoit Marty
63a84dcb8a Add incremental sync status to the room list and the room detail (only in developer mode) 2021-09-23 13:54:03 +02:00
Adam Brown
d31ad7e187 extracting constants for the pusher kinds and email appId 2021-09-23 12:33:48 +01:00
Adam Brown
8316728e53 removing this. usages where there's no clashes 2021-09-23 11:45:09 +01:00
Adam Brown
8734d5d2e7 removing redundant comments about pusher kind from apis which don't have a kind field 2021-09-21 16:08:46 +01:00
Adam Brown
2c25efc36a making the removePusher more generic as it can handle email and http pushers
- Updates the doc to reflect that to remove emails an appId of m.email is required
2021-09-21 13:46:18 +01:00
Adam Brown
78d70eab12 enforcing emails pushes to always be appended
- always appending allows the same email to be used for other accounts see https://github.com/matrix-org/matrix-react-sdk/pull/2727 https://github.com/matrix-org/matrix-react-sdk/pull/2727/files#diff-ec232520bf51337e5e6939b885d21f428ad6da3306c8e17a3ff660b2b341179dR165
2021-09-21 11:32:33 +01:00
Adam Brown
516bb6ed95 lifting the email branding to its own parameter so clients of the sdk can configure it 2021-09-21 11:26:11 +01:00
Adam Brown
ee3f2877e9 adding matrix SDK support for email adding and removing email pushes
- email pushes make use of a new undocumented `brand` field, for now this field maps directly to the app display name so we can resuse it
2021-09-21 09:52:00 +01:00
Florian Renaud
fa3abecf8f Fix review 2021-09-20 15:18:06 +02:00
Benoit Marty
b5f7351564
Merge pull request #4008 from vector-im/feature/fga/small_timeline_optimisation
Feature/fga/small timeline optimisation
2021-09-17 18:06:58 +02:00
Florian Renaud
e37fb313c0 Permalink: Merge LinkHandlerActivity with PermalinkHandlerActivity
Also convert links to matrix.to before permalink parsing
2021-09-17 17:19:32 +02:00
Florian Renaud
a73f0a9fa8 Permalink: use client base url if any 2021-09-17 16:46:09 +02:00
Florian Renaud
0d344fde03 Permalink: add client url field in MatrixConfiguration 2021-09-17 16:46:09 +02:00
Florian Renaud
afb49430be Permalink: move method implementation from service to factory 2021-09-17 16:46:09 +02:00
Valere
22319a0f0a Cleaning, line too long 2021-09-16 09:33:06 +02:00
Valere
e5de62b57c Code review 2021-09-16 09:33:06 +02:00
Valere
94f88c80fc Fix parent relation handling 2021-09-16 09:33:06 +02:00
Valere
70ebb3a3f2 Code review 2021-09-15 18:48:40 +02:00
Valere
2c1435f08c Change default power to invite in private space + setting 2021-09-15 18:47:38 +02:00
Benoit Marty
d6b261ce4c
Merge pull request #3986 from vector-im/feature/bca/room_summary_api
Better room preview, use room Summary API if available
2021-09-15 15:03:31 +02:00
Valere
f2b7ee3e06 Code review 2021-09-15 09:21:30 +02:00
Valere
7142cd899b Use in memory cache when adding inBoundGroupSession 2021-09-14 14:01:17 +02:00
Valere
3a0734f6e2 Store device key in SharedSessionEntity
Code review changes


Fix database migraiton


Fix wrong self assignement + comment
2021-09-13 15:29:45 +02:00
ganfra
f96485c493 Timeline: use json directly to be a bit more speedy (those methods are called a lot) 2021-09-09 19:06:09 +02:00
Benoit Marty
3fcfe7000f Update user agent: MatrixAndroidSDK_X is replaced by MatrixAndroidSdk2 2021-09-09 09:59:06 +02:00
Benoit Marty
6a1409ba59 Better management of SDK version 2021-09-09 09:55:24 +02:00
Valere
b1c95e32eb Better room preview, use room Summary API if available 2021-09-08 13:55:22 +02:00
Onuray Sahin
3bd392a55d Code review fixes. 2021-09-08 13:44:52 +03:00
Onuray Sahin
1df867f345 Fix rendering voice message if the waveform data is corrupted. 2021-09-08 13:20:56 +03:00
Benoit Marty
ffedd6fcfa Fix other warning 2021-09-03 17:02:14 +02:00
Benoit Marty
fc22376050 Ignore warning in test.
There is probably a better way than using the GlobalScope, but I'm not sure how to do it now.
2021-09-03 17:02:14 +02:00
Benoit Marty
377c4e00a3
Merge pull request #3954 from vector-im/dependabot/gradle/com.android.tools.build-gradle-7.0.2
Bump gradle from 4.2.2 to 7.0.2
2021-09-03 12:11:52 +02:00
Valere
1c7e567187 Fix test compilation (autojoin descoped) 2021-09-02 11:56:16 +02:00
Valere
9687a59371 Code review 2021-09-02 11:34:08 +02:00
Valere
97114b4f48 cleaning 2021-09-02 11:34:08 +02:00
Valere
0bcd363677 Cleaning 2021-09-02 11:34:08 +02:00
Valere
5297512f87 Support Space explore pagination 2021-09-02 11:34:08 +02:00
Benoit Marty
616e5b17f0 Fix warning
provider#androidx.work.impl.WorkManagerInitializer was tagged at AndroidManifest.xml:16 to remove other declarations but no other declaration present
2021-09-02 09:43:39 +02:00
Valere
ec77006ddf FIx / bad format of restricted join rule 2021-09-01 17:15:37 +02:00
yostyle
d579670080 Add password matrix errors 2021-09-01 10:30:20 +02:00
Benoit Marty
32bad57536 Cleanup 2021-08-31 11:50:23 +02:00
Benoit Marty
d304469903
Merge branch 'develop' into develop 2021-08-30 14:25:13 +02:00
Benoit Marty
23e3241b95
Merge pull request #1809 from dkter/conversation-features
Support Android 11 Conversation features
2021-08-30 14:15:42 +02:00
Benoit Marty
2a89e2b4ac
Merge pull request #3908 from vector-im/feature/fga/fix_jitsi_widget
Fix Jitsi-hosted jitsi conferences not loading
2021-08-30 13:57:39 +02:00
Benoit Marty
65c8ae3597
Merge pull request #3739 from vector-im/feature/bca/accept_unbound_3pid_invite
support email invite
2021-08-27 19:02:42 +02:00
Benoit Marty
5b2478a34f
Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings
Feature/dla/keyword notification settings
2021-08-27 18:19:17 +02:00
Valere
1ffacd1788 Code review 2021-08-27 17:30:32 +02:00
Valere
819e7c49b0 Code review 2021-08-27 17:30:32 +02:00
Valere
f2ab0987cc Add change log + cleaning 2021-08-27 17:30:09 +02:00
Valere
69c84a2460 support email invite 2021-08-27 17:30:09 +02:00
Valere
4107d2643c
Merge pull request #3704 from vector-im/feature/bca/promote_restricted
Promote restricted join rule to admins
2021-08-27 17:27:57 +02:00
Benoit Marty
276b89b8b7 PushRule enabling request is not following the spec 2021-08-27 16:15:08 +02:00
Valere
b408d7346f Fix / use unstable prefix for room_capabilities 2021-08-27 15:56:07 +02:00
Florian Renaud
7714cc41f7 Attach documentation reference to expired account error 2021-08-27 14:33:12 +02:00
Florian Renaud
1ca4b3b78a Add expired account error code
For synapse instances which have activated and configured the email account validity module, an error code (ORG_MATRIX_EXPIRED_ACCOUNT) is triggered for any request authenticated by the user's access token which is expired.
This change only add the error code in the matrix SDK but does not handle it for now in the client side.

More documentation can be found in the dedicated Synapse plugin module repository: https://github.com/matrix-org/synapse-email-account-validity
2021-08-27 14:28:07 +02:00
ganfra
84e6a67a51 Jitsi widget: refact a bit so we use data instead of url when possible 2021-08-27 14:03:52 +02:00
David Teresi
842ccb12b2 Improve shortcut sorting 2021-08-25 13:41:32 -04:00
David Langley
daaa40b27a Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/keyword_notification_settings 2021-08-25 17:41:37 +01:00
David Langley
1d767d6e3f Fix keyword style, preference persistence and add comment to keyword ruleid 2021-08-25 17:38:12 +01:00
Benoit Marty
4ad542f0d3
Merge pull request #3891 from vector-im/fre/when_statement
Use `when` statement instead of `if`/ `else`
2021-08-25 12:03:31 +02:00
David Langley
fb8c7f6be0 lint 2021-08-24 19:08:27 +01:00
ganfra
2e2deba3ac Fix message edition is not rendered in e2e rooms after pagination (#3887) 2021-08-24 19:58:54 +02:00
David Langley
3481fc70c7 Cleanup and fix resValue 2021-08-24 16:49:18 +01:00
David Langley
238f772461 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/keyword_notification_settings 2021-08-24 15:51:23 +01:00
Florian Renaud
07adc43481 Use when statement instead of if/ else 2021-08-24 15:38:33 +02:00
Benoit Marty
c301bcf4b6 Send an empty body for POST rooms/{roomId}/receipt/{receiptType}/{eventId} 2021-08-23 16:49:45 +02:00
ganfra
a968a848b0 Sync: exposes ShareFlow<SyncResponse> from the SyncThread 2021-08-23 16:46:37 +02:00
ganfra
ebe1e28689 Sync: makes SyncResponse in public API 2021-08-23 16:46:13 +02:00
Benoit Marty
9fa862ec76
Merge pull request #3711 from vector-im/feature/bma/sendToDevice
Ensure that txnId is the same if the request is retried
2021-08-23 16:11:33 +02:00
Benoit Marty
4a33fbb635
Merge pull request #3743 from vector-im/florian14/dm_email_invite
Update Account Data with user matrix id for invited user by email
2021-08-23 16:08:39 +02:00
Onuray Sahin
885a663380 Fix error when sending encrypted message if someone in the room logs out. 2021-08-06 15:23:24 +03:00
David Langley
8d7e3b6544 add keyword checkbox preference and chip/edit text for modificying keywords 2021-08-03 09:52:36 +01:00
Valere
efdaa49e70 Code review 2021-07-30 18:44:25 +02:00
Valere
a7dc7e8d8a klint 2021-07-30 18:44:14 +02:00
Valere
88fec379c4 Cleaning 2021-07-30 18:44:14 +02:00
Valere
5adceaca23 Code quality 2021-07-30 18:44:14 +02:00
Valere
2f16a7fff3 Restricted room mgmt when supported 2021-07-30 18:43:34 +02:00
Valere
6c2a917d9f WIP 2021-07-30 18:43:34 +02:00
Onuray Sahin
c6bd6e4961
Merge pull request #3598 from vector-im/feature/ons/voice_message
Voice Message
2021-07-30 17:24:17 +03:00
Benoit Marty
7cd90b0b14
Merge pull request #3760 from vector-im/feature/bma/otk1
2 small fixes
2021-07-30 12:55:57 +02:00
Florian Renaud
0a08746937 Set DirectMessagesContent immutable 2021-07-30 11:20:35 +02:00
Benoit Marty
57f3a2437e cleanup 2021-07-30 10:59:46 +02:00
Benoit Marty
54f707644c Migration to cleanup orphan TrustLevelEntities 2021-07-29 17:42:55 +02:00
Benoit Marty
b4e7f10019 Better algorithm to update user devices
Should fix the problem of too many TrustLevelEntity objects
2021-07-29 16:46:09 +02:00
Benoit Marty
5eb794f8af Small optimization 2021-07-29 15:39:03 +02:00
chagai95
426389194e
removing double the 2021-07-29 13:35:03 +02:00
Florian Renaud
ac56b1ef3e Update account data for invited users by email
When an user has been invited by email to a DM, account data entry was stuck on the user email after the user account creation.
When the user has joined element, an event m.room.member is triggered for each room attached to the user, containing a third party invite with the user matrix id. We use this event to update the user account with the matrix id.
2021-07-29 09:37:33 +02:00
cfriedlander
f45338be4c confirming to reviewed PR 2021-07-28 18:55:10 +02:00
Florian Renaud
6d47fdf3d3 Rename getLocalUserAccount to getLocalDirectMessages 2021-07-28 10:29:54 +02:00
Benoit Marty
4caf333769 Do not check the baseURL to override if it is the same than the one previously known and used 2021-07-27 09:59:01 +02:00
David Langley
9c139b3bd0 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_account_notifications_discrepancies 2021-07-26 22:55:27 +01:00
cfriedlander
618ab6c862 the base domain permalinks don't have the mxid in the first param but in the second after /user/mxid 2021-07-26 14:25:31 +02:00
David Langley
5d092ce18a simplify getHighlight logic 2021-07-23 14:29:37 +01:00
Benoit Marty
adabb31688 Changelog 2021-07-23 11:25:56 +02:00
Benoit Marty
0c211d7b1e
Merge pull request #3723 from vector-im/feature/fga/log_tags_voip
Feature/fga/log tags voip
2021-07-23 11:23:09 +02:00
ganfra
45a51d138e Voip log: clean after Benoit review 2021-07-23 09:50:09 +02:00
Benoit Marty
ed0143c240 Log errors 2021-07-22 16:20:16 +02:00
Benoit Marty
1d5ed46a49 Small cleanup 2021-07-22 16:01:01 +02:00
Benoit Marty
05988107a7 Ask the number of OTK if unknown from the sync. 2021-07-22 15:59:37 +02:00
ganfra
e356e71431 Merge branch 'develop' into feature/fga/log_tags_voip 2021-07-22 15:32:25 +02:00
Benoit Marty
7a7c292b3c Rename store API 2021-07-22 15:26:11 +02:00
Benoit Marty
be488ae75a Ensure OTK are uploaded when we upload the device keys
The sync response can omit the field device_one_time_keys_count.signed_curve25519 and the SDK was waiting to know this value to upload the OTK.
Now the SDK uploads the OTK when it uploads the device keys.
2021-07-22 15:24:05 +02:00
ganfra
79c8ef7ebf LoggerTag: try new thing and branch more on VOIP 2021-07-22 15:22:15 +02:00
Benoit Marty
19f9f5a6ee
Merge pull request #3715 from vector-im/feature/bma/initialState
Add initialState support to CreateRoomParams
2021-07-22 14:11:49 +02:00
Benoit Marty
4bbf175187 Fix a crash which can happen when user signs out.
The crypto DB has been deleted, and the key download request is cancelled, but in the catch block we tried to write to the deleted DB
2021-07-22 12:48:13 +02:00
ganfra
115f00ff1a Start experiment on log tags 2021-07-22 10:12:46 +02:00
Benoit Marty
5d65c83a3d
Merge pull request #3712 from vector-im/feature/fga/missed_call_notification
Feature/fga/missed call notification
2021-07-22 09:46:40 +02:00
Benoit Marty
966a959e41 do not send empty invite list when creating a room 2021-07-21 20:56:08 +02:00
Benoit Marty
b862e5ccbf Add initialState support to CreateRoomParams (#3713) 2021-07-21 20:53:17 +02:00
ganfra
8955049110 Minor changes after benoits review 2021-07-21 17:35:08 +02:00
Benoit Marty
08ea3c0888 More useful comment 2021-07-21 14:40:07 +02:00
Benoit Marty
4ead39038c Code review 2021-07-21 14:09:16 +02:00
Benoit Marty
ab6e0767bb
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
Co-authored-by: poljar <poljar@termina.org.uk>
2021-07-21 14:05:51 +02:00
Benoit Marty
eded4eacd7
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
Co-authored-by: poljar <poljar@termina.org.uk>
2021-07-21 13:59:40 +02:00
Benoit Marty
bf1ce17972
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
Co-authored-by: poljar <poljar@termina.org.uk>
2021-07-21 13:59:32 +02:00
Benoit Marty
bb617ffaa7
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt
Co-authored-by: poljar <poljar@termina.org.uk>
2021-07-21 13:59:19 +02:00
ganfra
5dda5a107a Missed call notif: make some cleanup and minor changes 2021-07-21 12:28:14 +02:00
Benoit Marty
a2180ec695 Create RequestIdHelper.createUniqueRequestId() for code clarity 2021-07-21 12:04:11 +02:00
Benoit Marty
0d408264e0 Bad copy paste 2021-07-21 11:46:11 +02:00
Benoit Marty
7513e972d1 Ensure the same txnId is reused if the Worker is started again. 2021-07-21 11:43:47 +02:00
Benoit Marty
49a44bd042 Do not change txnId it in case of retry, if not provided in the params
Also create txnId using UUID.randomUUID() instead of Random.nextInt(Integer.MAX_VALUE) for coherency
2021-07-21 11:37:15 +02:00
Damir Jelić
278bba3ada crypto: Don't use the transaction ID of the verification for the request
Verification flows have something called a transaction id. This is a
client-set custom ID that identifies the flow and is established by the
first message that gets sent out. This transaction ID needs to be kept the
same and be part of all events that are sent during the verification flow.

To-device requests have something called a transaction id. This is a
client-set custom ID that identifies a given request. It is used to
ensure idempotency of requests, i.e. retrying to send a request won't
result in two events being sent as long as the transaction id is kept
the same.

This patch removes usage of the first type of transaction ID for the
second use-case.

This closes: #3589.
2021-07-20 17:17:42 +02:00
David Langley
608a1d3f8f clarify sdk update and cleanup typos 2021-07-20 11:24:17 +01:00
David Langley
da993b5b58 lint 2021-07-19 22:13:23 +01:00
David Langley
89ece22f73 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_account_notifications_discrepancies 2021-07-19 22:08:34 +01:00
David Langley
a29ccda68e move mutable push rule logic to static declarations as on web 2021-07-19 21:29:46 +01:00
Benoit Marty
40907a71b6 Cleanup 2021-07-19 18:44:57 +02:00
Benoit Marty
a34d445215
Merge pull request #3699 from vector-im/feature/bma/part_dl
Complement for #3656
2021-07-19 18:09:33 +02:00
Benoit Marty
a2996ee042 Rename var 2021-07-19 16:32:02 +02:00
Benoit Marty
9f631768eb Avoid crash in debug app 2021-07-19 13:34:51 +02:00
Benoit Marty
2f6d2cfe09 Avoid crash in debug app 2021-07-19 13:31:09 +02:00
Benoit Marty
7643cc506d Remove part file(s) in case of failure
Will not always delete part files in case of crashes
2021-07-19 11:08:03 +02:00