Commit graph

353 commits

Author SHA1 Message Date
ariskotsomitopoulos
636474b748 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.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/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
2022-01-18 12:41:40 +02:00
ariskotsomitopoulos
f6067977fe Refactor ThreadMessagingTest 2022-01-17 14:27:30 +02:00
ariskotsomitopoulos
5b786e5749 Remove duplicate RetryTestRule 2022-01-17 14:26:39 +02:00
Benoit Marty
1b24b9d764
Merge pull request #4895 from vector-im/feature/bma/empty_state_key
Avoid allowing null String for state_key.
2022-01-13 12:00:48 +01:00
ariskotsomitopoulos
9d48ecea2f Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	.github/workflows/integration.yml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/composer/MessageComposerViewState.kt
2022-01-12 18:20:50 +02:00
Benoit Marty
f8afe04a3b
Merge pull request #4842 from vector-im/feature/aris/integration_tests_improvement
Trying to fix integration tests
2022-01-12 17:11:16 +01:00
ariskotsomitopoulos
8adeab0ddd - fix lint error 2022-01-11 16:14:26 +02:00
ariskotsomitopoulos
753e3e7519 - fix ktlint format
- Update Threads toolbar UI
2022-01-11 15:31:21 +02:00
Benoit Marty
7581a0b549 Fix test compilation 2022-01-10 18:36:04 +01:00
Benoit Marty
7be01ab7ae Avoid allowing null String for state_key. Should always be an empty String according to the Matrix specification.
There is no functional change, just a change in the SDK API for clarity regarding the Matrix specs.
2022-01-10 17:47:27 +01:00
ariskotsomitopoulos
6503412928 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
2022-01-10 13:26:57 +02:00
ariskotsomitopoulos
0fb26da355 PR Remarks 2022-01-10 11:26:03 +02:00
ariskotsomitopoulos
50e51cbe29 Merge branch 'develop' into feature/aris/threads 2022-01-07 16:36:48 +02:00
ariskotsomitopoulos
ae81f61958 fix integration test 2022-01-07 16:28:58 +02:00
Benoit Marty
37f0ffab8b Fix test compilation issue 2022-01-07 14:46:40 +01:00
Benoit Marty
bcebfff1a2
Merge pull request #4864 from vector-im/feature/aris/linter_github_actions_improvement
Enhance Linter Github Actions Reporting
2022-01-07 14:25:29 +01:00
ariskotsomitopoulos
ac5caccdf9 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/res/menu/menu_timeline.xml
2022-01-07 13:29:43 +02:00
ariskotsomitopoulos
33a4eac7d2 - Fix github actions ktlint reports
- Publish results on PR via commenting
- Support for all modules along with tests
- Code format & emoticons
2022-01-06 00:26:47 +02:00
ariskotsomitopoulos
261030f51e - Fix integration tests (still not perfect while github actions are very very limited for that)
- Split them in msdk and app test along with multiple smaller steps.
- Mark the not working tests with @Ignore so that they will not run neither local or on github actions
- Add user friendly comment on PR to view the results
2022-01-05 23:42:57 +02:00
Benoit Marty
fc7beb7e5f Prefer usage of any or none rather indexOfFirst wherever it is possible 2022-01-05 15:24:20 +01:00
ariskotsomitopoulos
84c537315c Github actions test 2022-01-04 00:38:50 +02:00
ariskotsomitopoulos
ef2c32e2c9 Github actions test 2022-01-04 00:32:39 +02:00
ariskotsomitopoulos
925c1671a6 Add more integrations tests for threads 2022-01-03 21:09:36 +02:00
ariskotsomitopoulos
3ef960c4c3 Update copyright 2022-01-03 19:45:48 +02:00
ariskotsomitopoulos
929cc29f77 Update copyright 2022-01-03 19:18:51 +02:00
ariskotsomitopoulos
e482ef4262 First local thread integration test 2022-01-03 16:51:12 +02:00
ganfra
bf287d1827 Timeline: clean up 2021-12-09 12:35:23 +01:00
ganfra
1e2e9e1070 Timeline: change a bit when postPagination is triggered 2021-12-09 12:26:40 +01:00
ganfra
29a4fd1e41 Timeline: make 3 integration tests passing (also add some suspend method on the timeline) 2021-12-07 21:13:41 +01:00
ganfra
667bf1a848 Tests: fix internal TestMatrix 2021-12-03 12:55:32 +01:00
ganfra
f0ecfbbab2 Tests: TestMatrix should only be used internally by sdk tests 2021-11-30 17:22:50 +01:00
ganfra
51f46d199f Tests: clean after review 2021-11-30 14:15:18 +01:00
ganfra
cfaa7268a8 Tests: clean up a bit 2021-11-26 18:17:28 +01:00
ganfra
ccdeeeab4c Tests: fix timeline tests + some small others 2021-11-26 18:16:27 +01:00
ganfra
1d9da6c7d3 Tests: do some clean-up and fix bunch of them 2021-11-25 12:46:16 +01:00
ganfra
69720ffdd3 Android tests: introduce TestBackgroundDetectionObserver so sync is not cancelled while testing + fix small warnings 2021-11-19 17:18:39 +01:00
ganfra
a24a9b43fa Mavericks 2: make the UT happy. Let SDK exposes MatrixCoroutineDispatchers. 2021-10-12 13:47:32 +02:00
Benoit Marty
647b09739f Fix test compilation 2021-10-04 22:48:43 +02:00
Benoit Marty
d1e9f3131a Big annoying commit: execute command ./gradlew ktlintFormat - Fix "colon-spacing" 2021-10-01 13:31:15 +02:00
Benoit Marty
a1caccbcc8 Big annoying commit: execute command ./gradlew ktlintFormat - Fix "chain-wrapping" 2021-10-01 13:31:15 +02:00
Benoit Marty
2ca3c68611 Big annoying commit: execute command ./gradlew ktlintFormat - Fix "import-ordering" 2021-10-01 13:31:15 +02:00
Benoit Marty
3f7e810f14 Handle change from WorkManager 2.6.0.
https://developer.android.com/jetpack/androidx/releases/work#2.6.0
2021-09-30 12:06:57 +02:00
Valere
94f88c80fc Fix parent relation handling 2021-09-16 09:33:06 +02:00
Benoit Marty
6a1409ba59 Better management of SDK version 2021-09-09 09:55:24 +02:00
Benoit Marty
ffedd6fcfa Fix other warning 2021-09-03 17:02:14 +02:00
Benoit Marty
fc22376050 Ignore warning in test.
There is probably a better way than using the GlobalScope, but I'm not sure how to do it now.
2021-09-03 17:02:14 +02:00
Benoit Marty
377c4e00a3
Merge pull request #3954 from vector-im/dependabot/gradle/com.android.tools.build-gradle-7.0.2
Bump gradle from 4.2.2 to 7.0.2
2021-09-03 12:11:52 +02:00
Valere
1c7e567187 Fix test compilation (autojoin descoped) 2021-09-02 11:56:16 +02:00
Benoit Marty
616e5b17f0 Fix warning
provider#androidx.work.impl.WorkManagerInitializer was tagged at AndroidManifest.xml:16 to remove other declarations but no other declaration present
2021-09-02 09:43:39 +02:00
Valere
69c84a2460 support email invite 2021-08-27 17:30:09 +02:00