Michael Kaye
94411ed60e
Update TimelinePreviousLastForwardTest.kt
...
Update comments in line with code changes.
2022-05-18 16:34:39 +01:00
Michael Kaye
e66284fbd3
Rename 'getDomain' to 'getServerName'.
...
In the context of matrix IDs, this removes the leading @name: leaving the hostname or hostname and port.
2022-05-18 15:21:33 +01:00
Michael Kaye
7efd41e17a
Well-known lookups should not include the port of a server.
2022-05-18 15:21:12 +01:00
Maxime NATUREL
738ce18a2f
Merge pull request #5989 from vector-im/feature/mna/PSF-884-location-view
...
[Location sharing] - Message for live sharing in timeline (PSF-884)
2022-05-18 15:39:51 +02:00
Benoit Marty
99d4bbe74b
Fix bad copyright
2022-05-18 14:12:44 +02:00
Maxime NATUREL
4ebd1ea138
Fix parsing of location data in non encrypted room
2022-05-18 13:58:42 +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
Onuray Sahin
3bf9ea5b06
Lint fixes.
2022-05-18 14:13:53 +03:00
ariskotsomitopoulos
b9adbb7d60
PR remarks
2022-05-18 14:05:58 +03:00
Onuray Sahin
7ce093e239
Code review fixes.
2022-05-18 13:39:12 +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
ericdecanini
fe27451532
Fixes lint error
2022-05-18 12:09:34 +02:00
Olivér Falvai
2dcc120cf7
Merge remote-tracking branch 'origin/develop' into dependency-cleanup
...
# Conflicts:
# build.gradle
# dependencies.gradle
2022-05-18 11:47:21 +02:00
ericdecanini
61b8053b9b
Moves LoginType to sdk api package
2022-05-18 11:23:34 +02:00
Michael Kaye
f7303789a0
Merge pull request #6025 from vector-im/michaelk/skip_tests_failing_on_ci
...
Improve test handling in CI
2022-05-18 09:51:17 +01:00
SpiritCroc
4f60963741
Merge tag 'v1.4.16' into sc
...
Change-Id: Ibfb03ebf80dc1403fa438a390f609f2201602ba9
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.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/session/room/timeline/DefaultTimeline.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
vector/src/main/res/drawable/ic_settings_root_flair.xml
vector/src/main/res/layout/fragment_timeline.xml
vector/src/main/res/xml/vector_settings_labs.xml
2022-05-18 09:59:01 +02:00
Benoit Marty
8f7789f269
Version++
2022-05-17 21:28:11 +02:00
ariskotsomitopoulos
a0a7d3e7f6
Enhance reply attack to prevent DUPLICATED_MESSAGE_INDEX while decrypting the same event
2022-05-17 16:28:30 +03:00
ericdecanini
6a3044cb2e
Fixes post merge errors
2022-05-17 14:46:02 +02:00
Onuray Sahin
edd35872f3
Fix ending poll power level condition.
2022-05-17 15:44:39 +03:00
ericdecanini
b12549831e
Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
# vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
# vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
# vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
2022-05-17 14:24:35 +02:00
Onuray Sahin
4c079cc0ac
Write unit tests for poll end event aggregation.
2022-05-17 14:59:14 +03:00
Onuray Sahin
00e800459d
Write unit tests for poll response event aggregation.
2022-05-17 14:13:38 +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
afd2804ed3
Merge branch 'develop' into feature/mna/PSF-884-location-view
2022-05-16 14:42:38 +02:00
Onuray Sahin
4065bce47a
Write unit tests for poll start event aggregation.
2022-05-16 15:05:17 +03:00
Benoit Marty
12eb23b198
Merge branch 'develop' into feature/bma/detekt_end_period
2022-05-16 13:14:37 +02:00
Benoit Marty
dcbc85484c
Remove ambiguity
2022-05-16 13:05:26 +02:00
Benoit Marty
0ed647d379
Add missing end period.
2022-05-16 12:25:10 +02:00
Benoit Marty
1eb97f6cb8
Disable the undocumented warnings, there are too many :/
2022-05-16 12:23:10 +02:00
Benoit Marty
dfe75de76e
Add links to the doc (I've finally found a way to do it)
2022-05-16 12:23:10 +02:00
Benoit Marty
26e6d56cf1
Improve doc
2022-05-16 12:23:10 +02:00
Benoit Marty
6f29a7ab94
Also update TextMatrix
2022-05-16 12:23:10 +02:00
Benoit Marty
08c67eaf0e
Remove unecessary indirection
2022-05-16 12:23:10 +02:00
Benoit Marty
3fc4083aca
Make the constructor public
2022-05-16 12:23:10 +02:00
Benoit Marty
11e1fdf332
Remove the deprecated way to create a Matrix object
2022-05-16 12:23:10 +02:00
Benoit Marty
92c0d97110
Rename API
2022-05-16 12:22:18 +02:00
Benoit Marty
7040369529
Add documentation to the class Matrix
2022-05-16 12:22:18 +02:00
