filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,522 Commits 6 Branches 119 Tags 221 MiB
Commit Graph

3519 Commits

Author SHA1 Message Date
Damir Jelić 304c89a56d crypto: Dispatch updates when we receive MAC events 2021-06-29 10:03:53 +02:00
Damir Jelić 53b3f54808 crypto: Add support to accept the short SAS verification flow 2021-06-29 09:28:41 +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ć 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 d8327a5161 Fix crash on signout: release session at the end so you clean up files first. 2021-06-21 11:10:10 +02:00
Damir Jelić d00b54929f crypto: Add the scaffolding to connect the SAS verification to the rust side 2021-06-20 22:34:54 +02:00
Valere 4180b4ccd3 Code review 2021-06-18 10:47:21 +02:00
Valere 19a2b56011 Code review AliasAvailabilityResult 2021-06-18 10:41:24 +02:00
Valere b1ab6eb58f Add alias management in space settings 2021-06-18 10:41:13 +02:00
Valere fb337dacd6 Add space alias in creation wizard 2021-06-18 10:41:13 +02:00
Benoit Marty 5325c761f4
Merge pull request #3502 from vector-im/feature/bca/spaces_dnd 
Feature/bca/spaces dnd
 2021-06-18 10:28:59 +02:00
Benoit Marty bffa96ae10 Import sas strings 2021-06-18 10:25:37 +02:00
Valere 3dc7a6dc34 cleaning, quality 2021-06-17 17:00:28 +02:00
Valere 682e926965 Dnd enhancement 
+ klint fix
 2021-06-17 15:53:35 +02:00
Valere 944c9641a9 Code review 2021-06-17 14:44:24 +02:00
Valere a1aad53769 Space top level ordering 2021-06-17 14:44:24 +02:00
Damir Jelić a4e1a5bbcb crypto: Initial support to answer to-device verification requests 2021-06-17 13:38:30 +02:00
Damir Jelić c0bac69733 crypto-service: Use constants when we check the event type 2021-06-16 13:21:37 +02:00
Damir Jelić 5ad596c3bc crypto: Bind more verification methods and types 2021-06-15 13:22:51 +02:00
Damir Jelić a144b1f7b5 rust: Fix the build and update our deps 2021-06-15 13:16:30 +02:00
Damir Jelić f110bf34fa Merge remote-tracking branch 'upstream/develop' into rust 2021-06-15 10:26:16 +02:00
Benoit Marty e9db1dbb08
Merge pull request #3488 from vector-im/dependabot/gradle/daggerVersion-2.37 
Bump daggerVersion from 2.36 to 2.37
 2021-06-11 12:24:49 +02:00
Benoit Marty dfb01a462e
Merge pull request #3456 from vector-im/feature/fga/dial_pad_tab 
Feature/fga/dial pad tab
 2021-06-11 12:23:19 +02:00
dependabot[bot] cc67e83b21
Bump daggerVersion from 2.36 to 2.37 
Bumps `daggerVersion` from 2.36 to 2.37.

Updates `dagger` from 2.36 to 2.37
- [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.36...dagger-2.37)

Updates `dagger-compiler` from 2.36 to 2.37
- [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.36...dagger-2.37)

---
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-06-11 05:54:29 +00:00
ganfra 68143ab2cf Merge branch 'develop' into feature/fga/voip_asserted_identity 2021-06-10 16:01:48 +02:00
ganfra 880da9ecd5 Merge branch 'develop' into feature/fga/dial_pad_tab 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
#	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
 2021-06-10 15:37:24 +02:00
ganfra dfcffb9464 Merge branch 'develop' into feature/fga/account_data_rework 2021-06-09 18:58:47 +02:00
ganfra d19dffe45f Clean and add towncrier file 2021-06-09 18:57:35 +02:00
ganfra e368ba606b Account data: allow querying room account data globally from session) 2021-06-09 18:44:30 +02:00
ganfra 0c6506da8c Account data : define 2 services 2021-06-09 16:20:21 +02:00
Benoit Marty f7f4ec3ecc Dominaezzz review 2021-06-09 15:41:06 +02:00
Benoit Marty 04f06b2803 Convert KeysImporter to coroutines 2021-06-09 15:41:06 +02:00
Benoit Marty 3be95ca442 Convert KeysExporter to coroutines 2021-06-09 15:39:46 +02:00
Benoit Marty f99600f115 Convert DefaultTypingService to coroutines 2021-06-09 15:38:50 +02:00
Benoit Marty 209792a9ec Cleanup 2021-06-09 15:38:50 +02:00
Benoit Marty 047c59eba0 Rework colors management 2021-06-09 15:36:20 +02:00