mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-21 08:54:12 +03:00
Code Issues Projects Releases Packages Wiki Activity
9601 commits 160 branches 159 tags 271 MiB
Commit graph

9601 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damir Jelić
2097f4e6c2 crypto: Document the verification methods in the OlmMachine 2021-07-20 16:34:47 +02:00
Damir Jelić
eae2a51a2d crypto: Refactor and document the QR code verification class 2021-07-20 14:30:34 +02:00
Damir Jelić
b33537fd6e crypto: Use the new CancelInfo struct 2021-07-19 14:21:11 +02:00
Damir Jelić
7650e43362 crypto: Add support to scan QR codes during verification 2021-07-10 20:51:47 +02:00
Benoit Marty
b26aba9fc0 Remove EventDecryptor and inject the cryptoService when needed 
Not used anymore in RoomSummaryUpdater, to avoid a DI dependency loop. let's see if this is a problem
 2021-07-09 12:50:34 +02:00
Benoit Marty
f609bfaf10 This class is not injected. 2021-07-08 18:39:54 +02:00
Benoit Marty
f8ad024f1b Remove some dead code. 2021-07-08 18:38:49 +02:00
Benoit Marty
54c3b4192e Small cleanup and format 2021-07-08 17:14:45 +02:00
Damir Jelić
d4090c4b0a crypto: Only add our own devices if we're requesting devices for our own user 2021-07-08 16:52:31 +02:00
Benoit Marty
80e80e07b3 To be reverted: temporarily change appId to 'im.vector.app.corroded' and app name 2021-07-08 16:18:29 +02:00
Damir Jelić
33c2184c52 crypto: Allow verifications to be requested 2021-07-08 12:49:44 +02:00
Damir Jelić
d24c94d0f9 crypto: Allow the direct start of the short SAS flow 2021-07-01 13:15:26 +02:00
Damir Jelić
85e4b5eb49 Merge remote-tracking branch 'upstream/develop' into rust-verification 2021-07-01 08:09:33 +02:00
Damir Jelić
7e49760da0 rust: Don't depend on a local rust-sdk 2021-06-30 17:39:36 +02:00
Benoit Marty
a8bef415b7
Merge pull request #3587 from vector-im/feature/fga/fix_video_call_crash 
Fix crash after video call
 2021-06-30 17:22:09 +02:00
Damir Jelić
cd5aad9a31 crypto: Move the request sending logic into the sender 2021-06-30 16:28:21 +02:00
Damir Jelić
2c1dc053ed crypto: Support answering in-room verifications 2021-06-30 15:48:24 +02:00
ganfra
de64df3cdb Fix crash after video call 2021-06-30 14:50:30 +02:00
Damir Jelić
bcfb121215 crypto: Prepare the verification service to allow starting short SAS flows 2021-06-29 11:12:41 +02:00
Damir Jelić
304c89a56d crypto: Dispatch updates when we receive MAC events 2021-06-29 10:03:53 +02:00
Benoit Marty
3a683fc4e9
Merge pull request #3578 from vector-im/feature/bma/button_size 
Fix issue on button styles
 2021-06-29 09:48:20 +02:00
Damir Jelić
53b3f54808 crypto: Add support to accept the short SAS verification flow 2021-06-29 09:28:41 +02:00
Benoit Marty
bca220f909 Fix issue on button styles 2021-06-28 17:02:06 +02:00
Benoit Marty
edd24de4c3
Merge pull request #3547 from vector-im/feature/fga/jump_to_unread_redesign 
Jump to unread: implement new design
 2021-06-28 16:45:06 +02:00
Benoit Marty
9bbe002988
Merge pull request #3531 from vector-im/feature/fga/auto_accept_invite 
Feature/fga/auto accept invite
 2021-06-28 16:40:10 +02:00
Damir Jelić
03499b5309 rust: Update the rust-sdk revision. 2021-06-28 15:30:35 +02:00
Damir Jelić
6bb7d5faaa crypto: Dispatch verification request cancellations as well 2021-06-28 15:25:31 +02:00
Damir Jelić
1f7311a428 crypto: Allow verification requests to be canelled 2021-06-28 14:08:49 +02:00
Damir Jelić
05119bcf90 crypto: Allow devices to be marked manually as verified 2021-06-28 14:08:08 +02:00
Damir Jelić
02b8b1f5b1 crypto: Clean up the SAS verification transaction a bit 2021-06-28 11:37:27 +02:00
Damir Jelić
d21137d910 crypto: Add a state for when we confirmed the QR code 2021-06-28 11:37:27 +02:00
Damir Jelić
4473af85b1 crypto: Move more of the request sending logic into the sender class 2021-06-28 11:37:27 +02:00
Damir Jelić
6523ca5afe crypto: Allow the displaying of QR codes 2021-06-28 11:37:27 +02:00
Damir Jelić
d15269a4bd rust: Add methods for the QR code verification 2021-06-28 11:37:27 +02:00
Damir Jelić
846242217b crypto: Move the VerificationRequest into a separate file 2021-06-28 11:37:27 +02:00
Damir Jelić
f95c4ae088 crypto: Allow cancelling of SAS transactions 2021-06-28 11:37:27 +02:00
Damir Jelić
f854e9cf1c crypto: Remove the intermediately CancelCode and use strings to map over FFI 2021-06-28 11:37:27 +02:00
Damir Jelić
b53b0a0093 crypto: Use a when instead of a big if/else statement 2021-06-28 11:37:27 +02:00
Damir Jelić
948aa1a141 crypto: Correctly pick up our device verification state 2021-06-28 11:37:27 +02:00
Damir Jelić
aad18ebec7 crypto: Move the sendToDevice logic to a common class and use it for verifications 2021-06-28 11:37:27 +02:00
Damir Jelić
6a79d022c3 crypto: Expose the trust state of our devices 2021-06-28 11:37:27 +02:00
Damir Jelić
6649aaca2e crypto: Support SAS verification up to showing emojis 2021-06-28 11:37:14 +02:00
Damir Jelić
e97ce33ed9 Merge remote-tracking branch 'upstream/develop' into rust-verification 2021-06-28 11:36:57 +02:00
ganfra
48fa9e1a5e Clean after benoits review 2021-06-28 11:00:29 +02:00
Benoit Marty
cd0c9b4e08
Merge pull request #3549 from vector-im/feature/bma/cleanup_styles 
Fix styles issue
 2021-06-25 19:11:54 +02:00
Benoit Marty
060e9d7a7e
Merge pull request #3568 from vector-im/dependabot/gradle/kotlin_version-1.5.20 
Bump kotlin_version from 1.5.10 to 1.5.20
 2021-06-25 19:11:34 +02:00
Benoit Marty
631e7881ef Fix warning about implicit type, introduced in Kotlin 1.5.20. 
"Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime."
 2021-06-25 17:42:38 +02:00
Benoit Marty
2e37b5efa3
Merge pull request #3565 from vector-im/feature/fga/fix_call_notification 
Fix call invite processed after call is ended because of fastlane mode.
 2021-06-25 16:47:54 +02:00
Benoit Marty
6b82e8d55a
Merge pull request #3567 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.26 
Bump libphonenumber from 8.12.25 to 8.12.26
 2021-06-25 16:45:16 +02:00
dependabot[bot]
b1a1b4651e
Bump kotlin_version from 1.5.10 to 1.5.20 
Bumps `kotlin_version` from 1.5.10 to 1.5.20.

Updates `kotlin-gradle-plugin` from 1.5.10 to 1.5.20
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.20/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.10...v1.5.20)

Updates `kotlin-stdlib-jdk7` from 1.5.10 to 1.5.20
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.20/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.10...v1.5.20)

Updates `kotlin-stdlib` from 1.5.10 to 1.5.20
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.20/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.10...v1.5.20)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk7
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-24 23:09:29 +00:00