ericdecanini
5cc7deea4e
Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
# vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
# vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
# vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
# vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
# vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
# vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
# vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt
# vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
# vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
# vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
# vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
# vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
2022-06-03 12:06:23 +02:00
ericdecanini
8af49891ff
Post merge conflict reformatting
2022-05-31 14:23:02 +02:00
ericdecanini
e6e05317e1
Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis
...
# Conflicts:
# matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
# vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
# vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
2022-05-31 14:21:16 +02:00
Benoit Marty
ae94f45f34
Merge pull request #5952 from vector-im/feature/bma/sdk_user_story
...
Sdk user story
2022-05-30 18:30:56 +02:00
Benoit Marty
ad60467ae7
Fix test compilation
2022-05-30 11:38:03 +02:00
Benoit Marty
c7997edf9a
Rename ActiveSpaceFilter to SpaceFilter
2022-05-30 11:34:55 +02:00
Valere
c8b44bfd4c
fix test post rebase
2022-05-27 10:17:40 +02:00
Valere
5735b094ac
post rebase fix
2022-05-25 18:41:37 +02:00
Valere
e1292c03a1
code review
2022-05-25 18:40:33 +02:00
Valere
adb5b4c1b9
Fix closing deactivated accounts in tests
2022-05-25 18:40:33 +02:00
Valere
3332d827f0
rename testHelpers and make constructor private
2022-05-25 18:40:33 +02:00
Valere
29ff4d1e84
use withTestHelpers in sanity tests
2022-05-25 18:40:33 +02:00
Valere
e18402f834
Improve test stability
2022-05-25 18:40:33 +02:00
ericdecanini
8647400dda
Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
2022-05-25 17:35:31 +02:00
Valere
abb335c43d
Improve redaction test
2022-05-25 16:52:56 +02:00
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
ericdecanini
c3209d7049
Manually fixes more formatting issues
2022-05-24 15:31:20 +02:00
ericdecanini
b3fdb5ed17
Changes code style when arrow alignment
2022-05-23 12:57:57 +02:00
ericdecanini
3f3662e605
Changes code style method parameters new line around parentheses to true
2022-05-23 12:30:42 +02:00
Benoit Marty
8d74acf060
Fix post rebase issue
2022-05-20 21:14:42 +02:00
Benoit Marty
ede784684f
Change in KeysBackupService: isEnabled and isStucked are now fun, and state has been renamed to getState and is now a fun.
2022-05-20 21:14:42 +02:00
Benoit Marty
1ab4ae9eac
Extract KeyRef to its own file
2022-05-20 21:14:42 +02: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
