Commit graph

17663 commits

Author SHA1 Message Date
ericdecanini
4cf97d48c9 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/DefaultAuthenticationService.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
2022-06-29 15:53:22 +02:00
Benoit Marty
e75070be91 Use a DataSrouce instead of a Task and return a non Optional Boolean. 2022-06-29 15:35:00 +02:00
Adam Brown
1361852721 triggering an initial enabled state when using associateContentStateWith and extracts the resetting of errors on content change to an extension 2022-06-29 14:15:39 +01:00
Benoit Marty
a0025bc99b Update after PR review. 2022-06-29 15:05:26 +02:00
Maxime NATUREL
f5d3bcbb94 Sending a reply to a live location share 2022-06-29 15:04:57 +02:00
Maxime NATUREL
0a0eb08de9 Adding changelog entry 2022-06-29 15:04:57 +02:00
Maxime NATUREL
65b949071a Introducing a use case to check if a message can have reply action 2022-06-29 15:04:57 +02:00
Adam Brown
7c0d340bd0 formatting 2022-06-29 13:39:36 +01:00
Adam Brown
80ec0aaf05 removing new password isEnabled check using the isEmail validator, this check is wrong but also not needed due to associateContentStateWith above 2022-06-29 13:39:17 +01:00
Adam Brown
382a936e0a fixing method call grouping 2022-06-29 13:35:02 +01:00
Onuray Sahin
abea68557b
Merge pull request #6350 from vector-im/feature/ons/promote_live_location_labs_flag
Promote live location labs flag [PSF-959]
2022-06-29 15:26:39 +03:00
Benoit Marty
f278e2884a Fix detekt issue. 2022-06-29 14:18:36 +02:00
Benoit Marty
ce718d9370
Merge pull request #6408 from vector-im/dependabot/gradle/com.facebook.soloader-soloader-0.10.4
Bump soloader from 0.10.3 to 0.10.4
2022-06-29 13:20:40 +02:00
Benoit Marty
7c4df42aa8 changelog 2022-06-29 12:24:10 +02:00
Benoit Marty
e91be2b599 Show a loader if all the Room Member are not yet loaded. 2022-06-29 12:19:17 +02:00
ericdecanini
e87d97083f Merge remote-tracking branch 'origin/develop' into bugfix/eric/upgrade-room-deduplication
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
2022-06-29 12:02:34 +02:00
ganfra
1a33f6e094
Merge branch 'develop' into feature/fga/load_room_members_by_chunk 2022-06-29 11:45:52 +02:00
ganfra
7d349bdfc3 Cleanup 2022-06-29 11:38:15 +02:00
ganfra
9233007d97 LoadRoomMembers: add changelog 2022-06-29 11:37:15 +02:00
ganfra
61c5bbc444 LoadRoomMembers: handle room member event a bit more efficiently 2022-06-29 11:35:31 +02:00
ganfra
63f0cce561 LoadRoomMembers: exclude Membership.Leave 2022-06-29 11:34:43 +02:00
ganfra
3a216759a1 LoadRoomMembers: divide by chunk 2022-06-29 11:32:38 +02:00
dependabot[bot]
bbe3613aa6
Bump soloader from 0.10.3 to 0.10.4
Bumps [soloader](https://github.com/facebook/soloader) from 0.10.3 to 0.10.4.
- [Release notes](https://github.com/facebook/soloader/releases)
- [Commits](https://github.com/facebook/soloader/compare/v0.10.3...v0.10.4)

---
updated-dependencies:
- dependency-name: com.facebook.soloader:soloader
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-29 08:33:21 +00:00
Benoit Marty
2a32a780cf
Merge pull request #6399 from vector-im/feature/bma/flipper_version
Avoid multiple PR from Dependabot when Flipper is upgraded.
2022-06-29 10:32:24 +02:00
Benoit Marty
ec65267750
Merge pull request #6403 from vector-im/feature/bma/ci_no_daemon
Try no daemon on CI
2022-06-29 10:32:05 +02:00
Maxime NATUREL
e7a68907f9
Merge pull request #6365 from vector-im/feature/mna/start-lls-from-other-device
[Location sharing] - Stop any active live before starting a new one (PSF-942)
2022-06-29 09:47:26 +02:00
Maxime NATUREL
d112f860a2
Merge pull request #6356 from vector-im/fix/mna/stop-lls-from-other-device
[Location sharing] - Make stop of a live from another device possible (PSF-1060)
2022-06-29 09:45:44 +02:00
dependabot[bot]
93559aee63
Bump google-services from 4.3.10 to 4.3.13
Bumps google-services from 4.3.10 to 4.3.13.

---
updated-dependencies:
- dependency-name: com.google.gms:google-services
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-28 23:07:28 +00:00
Adam Brown
1a986e7437
Merge pull request #6385 from vector-im/dependabot/gradle/com.autonomousapps.dependency-analysis-1.9.0
Bump com.autonomousapps.dependency-analysis from 1.8.0 to 1.9.0
2022-06-28 19:16:25 +01:00
Florian Renaud
69488642f8
Merge pull request #6352 from vector-im/dependabot/gradle/org.jetbrains.dokka-dokka-gradle-plugin-1.7.0
Bump dokka-gradle-plugin from 1.6.21 to 1.7.0
2022-06-28 18:13:52 +02:00
Onuray Sahin
3ec8c77d17 Code review fix. 2022-06-28 17:12:52 +03:00
Benoit Marty
6fda2cc7b3
Merge pull request #6101 from chagai95/native-lookup-fixes
Native lookup fixes
2022-06-28 15:43:35 +02:00
Benoit Marty
e44c9aa126 Try no using the gradle daemon on CI 2022-06-28 15:36:07 +02:00
Benoit Marty
dc63d41c97 Harmonize values of CI_GRADLE_ARG_PROPERTIES 2022-06-28 15:35:04 +02:00
Nui Harime
9941281107 Added translation using Weblate (Rusyn) 2022-06-28 13:31:32 +00:00
Adam Brown
f17129b660 removing unused dependencies and marking soloader and ignored from dependency check (as it's dynamic) 2022-06-28 14:05:01 +01:00
Maxime NATUREL
7b0878daf9 Remove non necessary prefix in logs 2022-06-28 14:49:35 +02:00
Maxime NATUREL
ca7b469d28 Adding changelog entry 2022-06-28 14:36:38 +02:00
Maxime NATUREL
324b3cc68c Updating the unit tests 2022-06-28 14:36:38 +02:00
Maxime NATUREL
c2c58f81d8 Stopping existing active live when starting a new one 2022-06-28 14:36:36 +02:00
Benoit Marty
667db71fb9 Avoid multiple PR from Dependabot when Flipper is upgraded. 2022-06-28 14:27:55 +02:00
Benoit Marty
80b94821a0
Merge pull request #6387 from vector-im/dependabot/gradle/com.facebook.flipper-flipper-network-plugin-0.151.1
Bump flipper-network-plugin from 0.150.0 to 0.151.1
2022-06-28 14:21:59 +02:00
Benoit Marty
87c650bcba
Merge pull request #6386 from vector-im/dependabot/gradle/com.facebook.flipper-flipper-0.151.1
Bump flipper from 0.150.0 to 0.151.1
2022-06-28 14:21:36 +02:00
Benoit Marty
c50c9b9ae8
Merge pull request #6396 from vector-im/feature/manu/pr-optional-2nd-review
Update the PR process doc to come back to one reviewer
2022-06-28 14:20:52 +02:00
Maxime NATUREL
70996655e1 Change context inside the get live summary use case 2022-06-28 14:15:41 +02:00
Maxime NATUREL
8476fba5ff Use a TestDispatcher in the FakeSession 2022-06-28 14:15:00 +02:00
Valere
a2aa0471c5
Merge pull request #6328 from vector-im/feature/bca/verif_resist_no_age
Feature/bca/verif resist no age
2022-06-28 14:13:37 +02:00
Onuray Sahin
2fe03a0016 Code review fixes. 2022-06-28 15:06:42 +03:00
Maxime NATUREL
5b3711b634 Mutualizing mock of asFlow extension 2022-06-28 14:04:50 +02:00
Onuray Sahin
320915e0a1 Code review fixes. 2022-06-28 14:52:01 +03:00