Commit Graph

3661 Commits

Author SHA1 Message Date
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
Benoit Marty 54a4a84ac0
Merge pull request #3741 from vector-im/dependabot/gradle/daggerVersion-2.38.1
Bump daggerVersion from 2.38 to 2.38.1
2021-08-27 17:37:03 +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 048800684c
Merge pull request #3914 from vector-im/feature/bma/enabled_body
PushRule enabling request is not following the spec
2021-08-27 16:58:51 +02:00
dependabot[bot] 7a44c6980c
Bump daggerVersion from 2.38 to 2.38.1
Bumps `daggerVersion` from 2.38 to 2.38.1.

Updates `dagger` from 2.38 to 2.38.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.38...dagger-2.38.1)

Updates `dagger-compiler` from 2.38 to 2.38.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.38...dagger-2.38.1)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-27 14:33:17 +00:00
Benoit Marty fa1a6b141a
Merge pull request #3832 from vector-im/dependabot/gradle/com.jakewharton.timber-timber-5.0.1
Bump timber from 4.7.1 to 5.0.1
2021-08-27 16:32:29 +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
Benoit Marty 4a4c76c4c4
Merge pull request #3896 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.31
Bump libphonenumber from 8.12.30 to 8.12.31
2021-08-25 11:59:18 +02:00
dependabot[bot] 8988ea8997
Bump libphonenumber from 8.12.30 to 8.12.31
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.30 to 8.12.31.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.30...v8.12.31)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-24 23:09:52 +00: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
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
dependabot[bot] 3a03b5b63c
Bump timber from 4.7.1 to 5.0.1
Bumps [timber](https://github.com/JakeWharton/timber) from 4.7.1 to 5.0.1.
- [Release notes](https://github.com/JakeWharton/timber/releases)
- [Changelog](https://github.com/JakeWharton/timber/blob/trunk/CHANGELOG.md)
- [Commits](https://github.com/JakeWharton/timber/compare/4.7.1...5.0.1)

---
updated-dependencies:
- dependency-name: com.jakewharton.timber:timber
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-23 13:12:59 +00:00
Benoit Marty d659479040
Merge pull request #3784 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.7.1
Bump realm-gradle-plugin from 10.6.1 to 10.7.1
2021-08-23 15:08:42 +02:00
Benoit Marty ed639a254e
Merge pull request #3795 from vector-im/dependabot/gradle/androidx.exifinterface-exifinterface-1.3.3
Bump exifinterface from 1.3.2 to 1.3.3
2021-08-23 15:05:12 +02:00
dependabot[bot] fac0198b26
Bump libphonenumber from 8.12.28 to 8.12.30
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.28 to 8.12.30.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.28...v8.12.30)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-17 23:05:56 +00: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
dependabot[bot] fb5b167e31
Bump exifinterface from 1.3.2 to 1.3.3
Bumps exifinterface from 1.3.2 to 1.3.3.

---
updated-dependencies:
- dependency-name: androidx.exifinterface:exifinterface
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-04 23:10:45 +00:00
dependabot[bot] 211bb8e96c
Bump realm-gradle-plugin from 10.6.1 to 10.7.1
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.6.1 to 10.7.1.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.6.1...v10.7.1)

---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-03 23:07:02 +00: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
Benoit Marty b764746323
Merge pull request #3724 from vector-im/feature/bma/ensureOTK
Ensure OTKs are uploaded when the session is created
2021-07-23 11:21:07 +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
dependabot[bot] a75ceee03f
Bump appcompat from 1.3.0 to 1.3.1
Bumps appcompat from 1.3.0 to 1.3.1.

---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-22 12:13:24 +00: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
Benoit Marty 98720ce4a5
Merge pull request #3707 from poljar/poljar/fix/verification-transaction-id-mixup
crypto: Don't use the transaction ID of the verification for the request
2021-07-21 09:39:22 +02:00
Benoit Marty e4ae80e348
Merge pull request #3708 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.28
Bump libphonenumber from 8.12.27 to 8.12.28
2021-07-21 09:28:19 +02:00
dependabot[bot] 89dc4bb13e
Bump daggerVersion from 2.37 to 2.38
Bumps `daggerVersion` from 2.37 to 2.38.

Updates `dagger` from 2.37 to 2.38
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.37...dagger-2.38)

Updates `dagger-compiler` from 2.37 to 2.38
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.37...dagger-2.38)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-20 23:06:50 +00:00
dependabot[bot] b809d4acf4
Bump libphonenumber from 8.12.27 to 8.12.28
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.27 to 8.12.28.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.27...v8.12.28)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-20 23:06:30 +00: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