Commit Graph

767 Commits

Author SHA1 Message Date
dependabot[bot] c81866f34e
Bump flipper-realm-android from 2.1.0 to 2.2.0
Bumps [flipper-realm-android](https://github.com/kamgurgul/Flipper-Realm) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/kamgurgul/Flipper-Realm/releases)
- [Commits](https://github.com/kamgurgul/Flipper-Realm/compare/2.1.0...2.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-21 23:41:39 +00:00
Adam Brown a76b6e522b splitting unit and instrumentation test tasks so that we can configure the android plugin testCoverage parameter
- there's a bug that causes the output to be invalid for unit tests
2022-06-21 09:15:27 +01:00
Jorge Martín b5aedd4626 Re-implement lock screen feature using our own implementation. 2022-06-20 17:38:05 +02:00
dependabot[bot] 3db8e0b045
Bump flipper-network-plugin from 0.149.0 to 0.150.0
Bumps [flipper-network-plugin](https://github.com/facebook/flipper) from 0.149.0 to 0.150.0.
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.149.0...v0.150.0)

---
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-17 23:18:10 +00:00
dependabot[bot] a3774c1161
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>
2022-06-16 23:08:07 +00:00
Benoit Marty fe7515761a
Merge pull request #6300 from vector-im/feature/bma/flipper
Setup Flipper
2022-06-16 16:44:05 +02:00
Benoit Marty 16ca26569f
Merge pull request #6228 from vector-im/feature/bma/unifiedPush2
UnifiedPush
2022-06-16 16:09:31 +02:00
Benoit Marty 90f16c6736 Remove unused dep. 2022-06-16 12:16:07 +02:00
Benoit Marty e12103387d Setup Flipper
Move getLastSession() to the SessionManager
Create `DebugService`
Move `logDbUsageInfo()` to `DebugService`
2022-06-15 16:14:20 +02:00
Jorge Martín c204f41bec Try to fix tests, address review comments. 2022-06-15 11:37:50 +02:00
Jorge Martín 64334c3437 Add some tests 2022-06-15 11:34:23 +02:00
Jorge Martín 6fc278eb2b Replace ffmpeg-kit with libopus and libopusenc. 2022-06-15 11:34:23 +02:00
Adam Brown ded7b1e0d0 updating current version 2022-06-14 15:16:56 +01:00
Benoit Marty aac2df85bb Version++ 2022-06-13 14:10:48 +02:00
dependabot[bot] 5689006c81
Bump libphonenumber from 8.12.49 to 8.12.50
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.49 to 8.12.50.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.49...v8.12.50)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-10 13:38:47 +00:00
Benoit Marty 18b49068c1 Change BuildConfig field to a VectorFeature. 2022-06-09 10:18:06 +02:00
Benoit Marty 42811751fb Move `ALLOW_EXTERNAL_UNIFIEDPUSH_DISTRIB` to `defaultConfig` and document it. 2022-06-09 10:16:59 +02:00
sim 7eca405693 Update UnifiedPush libs
Signed-off-by: sim <git@sgougeon.fr>
2022-06-09 10:16:59 +02:00
sim 04b297b261 Add UnifiedPush support 2022-06-09 10:16:59 +02:00
Michael Kaye 10125f4738
Merge pull request #6111 from vector-im/michaelk/sonarqube_fixes
Sonarqube including coverage on each PR.
2022-06-07 09:44:00 +01:00
Benoit Marty 1c73e28226 Version++ 2022-05-31 17:58:09 +02:00
Benoit Marty 0806e7358a
Merge pull request #5780 from ofalvai/dependency-cleanup
Remove unused dependencies
2022-05-30 15:41:10 +02:00
Adam Brown d18e7ad001 Merge branch 'develop' of github.com:vector-im/element-android into michaelk/sonarqube_fixes 2022-05-30 10:07:43 +01:00
dependabot[bot] c6751f00ab
Bump libphonenumber from 8.12.48 to 8.12.49
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.48 to 8.12.49.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.48...v8.12.49)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-27 23:07:12 +00:00
Olivér Falvai 9ce9ad6d3a Merge remote-tracking branch 'origin/develop' into dependency-cleanup 2022-05-26 14:04:39 +02:00
Michael Kaye ba109a486f Update to build scripts to enable sonarqube reporting including coverage. 2022-05-25 13:35:40 +01:00
Adam Brown bec72264cd excluding the gms play-service-location optional transistive dependency for the fdroid variant
- fixes fdroid being unable to compile the project due to a non foss dependency
2022-05-24 10:10:03 +01:00
Olivér Falvai f036d35829 Merge branch 'develop' into dependency-cleanup 2022-05-19 12:27:09 +02:00
Olivér Falvai 388e35e828 Remove even more deps 2022-05-18 14:19:11 +02: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
Benoit Marty adb537006a Remove ShortcutBadger lib and usage (it was dead code) 2022-05-18 09:06:04 +02:00
Benoit Marty 8f7789f269 Version++ 2022-05-17 21:28:11 +02:00
Benoit Marty 480a60a655 Exclude some files from check 2022-05-16 12:23:10 +02:00
Benoit Marty 9e106990c8 Setup knit 2022-05-16 12:23:10 +02:00
Benoit Marty 04cadb94cf
Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21
Bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
2022-05-10 18:23:51 +02:00
Benoit Marty 67cd82385a Fix warning: w: '-Xopt-in' is deprecated and will be removed in a future release, please use -opt-in instead 2022-05-10 16:07:24 +02:00
Benoit Marty 396d13c3f9
Merge pull request #6001 from vector-im/dependabot/gradle/androidx.media-media-1.6.0
Bump media from 1.4.3 to 1.6.0
2022-05-10 09:58:06 +02:00
dependabot[bot] 71b45947cb
Bump emoji2 from 1.0.1 to 1.1.0
Bumps emoji2 from 1.0.1 to 1.1.0.

---
updated-dependencies:
- dependency-name: androidx.emoji2:emoji2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 23:10:49 +00:00
dependabot[bot] 427a548e8b
Bump media from 1.4.3 to 1.6.0
Bumps media from 1.4.3 to 1.6.0.

---
updated-dependencies:
- dependency-name: androidx.media:media
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 23:08:08 +00:00
Benoit Marty 07c22e7a19
Merge pull request #5988 from vector-im/dependabot/gradle/com.arthenica-ffmpeg-kit-audio-4.5.1-1
Bump ffmpeg-kit-audio from 4.5.LTS to 4.5.1-1
2022-05-09 22:04:19 +02:00
Benoit Marty 96b0a3f760
Merge pull request #5986 from vector-im/dependabot/gradle/com.nulab-inc-zxcvbn-1.7.0
Bump zxcvbn from 1.5.2 to 1.7.0
2022-05-09 17:02:10 +02:00
Benoit Marty c9677c8b5a
LTS version 2022-05-09 15:36:20 +02:00
Benoit Marty 9b4c861545
(try to) ensure LTS version will not be removed by mistake 2022-05-09 15:36:10 +02:00
dependabot[bot] d567796928
Bump ffmpeg-kit-audio from 4.5.LTS to 4.5.1-1
Bumps [ffmpeg-kit-audio](https://github.com/tanersener/ffmpeg-kit) from 4.5.LTS to 4.5.1-1.
- [Release notes](https://github.com/tanersener/ffmpeg-kit/releases)
- [Commits](https://github.com/tanersener/ffmpeg-kit/commits)

---
updated-dependencies:
- dependency-name: com.arthenica:ffmpeg-kit-audio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 13:26:46 +00:00
dependabot[bot] 24e36eb8af
Bump zxcvbn from 1.5.2 to 1.7.0
Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.5.2 to 1.7.0.
- [Release notes](https://github.com/nulab/zxcvbn4j/releases)
- [Changelog](https://github.com/nulab/zxcvbn4j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nulab/zxcvbn4j/compare/1.5.2...1.7.0)

---
updated-dependencies:
- dependency-name: com.nulab-inc:zxcvbn
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 13:25:08 +00:00
dependabot[bot] 718516a0c3
Bump lazythreetenbp from 0.9.0 to 0.10.0
Bumps [lazythreetenbp](https://github.com/gabrielittner/lazythreetenbp) from 0.9.0 to 0.10.0.
- [Release notes](https://github.com/gabrielittner/lazythreetenbp/releases)
- [Changelog](https://github.com/gabrielittner/lazythreetenbp/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gabrielittner/lazythreetenbp/compare/0.9.0...0.10.0)

---
updated-dependencies:
- dependency-name: com.gabrielittner.threetenbp:lazythreetenbp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 13:24:03 +00:00
dependabot[bot] 6668814ab6
Bump libphonenumber from 8.12.47 to 8.12.48
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.47 to 8.12.48.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.47...v8.12.48)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-05 23:09:00 +00:00
ganfra 83f8a8f278 Bump version to 1.4.16 2022-05-05 11:34:12 +02:00
dependabot[bot] ed0ef4ad81
Bump libphonenumber from 8.12.46 to 8.12.47
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.46 to 8.12.47.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.46...v8.12.47)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-20 23:08:25 +00:00
Adam Brown 441751a6ec updating release version in preparation for next cycle 2022-04-20 15:03:46 +01:00
Olivér Falvai 2bbecd4cc5 Fix regressions 2022-04-17 11:35:30 +02:00
Olivér Falvai a8bbf29b42 Remove unused dependencies 2022-04-15 22:50:54 +02:00
Maxime NATUREL 9d2c704aef Removing the BuildConfigField 2022-04-13 10:56:20 +02:00
aringenbach 047a45d77f
Add a setting to be able to always appear offline (#5583)
Add a setting to be able to always appear offline
Move presence enabling to a app-only preference
2022-04-12 12:08:56 +02:00
Benoit Marty c849cc5c5d
Merge pull request #5079 from vector-im/feature/bma/konfetti2
WIP and low priority: upgrade konfetti to 2.0.2
2022-04-06 10:00:09 +02:00
Benoit Marty 02401f7f3d Version++ 2022-04-05 22:37:16 +02:00
Benoit Marty a0899477e9 Try with 2.0.2 2022-04-04 15:19:26 +02:00
Benoit Marty 9050c488e4 konfetti 2.0.1
Does not compile
2022-04-04 15:19:26 +02:00
dependabot[bot] 224eb7a968
Bump libphonenumber from 8.12.45 to 8.12.46
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.45 to 8.12.46.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.45...v8.12.46)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-31 23:08:28 +00:00
Benoit Marty 9a2cc1a4c5
Merge pull request #5664 from vector-im/feature/bma/dep_upgrade
Upgrade Jitsi and ktlint
2022-03-31 11:32:14 +02:00
Benoit Marty 587948c1b9 Bump Jitsi lib from 5.0.1 to 5.0.2
https://github.com/jitsi/jitsi-meet-release-notes/blob/master/CHANGELOG-MOBILE-SDKS.md#502-2022-03-29
2022-03-29 18:24:44 +02:00
Benoit Marty 0d2d1339e0 Bump Jitsi lib from 3.10.0 to 5.0.1 2022-03-29 16:29:35 +02:00
ganfra ebee66cfaf Update versions to 1.4.10 2022-03-28 16:37:24 +02:00
ganfra adf2c642da Update versions to 1.4.8 2022-03-23 16:27:36 +01:00
Onuray Sahin c478503c13 Merge branch 'develop' into feature/ons/voice_message_scrubbing
* develop: (429 commits)
  fixing the onboarding sanity test failing - adds tapping the new take me home button within the sanity test
  Fix lint issues on weblate sync
  fixing view model tests not collecting flow results - the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
  Do not suggest collapse if there is only one section
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  runBlocking -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  runBlockingTest -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  Small cleanup
  The `.exhaustive` trick is not needed anymore in Kotlin 1.6.0 https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
  Also upgrade the coroutine lib
  Fix compilation warning (exhaustive when)
  Fix compilation warning (exhaustive when)
  Format file (no other change)
  Fix compilation warning (exhaustive when)
  Bump moshi from 1.12.0 to 1.13.0
  Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0
  fixing presence icon anchoring to the middle of the room icon - creates a secondary verification shield and aligns to the start of the room title when presence is present
  PR remarks
  Increase the thread summaries limit
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
2022-03-23 13:32:36 +03:00
Maxime NATUREL 3547c5acba
Merge pull request #5565 from vector-im/feature/mna/PSF-664-5536-permissions
Live Location Sharing - Background permission
2022-03-18 12:06:30 +01:00
Arnaud Ringenbach d3459d1d3d Use MatrixConfiguration & move presence sync enabled checks out of view 2022-03-17 14:50:15 +01:00
Arnaud Ringenbach 4bcf31e0c2 Add a presence sync enabling build config 2022-03-17 11:43:07 +01:00
Maxime Naturel 9c6cd9f630 Adding build config field 2022-03-15 17:45:26 +01:00
Maxime Naturel 0aaa650ac3 Using flow to show items counter 2022-03-14 11:15:17 +01:00
dependabot[bot] 2d5638baaf
Bump libphonenumber from 8.12.44 to 8.12.45
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.44 to 8.12.45.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.44...v8.12.45)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-10 23:09:19 +00:00
Adam Brown 60bc3b09b7 updating to version 1.4.6 in prep for next release cycle 2022-03-09 16:03:00 +00:00
Onuray Sahin 2c611790db
Merge branch 'develop' into feature/ons/voice_message_scrubbing 2022-03-04 18:03:44 +03:00
Yoan Pintas 6e6b04c57e
Merge pull request #4498 from vector-im/yostyle/fix_strandhogg
Override task affinity to prevent unknown activities running in our app tasks.
2022-03-03 15:05:29 +01:00
Onuray Sahin 243a714586 Remove 3rd party waveform library. 2022-03-02 17:46:09 +03:00
ariskotsomitopoulos ae98185c9d Cleanup enabling threads from buildConfig 2022-02-28 17:39:40 +02:00
Benoit Marty fbd5456360
Merge pull request #5353 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.44
Bump libphonenumber from 8.12.43 to 8.12.44
2022-02-28 09:58:18 +01:00
Benoit Marty 85b59654ae Remove unused strings in build.gradle. Rely on BuildConfig fields only 2022-02-25 13:45:24 +01:00
dependabot[bot] ca56865dd1
Bump libphonenumber from 8.12.43 to 8.12.44
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.43 to 8.12.44.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.43...v8.12.44)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-24 23:10:16 +00:00
Benoit Marty d93199259a Update plugin to generated string with template from `com.likethesalad.android:string-reference:1.2.2` to `com.likethesalad.android:stem-plugin:2.0.0` 2022-02-24 15:25:30 +01:00
Benoit Marty 96c2c6f4a4 Move file config.xml to the module vector-config 2022-02-23 18:10:08 +01:00
Benoit Marty 924a4f8c94
Merge pull request #5309 from vector-im/feature/eric/modules-to-subfolder
#5289:  Moves modules to subfolders under library
2022-02-22 22:58:14 +01:00
Benoit Marty cc77afbf66 Version++ 2022-02-22 21:33:20 +01:00
ericdecanini 4651c45b2f moves multipicker module to library 2022-02-22 19:48:48 +01:00
ericdecanini c1afb3d5d1 moves attachment-viewer module to library 2022-02-22 19:44:30 +01:00
ericdecanini b4ceaefeab moves diff-match-patch module to library 2022-02-22 19:40:17 +01:00
dependabot[bot] 002332496a
Bump libphonenumber from 8.12.42 to 8.12.43
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.42 to 8.12.43.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.42...v8.12.43)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-09 23:11:56 +00:00
ganfra c28a20dce3 Bump versions to 1.4.2 2022-02-09 12:55:33 +01:00
ganfra a6bf921d64 Release: update versions 2022-02-09 11:18:03 +01:00
Aris Kotsomitopoulos 077c0eea98
Revert "AGP 7.1.0" 2022-02-04 12:20:20 +02:00
Benoit Marty aa12a73a05 Version++ 2022-02-03 15:51:04 +01:00
Aris Kotsomitopoulos 3d5f8ed7e7
Merge pull request #4746 from vector-im/feature/aris/threads
Threads P0 Release
2022-02-01 15:58:32 +02:00
Benoit Marty 79b4c76a09
Merge pull request #5082 from vector-im/feature/bma/agp_7_1_0
AGP 7.1.0
2022-02-01 13:57:15 +01:00
Benoit Marty 3a040aaee2
Update vector/build.gradle 2022-01-31 17:17:37 +01:00
dependabot[bot] 3caf81d07e
Bump ucrop from 2.2.7 to 2.2.8-native
Bumps [ucrop](https://github.com/Yalantis/uCrop) from 2.2.7 to 2.2.8-native.
- [Release notes](https://github.com/Yalantis/uCrop/releases)
- [Commits](https://github.com/Yalantis/uCrop/compare/2.2.7...2.2.8-native)

---
updated-dependencies:
- dependency-name: com.github.yalantis:ucrop
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-31 15:22:21 +00:00
ariskotsomitopoulos d509b3324c Merge branch 'develop' into feature/aris/threads 2022-01-31 15:58:12 +02:00
Benoit Marty 7dad08654b Revert "Downgrade the version to 1.3.17 to prepare a corrective release."
This reverts commit 2efa67e587.
2022-01-31 14:53:43 +01:00
Benoit Marty 2efa67e587 Downgrade the version to 1.3.17 to prepare a corrective release. 2022-01-31 14:48:54 +01:00
dependabot[bot] c07b09c727
Bump libphonenumber from 8.12.41 to 8.12.42
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.41 to 8.12.42.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.41...v8.12.42)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-27 23:11:05 +00:00
ariskotsomitopoulos b2a2fe2710 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
#	vector/src/main/res/layout/fragment_timeline.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
2022-01-27 17:11:26 +02:00