Commit graph

482 commits

Author SHA1 Message Date
Valere
136d2e330a added change log 2022-05-25 16:52:56 +02:00
Valere
755da616ed Fix decrypting redacted event 2022-05-25 16:52:56 +02:00
Valere
52eb48d808
Merge pull request #6077 from vector-im/feature/aris/crypto_replay_attack
Feature/aris/crypto replay attack
2022-05-25 16:20:26 +02:00
Michael Kaye
f5b4e897fa
Merge pull request #6099 from vector-im/michaelk/retry_keys_backup_test
Track number of retries of tests,retry KeysBackupTest, Ignore E2eeSanityTests
2022-05-25 14:16:47 +01:00
ariskotsomitopoulos
85f3592938 PR remarks 2022-05-20 17:03:15 +03:00
ariskotsomitopoulos
e323caa233 Merge branch 'develop' into feature/aris/crypto_replay_attack
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
2022-05-20 15:46:15 +03:00
ariskotsomitopoulos
c958d3a383 Merge branch 'develop' into feature/aris/crypto_replay_attack 2022-05-20 15:43:08 +03:00
Benoit Marty
4094a66f3c
Merge pull request #6084 from vector-im/feature/bma/detekt_outdated_doc
Feature/bma/detekt outdated doc
2022-05-20 12:06:34 +02:00
Benoit Marty
b547a49ab3
Merge pull request #6089 from vector-im/feature/bma/real_fail
Ensure calling 'fail()' is not caught by the Exception handler
2022-05-20 10:33:02 +02:00
Benoit Marty
f5d0663b06 Remove non needed extra spaces 2022-05-20 09:48:17 +02:00
Michael Kaye
a4fa65b4fd Fix linting 2022-05-19 12:37:41 +01:00
Michael Kaye
fe793798fa Ignore E2eeSanityTests.
They fail infrequently, but in a way that takes the entire test framework down,
so ignore them for now and open an issue to fix.
2022-05-19 12:06:54 +01:00
Michael Kaye
28c4abb505 Track number of retries of tests, and retry KeysBackupTest 2022-05-19 10:34:38 +01:00
Michael Kaye
d57841c0d0
Merge pull request #6088 from vector-im/michaelk/fix_forward_pagination_test
In TimelineForwardPaginationTest, explicitly test for the events we expect
2022-05-18 16:50:09 +01:00
Michael Kaye
94411ed60e
Update TimelinePreviousLastForwardTest.kt
Update comments in line with code changes.
2022-05-18 16:34:39 +01:00
Benoit Marty
99d4bbe74b Fix bad copyright 2022-05-18 14:12:44 +02:00
ariskotsomitopoulos
5532e7dfa1 Fix copyright 2022-05-18 14:57:50 +03:00
Michael Kaye
261dadb986 Additionally increment for TimelinePreviousLastForwardTest 2022-05-18 12:37:07 +01:00
ariskotsomitopoulos
b9adbb7d60 PR remarks 2022-05-18 14:05:58 +03:00
Jorge Martín
123ad87eda Notify other devices of acceptance of verification request 2022-05-18 12:31:32 +02:00
Benoit Marty
5c9281bc7e Ensure calling 'fail()' is not caught by the Exception handler 2022-05-18 12:26:09 +02:00
Michael Kaye
5a1545058b Instead of using a magic number, explicitly test for the events we expect.
This permits a clear error when the events are missing / extra and while
not making the test invulnerable to future changes in events, should be
explicit on what's changed.
2022-05-18 11:25:07 +01:00
ariskotsomitopoulos
a0a7d3e7f6 Enhance reply attack to prevent DUPLICATED_MESSAGE_INDEX while decrypting the same event 2022-05-17 16:28:30 +03:00
Michael Kaye
868c33a8b4 Correct var -> val for @get:Rules 2022-05-17 12:12:49 +01:00
Michael Kaye
1f89cfbe44 Lint fixes 2022-05-16 16:55:36 +01:00
Michael Kaye
a19c1d6fbe Make test consistent wiht assert message. 2022-05-16 16:01:21 +01:00
Michael Kaye
096cf9272a Rather than ignore them, put tests on a retry loop.
I'm reliably getting passing tests locally with just these ignores.
2022-05-16 16:01:15 +01:00
Michael Kaye
8950aa38ea Address repeated initializatin of WorkManagerImpl in #5887 2022-05-16 16:01:09 +01:00
Michael Kaye
4ced6ca179 Fix linting error. 2022-05-16 15:59:41 +01:00
Michael Kaye
fa26e2a23e Revert "@Ignore all tests currently failing in CI"
This reverts commit 8d234b4b65a7a899abdeed9c5167a8c09c9af3e0.
2022-05-16 15:59:41 +01:00
Michael Kaye
70682b4931 Increase timeout. Log timeout. 2022-05-16 15:59:41 +01:00
Michael Kaye
78140af3f3 Crypto tests are failing due to slow initialSync. Increase timeout by 60s. 2022-05-16 15:59:41 +01:00
Michael Kaye
e06682dcda @Ignore all tests currently failing in CI 2022-05-16 15:59:41 +01:00
Benoit Marty
6f29a7ab94 Also update TextMatrix 2022-05-16 12:23:10 +02:00
ariskotsomitopoulos
2e08c07dad Enhance decryption to prevent DUPLICATED_MESSAGE_INDEX when decrypting the same eventId
Improve code format
2022-05-16 13:05:38 +03:00
Valere
7d5570fd6f quick format 2022-05-13 09:36:42 +02:00
Valere
8077406cba code review 2022-05-12 18:45:35 +02:00
Valere
5a323db7dc Unignore and improve tests 2022-05-12 18:45:35 +02:00
Valere
b25b30719a Add test to check MSK signature on backup 2022-05-12 18:45:35 +02:00
Valere
546d6fe56d post merge fix 2022-05-11 10:42:02 +02:00
Valere
12ab4787f1 Merge branch 'develop' into feature/bca/crypto_better_key_share 2022-05-10 19:30:52 +02:00
ericdecanini
be0be699e4 Fixes formatting errors in ExportEncryptionTest and VectorBaseActivity 2022-05-06 10:10:25 +02:00
ericdecanini
3fb03e2b2c Reformats project based on editorconfig 2022-05-05 19:10:35 +02:00
Benoit Marty
09e628f227
Merge branch 'develop' into feature/bma/currentTimeMillis 2022-05-04 17:43:03 +02:00
Benoit Marty
6a61e639e0 SDK: Replace usage of System.currentTimeMillis() by a Clock interface (#4562)
Sometimes move to UUID or Random numbers instead.
2022-05-03 15:02:34 +02:00
Benoit Marty
f4b7161db2 Room now exposes methods to get the various Services 2022-04-28 09:37:58 +02:00
Valere
8920ed3de8 Code review 2022-04-27 09:45:26 +02:00
Valere
eaf104495d Cleaning, code review 2022-04-26 17:31:01 +02:00
Valere
effbc47bd3 FIx unit test compilation 2022-04-26 17:30:53 +02:00
Valere
631ea50bde Move some crypto classes to API + cleaning 2022-04-26 17:30:42 +02:00