Commit Graph

3607 Commits

Author SHA1 Message Date
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
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
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
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