ericdecanini
9e1235d51f
Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo034.kt
2022-07-20 16:44:33 +02:00
Valere
10b1443fda
add quick test for direct parent name
2022-07-20 12:12:32 +02:00
Valere
309642845e
fix backup looping same keys
2022-07-20 09:57:31 +02:00
Valere
4c554e4e85
fix unused import
2022-07-15 14:18:35 +02:00
Valere
e8bd7ea967
fix olm session proliferation
2022-07-15 14:17:44 +02:00
Jorge Martín
50f8d0a667
Ignore forwardPaginationTest to unblock the CI
2022-07-14 15:42:20 +02:00
Valere
6fd99dc302
resist ConnectivityManager$TooManyRequestsException
2022-07-01 15:56:03 +02:00
Valere
90a4e71b06
update flacky test
2022-07-01 14:30:21 +02:00
Valere
fb5f0cbd00
Fix test compilation
2022-07-01 09:43:17 +02:00
Valere
5a67c39c7f
reuse code for test
2022-07-01 09:43:17 +02:00
Valere
a885ff5e47
Fix test
2022-07-01 09:43:17 +02:00
Valere
8e829c6aad
Add lab flag and more tests
2022-07-01 09:43:17 +02:00
Valere
d9fb58fbcb
Fix tests
2022-07-01 09:42:31 +02:00
ariskotsomitopoulos
df241dbdb8
Fix broken unit test
2022-07-01 09:42:31 +02:00
ariskotsomitopoulos
010cf540b6
Fix broken unit test
2022-07-01 09:42:31 +02:00
Valere
9b8e45ebfe
share keys for history take2
2022-07-01 09:42:31 +02:00
ariskotsomitopoulos
2e88998b05
Add integration tests for shared keys rotation on room history visibility change
2022-07-01 09:42:31 +02:00
ariskotsomitopoulos
3a5b737639
Fix existing E2eeSanityTests to support changes for key history sharing
2022-07-01 09:42:31 +02:00
ariskotsomitopoulos
28dd507a74
Add crypto shared history sanity test
2022-07-01 09:42:31 +02:00
ganfra
b07e0a47e8
Feature/fga/simplify timeline logic ( #6318 )
...
* Sync: delete all previous chunks in case of gappy sync
* Chunk: dont link chunks if we find existing timeline event (keep multiple timeline events in db)
* Timeline : remove some unused code
* Clean and add changelog
* Timeline: set named argument
* Timeline: avoid restarting the timeline when there is a CancellationException due to permalink
* Timeline: add migration to clean up old (broken) chunks
* Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo030.kt
Co-authored-by: Benoit Marty <benoitm@matrix.org>
* Timeline: try to fix test
* ignoring broken instrumentation test in order to release
Co-authored-by: ganfra <francoisg@element.io>
Co-authored-by: Benoit Marty <benoitm@matrix.org>
Co-authored-by: Adam Brown <adampsbrown@gmail.com>
2022-06-21 14:42:50 +01:00
Jorge Martín
b5aedd4626
Re-implement lock screen feature using our own implementation.
2022-06-20 17:38:05 +02:00
Benoit Marty
8238cd7f57
Merge pull request #6319 from vector-im/feature/bma/stateEventQuery
...
Enforce query on state event
2022-06-16 17:13:17 +02:00
Benoit Marty
3557121758
Fix test compilation
2022-06-16 14:13:03 +02:00
Benoit Marty
e12103387d
Setup Flipper
...
Move getLastSession() to the SessionManager
Create `DebugService`
Move `logDbUsageInfo()` to `DebugService`
2022-06-15 16:14:20 +02:00
ericdecanini
6df88fba59
Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/GroupSyncHandler.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.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/InitSyncStepFormatter.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
# vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
2022-06-08 12:59:54 +02:00
Benoit Marty
f62d598b79
Create a SyncService and move some methods from Session there.
...
Merge SyncStatusService to SyncService, and rename some classes
2022-06-08 09:53:33 +02:00
Benoit Marty
c290dd6c1d
Merge branch 'develop' into task/eric/when-arrow-alignment
2022-06-07 23:03:36 +02:00
Michael Kaye
10125f4738
Merge pull request #6111 from vector-im/michaelk/sonarqube_fixes
...
Sonarqube including coverage on each PR.
2022-06-07 09:44:00 +01:00
Michael Kaye
c2ac07b1c9
Fix ktlint error
2022-06-06 18:56:05 +01:00
Michael Kaye
56608d564e
Retry ALL THE THINGS, and always send sonarqube
2022-06-06 17:08:02 +01:00
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
Adam Brown
d18e7ad001
Merge branch 'develop' of github.com:vector-im/element-android into michaelk/sonarqube_fixes
2022-05-30 10:07:43 +01:00
Adam Brown
ead189a9c7
temporarily ignoring flaky test when ran on the CI
2022-05-30 09:37:39 +01: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
