Commit Graph

1585 Commits

Author SHA1 Message Date
Valere 9b320ed3c7 Fix unwedging 2020-04-22 15:40:59 +02:00
Benoit Marty a6368c473e Restart broken Olm sessions ([MSC1719](https://github.com/matrix-org/matrix-doc/pull/1719)) 2020-04-20 18:07:14 +02:00
Benoit Marty 3615ca6b95 VersionName can be null when running integration test 2020-04-20 18:07:14 +02:00
Benoit Marty ddb00ba23a Enable Timber log in integration tests 2020-04-20 18:07:14 +02:00
Benoit Marty 91cf4b647d var -> val 2020-04-20 18:07:14 +02:00
Benoit Marty f989eed8b0 Use @Throws(MXCryptoError::class) 2020-04-20 18:07:14 +02:00
Benoit Marty 4d296ddc09 Avoid injecting credentials 2020-04-20 18:07:14 +02:00
Benoit Marty 6186c22e02 improve code 2020-04-20 18:07:14 +02:00
Benoit Marty 13cd13a42f Create RoomEncryptorsStore 2020-04-20 18:07:14 +02:00
Benoit Marty a42eb42178 Avoid injecting Credentials 2020-04-20 18:07:14 +02:00
Benoit Marty 7924ef207c Add Javadoc 2020-04-20 18:07:14 +02:00
Benoit Marty 5900245018 Make the test fail before unwedging implementation 2020-04-20 18:07:14 +02:00
Benoit Marty 00c239bc42 cleanup 2020-04-20 18:07:14 +02:00
Benoit Marty 0cb43eef51 Add test for Unwedging (before implementing it) 2020-04-20 18:07:14 +02:00
Benoit Marty 41a8f40241 Improve API 2020-04-20 18:07:14 +02:00
Benoit Marty a8641ef879 Split KeysBackup to several files. No other change. 2020-04-20 18:07:14 +02:00
Valere 1227de3f9c
Merge pull request #1256 from vector-im/feature/increase_default_timeout
Increase default timeout to match old riot
2020-04-20 17:13:59 +02:00
Valere c7ac5e2293 Increase default timeout to match old riot 2020-04-20 11:26:03 +02:00
Valere 28c6921a0a Avoid unnecessary /device call 2020-04-17 18:08:29 +02:00
Benoit Marty ac07fb47d7 Better Kotlin code 2020-04-16 17:42:55 +02:00
Benoit Marty 5652140f5d Improve ContentUrlResolver 2020-04-16 16:41:45 +02:00
Benoit Marty e97c95f40a Fix issue with media path (Fixes #1227) 2020-04-16 16:41:45 +02:00
Benoit Marty cc94b6cf7d
Merge pull request #1116 from vector-im/feature/worker_manager
Add some documentation on Workers
2020-04-16 16:28:20 +02:00
Valere 66fc38ad4b Remove GlobalScope usage 2020-04-16 15:09:16 +02:00
Valere 621e78a864
Merge pull request #1235 from vector-im/feature/upgrate_cross_signing
Add migration state to bootstrap
2020-04-16 15:04:06 +02:00
Benoit Marty 828e972c74 Split long lines 2020-04-16 14:35:55 +02:00
Benoit Marty 79e81dbdde ktlint 2020-04-16 14:01:15 +02:00
Benoit Marty f93f50b582 Code readability 2020-04-16 14:00:24 +02:00
Benoit Marty 467f48f1a6 Merge remote-tracking branch 'origin/develop' into develop 2020-04-16 11:33:22 +02:00
Valere 0edc562120 Fix / test compilation 2020-04-16 11:30:10 +02:00
Valere aa496e6efb Add migration state to bootstrap 2020-04-16 11:30:10 +02:00
Benoit Marty ea03f76847
Merge pull request #1129 from vector-im/feature/update_password
Change password function implemented.
2020-04-16 11:26:33 +02:00
Benoit Marty d74a5f9979 Typo 2020-04-16 11:23:41 +02:00
Benoit Marty 17ece54cb0 `mimetype` field is optional 2020-04-16 10:28:23 +02:00
Benoit Marty f6f6fa99fb
Merge pull request #1223 from vector-im/feature/cross_signing_as_task
Make initialize cross signing as a task
2020-04-15 17:21:25 +02:00
Benoit Marty 6201a9b8ef
Merge branch 'develop' into feature/fix_download_file 2020-04-15 16:52:40 +02:00
Benoit Marty 1981d2e9ac
Merge pull request #1233 from vector-im/feature/fix_local_echo_no_update
Fix / sending event not always updating
2020-04-15 16:51:16 +02:00
Benoit Marty 9fe32fe915 Change password: hide the preference (as Riot-Web does) if it is not possible to change the password. 2020-04-15 16:39:05 +02:00
Benoit Marty 85493b7532 Code review: use isInvalidPassword() extension everywhere. Also be robust if the Fragment is destroyed 2020-04-15 16:38:44 +02:00
onurays dbabe0232f Do not override the default timeout. 2020-04-15 16:38:44 +02:00
onurays dfc8e8ec4c AccountService is created. 2020-04-15 16:38:44 +02:00
onurays f00db49bda Change password function implemented.
Fixes #528
2020-04-15 16:38:44 +02:00
onurays b4a3eb2cb3 Fix return the exception instead of empty one. 2020-04-15 16:39:41 +03:00
Benoit Marty c57fa3f0d0
Merge pull request #1176 from vector-im/feature/target-sdk-29
Increase targetSdk to 29
2020-04-15 14:32:16 +02:00
Benoit Marty 6639f89a68 Simpler code 2020-04-15 12:53:08 +02:00
Valere f2b684aa9e Fix / user and self signing failing
bad copy paste
2020-04-14 18:23:20 +02:00
Valere 68ca0e9d4b Fix / sending event not always updating 2020-04-14 17:35:11 +02:00
Benoit Marty ef6847671a Import strings from Riot 2020-04-14 17:13:43 +02:00
onurays 190fbb95ec Merge branch 'develop' into feature/target-sdk-29
# Conflicts:
#	vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
2020-04-14 13:59:54 +03:00
onurays 7242cbda40 Catch network errors during file downloading.
Fixes #1229
2020-04-13 17:48:19 +03:00