Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,020 Commits 530 Branches 157 Tags 485 MiB
ed3a201f0b
Commit Graph

17020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ericdecanini
ed3a201f0b Changes directParentName to a list 2022-07-01 13:34:55 +01:00
ericdecanini
cb400b660d Fixes post merge error 2022-06-29 17:07:37 +02:00
ericdecanini
9350053214 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 
# Conflicts:
#	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/database/migration/MigrateSessionTo030.kt
 2022-06-29 17:05:28 +02: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
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
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
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
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
manuroe
65b634fe95 Update the PR process doc to come back to one reviewer 
with optional additional reviewers
 2022-06-28 12:32:01 +02:00
Valere
82e68472dc code review update 2022-06-28 11:28:06 +02:00
Benoit Marty
69920a6e46 Split long line 2022-06-28 09:26:29 +02:00
Maxime NATUREL
af3718d202
Merge pull request #6376 from vector-im/fix/mna/geo-uri-pattern 
[Location Share] - Adding missing prefix "u=" for uncertainty in geo URI (PSF-945)
 2022-06-28 09:24:55 +02:00
dependabot[bot]
0e463875f9
Bump flipper-network-plugin from 0.150.0 to 0.151.1 
Bumps [flipper-network-plugin](https://github.com/facebook/flipper) from 0.150.0 to 0.151.1.
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.150.0...v0.151.1)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-27 23:12:39 +00:00
dependabot[bot]
a8c1214417
Bump flipper from 0.150.0 to 0.151.1 
Bumps [flipper](https://github.com/facebook/flipper) from 0.150.0 to 0.151.1.
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.150.0...v0.151.1)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-27 23:11:59 +00:00
dependabot[bot]
a82ddf5d5c
Bump com.autonomousapps.dependency-analysis from 1.8.0 to 1.9.0 
Bumps com.autonomousapps.dependency-analysis from 1.8.0 to 1.9.0.

---
updated-dependencies:
- dependency-name: com.autonomousapps.dependency-analysis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-27 23:11:43 +00:00
Benoit Marty
a398391908
Merge pull request #6366 from vector-im/feature/ons/poll_view_state_unit_tests 
Poll view state unit tests [PSF-1130]
 2022-06-27 19:59:13 +02:00
Benoit Marty
8679ba9a38 Merge branch 'hotfix/1.4.25' into develop 2022-06-27 18:03:44 +02:00
Benoit Marty
2f8aeb991e Merge hotfix 1.4.25 to develop 2022-06-27 18:03:22 +02:00
Benoit Marty
e0b378e2be Delete all the chunks in one step. 2022-06-27 17:37:04 +02:00
Onuray Sahin
863cc7e0fc Code review fix. 2022-06-27 18:37:03 +03:00
Maxime NATUREL
1df71d31e2 Small improvements in tests 2022-06-27 17:27:27 +02:00
Benoit Marty
d17152cbe2 Delete all the timelineEvents 2022-06-27 17:23:30 +02:00
Maxime NATUREL
5fa3b3f168 Fix pseudo code in comments 2022-06-27 17:18:28 +02:00
Maxime NATUREL
4c3f6db55c Fix code quality issues 2022-06-27 16:39:46 +02:00
Maxime NATUREL
0488ce822f Updating location tracker tests 2022-06-27 16:13:02 +02:00
Benoit Marty
43f4dae62b
Bump android-embedded_fcm_distributor from 2.0.0 to 2.1.1 (#6331) 
* Bump android-embedded_fcm_distributor from 2.0.0 to 2.1.1

Bumps [android-embedded_fcm_distributor](https://github.com/UnifiedPush/android-embedded_fcm_distributor) from 2.0.0 to 2.1.1.
- [Release notes](https://github.com/UnifiedPush/android-embedded_fcm_distributor/releases)
- [Commits](https://github.com/UnifiedPush/android-embedded_fcm_distributor/compare/2.0.0...2.1.1)

---
updated-dependencies:
- dependency-name: com.github.UnifiedPush:android-embedded_fcm_distributor
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix compilation issue

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Benoit Marty <benoit@matrix.org>
 2022-06-27 15:51:53 +02:00
Maxime NATUREL
3b09323ee4 Avoid stopping location service twice 2022-06-27 15:10:54 +02:00