Olivér Falvai
9ce9ad6d3a
Merge remote-tracking branch 'origin/develop' into dependency-cleanup
2022-05-26 14:04:39 +02:00
Valere
d7c8abbe98
quick format
2022-05-25 16:52:56 +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
Maxime NATUREL
791d4fb1e8
Improve computation of the work name to limit its length
2022-05-25 11:10:54 +02:00
Maxime NATUREL
8864a3cf2c
Using replace instead of keep strategy for the worker
2022-05-25 11:06:02 +02:00
Maxime NATUREL
cfdc18d421
Improve code readability in aggregation processor
2022-05-25 11:05:28 +02:00
Maxime NATUREL
b081429725
Replace getOrCreate() by get() in worker
2022-05-25 10:59:08 +02:00
Maxime NATUREL
683a9cdfff
Schedule work during aggregation
2022-05-23 17:34:52 +02:00
Maxime NATUREL
47eb7173f0
Creation of a worker to deactivate a live after timeout
2022-05-23 17:34:52 +02:00
Maxime NATUREL
d76b93ced3
Adding comment on isActive field
2022-05-23 17:34:51 +02:00
ariskotsomitopoulos
85f3592938
PR remarks
2022-05-20 17:03:15 +03:00
ariskotsomitopoulos
1bea28e27a
fix documentation format
2022-05-20 16:03:39 +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
ariskotsomitopoulos
7bc880e6bf
Improve documentation
2022-05-20 15:33:29 +03:00
ariskotsomitopoulos
2081e2c45b
Reduce log visibility to verbose
2022-05-20 13:32:55 +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
Benoit Marty
dae0b66c90
PR review
2022-05-20 09:48:05 +02:00
Benoit Marty
51fe7b9a93
Detekt: Fix OutdatedDocumentation
2022-05-20 09:48:05 +02:00
Benoit Marty
2a66e03742
Kdoc: remove unnecessary :
2022-05-20 09:47:54 +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
Onuray Sahin
9adbeb8dd2
Fix import.
2022-05-19 14:04:37 +03:00
Onuray Sahin
1605ae1607
Merge branch 'develop' into feature/ons/poll_refactoring
...
* develop: (251 commits)
Space explore rooms screen alignment with design in figma (#5834 )
leaving space aligned with ios (#5942 )
Fix usage of System.currentTimeMillis(). This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
Update TimelinePreviousLastForwardTest.kt
Changelog.d
Rename 'getDomain' to 'getServerName'.
Well-known lookups should not include the port of a server.
Ah it was used in Gplay variant. Anyway I think we can still remove this now.
Fix parsing of location data in non encrypted room
Additionally increment for TimelinePreviousLastForwardTest
Notify other devices of acceptance of verification request
Instead of using a magic number, explicitly test for the events we expect.
Adding comments on some strings and removing non necessary plural
Remove ShortcutBadger lib and usage (it was dead code)
Version++
Fastlane file
Towncrier
Add `.login` to get the username of the PR merger.
Rename folder for the PlayStore
Remove empty translations
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
2022-05-19 13:39:43 +03:00
Olivér Falvai
f036d35829
Merge branch 'develop' into dependency-cleanup
2022-05-19 12:27:09 +02:00
Michael Kaye
28c4abb505
Track number of retries of tests, and retry KeysBackupTest
2022-05-19 10:34:38 +01:00
Michael Kaye
5260e729ac
Merge pull request #6095 from vector-im/michaelk/correct_well_known_behaviour
...
Well known lookups should be to port 443 only.
2022-05-18 16:50:43 +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
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
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
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
