ericdecanini
927f526c6c
Post merge conflict reformatting
2022-05-25 17:35:54 +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
d7c8abbe98
quick format
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
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
ericdecanini
c3209d7049
Manually fixes more formatting issues
2022-05-24 15:31:20 +02:00
ericdecanini
6c21a6b48d
Separates some method parameters
2022-05-24 15:26:24 +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
ericdecanini
3f3662e605
Changes code style method parameters new line around parentheses to true
2022-05-23 12:30:42 +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
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
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
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
Maxime NATUREL
4ebd1ea138
Fix parsing of location data in non encrypted room
2022-05-18 13:58:42 +02: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
ariskotsomitopoulos
a0a7d3e7f6
Enhance reply attack to prevent DUPLICATED_MESSAGE_INDEX while decrypting the same event
2022-05-17 16:28:30 +03:00
Onuray Sahin
edd35872f3
Fix ending poll power level condition.
2022-05-17 15:44:39 +03:00
Onuray Sahin
4c079cc0ac
Write unit tests for poll end event aggregation.
2022-05-17 14:59:14 +03:00
Benoit Marty
afd2804ed3
Merge branch 'develop' into feature/mna/PSF-884-location-view
2022-05-16 14:42:38 +02: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
26e6d56cf1
Improve doc
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
ariskotsomitopoulos
2e08c07dad
Enhance decryption to prevent DUPLICATED_MESSAGE_INDEX when decrypting the same eventId
...
Improve code format
2022-05-16 13:05:38 +03:00
Benoit Marty
90035de5f2
Merge pull request #6047 from chagai95/add-presence-indicator-busy-and-away
...
add presence indicator busy and away
2022-05-16 11:26:11 +02:00
Maxime NATUREL
4a2310954a
Removing non necessary LiveLocationAggregationProcessor interface
2022-05-16 10:11:14 +02:00
