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
ae94f45f34
Merge pull request #5952 from vector-im/feature/bma/sdk_user_story
...
Sdk user story
2022-05-30 18:30:56 +02:00
eeaf9fd616
Merge pull request #6129 from vector-im/feature/mna/PSF-1019-user-pins
...
[Location sharing] - Show user live location pins in map view (PSF-1019)
2022-05-30 12:32:09 +02:00
c071dc502e
Create extension `String?.toActiveSpaceOrOrphanRooms()` to reduce noise.
2022-05-30 11:38:31 +02:00
ad60467ae7
Fix test compilation
2022-05-30 11:38:03 +02:00
cffdb7f7a6
Add some Kdoc
2022-05-30 11:38:03 +02:00
5fbcec0c9c
Add some Kdoc
2022-05-30 11:34:55 +02:00
0b6f35b256
Create SpaceFilter.OrphanRooms to improve the API.
...
Not 100% of the side effect. There is probably some (fixed?) bugs here.
2022-05-30 11:34:55 +02:00
c7997edf9a
Rename ActiveSpaceFilter to SpaceFilter
2022-05-30 11:34:55 +02:00
00809027c1
Remove `ActiveSpaceFilter.None`
...
Prefer nullability for API coherency of `RoomSummaryQueryParams`
2022-05-30 11:34:55 +02:00
289f27b738
Add some Kdoc
2022-05-30 11:34:55 +02:00
3442829e11
Remove duplicated lines of code (the same code is done a few lines later)
2022-05-30 11:34:55 +02:00
8843fe0a54
Remove `RoomCategoryFilter.ALL`
...
Prefer nullability for API coherency of `RoomSummaryQueryParams`
2022-05-30 11:34:55 +02:00
8d7a54a6cf
`displayName` default value is now `QueryStringValue.NoCondition`.
...
It was working fine since in the DB we always have a name using `RoomDisplayNameFallbackProvider`, which in our current implementation always return a non empty String.
2022-05-30 11:34:55 +02:00
2b0077b138
Small rework for nicer code
2022-05-30 11:34:55 +02:00
bfdc885d7f
Remove `roomId` from `RoomSummaryQueryParams.Builder()`.
...
Create a new API in RoomService to observe a room summary from a roomId.
2022-05-30 11:34:55 +02:00
49a29fb56f
Always use `roomSummaryQueryParams`, and not directly a `RoomSummaryQueryParams.Builder()`
...
Also format and add some Kdoc
2022-05-30 11:34:55 +02:00
12b3afbc50
Always use `roomSummaryQueryParams`, and not directly a `RoomSummaryQueryParams.Builder()`
...
Also format and add some Kdoc
2022-05-30 11:34:55 +02:00
eeb7d60e59
Merge pull request #5860 from vector-im/feature/eric/replace-search-room-subheader
...
Replaces subtitle in Search Rooms with room context rather than last event
2022-05-30 11:13:10 +02:00
d18e7ad001
Merge branch 'develop' of github.com:vector-im/element-android into michaelk/sonarqube_fixes
2022-05-30 10:07:43 +01:00
ead189a9c7
temporarily ignoring flaky test when ran on the CI
2022-05-30 09:37:39 +01:00
066c540eb7
Filter event id in the DB query for active lives
2022-05-30 10:06:04 +02:00
f707f177d9
Improving mapper tests
2022-05-30 10:03:27 +02:00
a5dc8ec181
Only gets flattenParents if specifically requested
2022-05-27 15:05:39 +02:00
c8b44bfd4c
fix test post rebase
2022-05-27 10:17:40 +02:00
5735b094ac
post rebase fix
2022-05-25 18:41:37 +02:00
e1292c03a1
code review
2022-05-25 18:40:33 +02:00
adb5b4c1b9
Fix closing deactivated accounts in tests
2022-05-25 18:40:33 +02:00
3332d827f0
rename testHelpers and make constructor private
2022-05-25 18:40:33 +02:00
29ff4d1e84
use withTestHelpers in sanity tests
2022-05-25 18:40:33 +02:00
e18402f834
Improve test stability
2022-05-25 18:40:33 +02:00
927f526c6c
Post merge conflict reformatting
2022-05-25 17:35:54 +02:00
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
d7c8abbe98
quick format
2022-05-25 16:52:56 +02:00
abb335c43d
Improve redaction test
2022-05-25 16:52:56 +02:00
136d2e330a
added change log
2022-05-25 16:52:56 +02:00
755da616ed
Fix decrypting redacted event
2022-05-25 16:52:56 +02:00
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
9f4f3f482c
Merge branch 'develop' into michaelk/sonarqube_fixes
2022-05-25 14:22:10 +01:00
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
eda0aa97d0
Fixing code quality issues
2022-05-25 14:11:18 +02:00
33151eef73
Move the default implementation of location sharing service into internal package
2022-05-25 14:05:14 +02:00
8d2debf47e
Adding missing ending dots in comments
2022-05-25 14:05:14 +02:00
1b8440d7c8
Removing unused imports
2022-05-25 14:05:14 +02:00
095cc12e10
Fixing unit tests of the mapper
2022-05-25 14:05:14 +02:00
d9480bb136
Adding todo to add unit tests on aggregation process
2022-05-25 14:05:14 +02:00
5efe26c7dd
Fix code quality issues
2022-05-25 14:05:14 +02:00
c07bc0890f
WIP - unit tests
2022-05-25 14:05:14 +02:00
79212321a2
Deactivate all previous active beacons when receiving one from user
2022-05-25 14:05:12 +02:00
bec3f793f3
Improve query of current running live location shares
2022-05-25 14:04:22 +02:00
ca9591e423
Fix set of userId in aggregation process
2022-05-25 14:04:22 +02:00
3b06f18ccb
Remove unused imports
2022-05-25 14:04:22 +02:00
7a7af40d61
Creation of LocationSharingService to get current users sharing their live locations
2022-05-25 14:04:20 +02:00
c59c5cfb4a
Ignore all tests that have failed during testing.
2022-05-25 12:36:21 +01:00
791d4fb1e8
Improve computation of the work name to limit its length
2022-05-25 11:10:54 +02:00
8864a3cf2c
Using replace instead of keep strategy for the worker
2022-05-25 11:06:02 +02:00
cfdc18d421
Improve code readability in aggregation processor
2022-05-25 11:05:28 +02:00
b081429725
Replace getOrCreate() by get() in worker
2022-05-25 10:59:08 +02:00
c3209d7049
Manually fixes more formatting issues
2022-05-24 15:31:20 +02:00
6c21a6b48d
Separates some method parameters
2022-05-24 15:26:24 +02:00
683a9cdfff
Schedule work during aggregation
2022-05-23 17:34:52 +02:00
47eb7173f0
Creation of a worker to deactivate a live after timeout
2022-05-23 17:34:52 +02:00
d76b93ced3
Adding comment on isActive field
2022-05-23 17:34:51 +02:00
b3fdb5ed17
Changes code style when arrow alignment
2022-05-23 12:57:57 +02:00
3f3662e605
Changes code style method parameters new line around parentheses to true
2022-05-23 12:30:42 +02:00
53c83ab8d8
Add missing punctuation
2022-05-20 21:22:47 +02:00
92d54dc733
Fix compilation issue
2022-05-20 21:14:42 +02:00
b86693580e
`class` with `private constructor` instead of `object`
2022-05-20 21:14:42 +02:00
8218d8f267
Typo: isStucked -> isStuck
2022-05-20 21:14:42 +02:00
8d74acf060
Fix post rebase issue
2022-05-20 21:14:42 +02:00
dc1eba2847
Improve documentation
2022-05-20 21:14:42 +02:00
d92875e3c2
Improve documentation
2022-05-20 21:14:42 +02:00
740acda60b
Please ktlint. Ok, the user story will appear at the end of the doc.
2022-05-20 21:14:42 +02:00
853c0a25bf
Method `onSecretKeyGossip` doe snot have to be in the public interface
2022-05-20 21:14:42 +02:00
ede784684f
Change in KeysBackupService: `isEnabled` and `isStucked` are now fun, and `state` has been renamed to `getState` and is now a fun.
2022-05-20 21:14:42 +02:00
1ab4ae9eac
Extract KeyRef to its own file
2022-05-20 21:14:42 +02:00
d3d17ebbcb
Extract HttpPusher to its own file
2022-05-20 21:14:42 +02:00
768df330b5
Rename `currentThreePid` to `getCurrentThreePid`
2022-05-20 21:14:42 +02:00
e6c8ffd1b8
Change `val` to `fun` on the SDK interfaces.
...
Dokka will generate a better documentation (`Functions` and `Properties` are 2 distinct tab), and for Service it's better to have only `fun`
2022-05-20 21:14:42 +02:00
cfd6456614
Add other user stories (with TODO)
2022-05-20 21:14:42 +02:00
96c825e265
Create _userstories package and add the 2 first user stories
2022-05-20 21:14:42 +02:00
bad62be497
Use Kdoc format, else it's not extracted to the documentation by dokka
2022-05-20 21:14:42 +02:00
85f3592938
PR remarks
2022-05-20 17:03:15 +03:00
1bea28e27a
fix documentation format
2022-05-20 16:03:39 +03:00
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
c958d3a383
Merge branch 'develop' into feature/aris/crypto_replay_attack
2022-05-20 15:43:08 +03:00
7bc880e6bf
Improve documentation
2022-05-20 15:33:29 +03:00
2081e2c45b
Reduce log visibility to verbose
2022-05-20 13:32:55 +03:00
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
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
f5d0663b06
Remove non needed extra spaces
2022-05-20 09:48:17 +02:00
dae0b66c90
PR review
2022-05-20 09:48:05 +02:00
51fe7b9a93
Detekt: Fix OutdatedDocumentation
2022-05-20 09:48:05 +02:00
2a66e03742
Kdoc: remove unnecessary `:`
2022-05-20 09:47:54 +02:00
a4fa65b4fd
Fix linting
2022-05-19 12:37:41 +01:00
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
9adbeb8dd2
Fix import.
2022-05-19 14:04:37 +03:00
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
28c4abb505
Track number of retries of tests, and retry KeysBackupTest
2022-05-19 10:34:38 +01:00
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
ericdecanini
Benoit Marty
Maxime NATUREL
Benoit Marty
Adam Brown
Maxime NATUREL
Valere
Michael Kaye
ariskotsomitopoulos
Onuray Sahin