Commit Graph

22328 Commits

Author SHA1 Message Date
SpiritCroc 5514e38131 Automatic upstream merge postprocessing
Change-Id: Ic86f87376e4f0566c5b6d6ab98539322646caa2b
2022-11-03 09:44:14 +01:00
SpiritCroc fcf2c17ede Automatic color correction
Change-Id: Icee0b22c4513331f3fdf3dae820891be92063e39
2022-11-03 09:44:14 +01:00
SpiritCroc eab87760fe Merge tag 'v1.5.6' into sc
Change-Id: I4c39b35ff50c57cc9894b709a91691fa745cb0a6

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
	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/mapper/RoomSummaryMapper.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
2022-11-03 09:31:58 +01:00
SpiritCroc d6f5aabc46 [TMP] Automatic upstream merge preparation
Change-Id: Id09c56f5fe0b4b9c72ab069f654d5084e83f7660
2022-11-03 09:20:33 +01:00
SpiritCroc 35ffbd2c88 Automatic revert to unchanged upstream strings, pt.1
Change-Id: I000ef490de8964a7b17ddfa70ff5fde8ee7e8ba9
2022-11-03 09:20:32 +01:00
dependabot[bot] bb02209537
Bump checker from 3.11.0 to 3.27.0
Bumps [checker](https://github.com/typetools/checker-framework) from 3.11.0 to 3.27.0.
- [Release notes](https://github.com/typetools/checker-framework/releases)
- [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.11.0...checker-framework-3.27.0)

---
updated-dependencies:
- dependency-name: org.checkerframework:checker
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-02 23:10:39 +00:00
Florian Renaud f34758c67b
Merge pull request #7494 from vector-im/feature/fre/voice_broadcast_seek_to
Voice Broadcast - Add seek bar with basic implementation
2022-11-02 23:30:59 +01:00
Florian Renaud 98e0397afd
Merge pull request #7455 from vector-im/resilience-rc
Merge branch resilience-rc into develop
2022-11-02 18:19:34 +01:00
ganfra 404383e683 Update versions 2022-11-02 17:58:10 +01:00
ganfra 3b2718951b Merge branch 'release/1.5.6' into main 2022-11-02 17:54:23 +01:00
ganfra 2444218b5d Merge branch 'main' into develop 2022-11-02 17:54:23 +01:00
ganfra 8ce9874cdc Update changes 2022-11-02 17:20:06 +01:00
Florian Renaud 481388ed32 Fix line length 2022-11-02 17:06:24 +01:00
Florian Renaud b41346cdce Improve player transitions 2022-11-02 17:06:24 +01:00
Florian Renaud eb61a23bf6 Temporary disable seekBar if playing state is paused or idle 2022-11-02 17:06:24 +01:00
Florian Renaud 7d3f6365e2 Use sum() instead of reduce operator 2022-11-02 17:06:24 +01:00
Florian Renaud bc3fe4e5f6 Minor cleanup 2022-11-02 17:06:24 +01:00
Florian Renaud 9219043579 VoiceBroadcastPlayer - seek implementation 2022-11-02 17:06:24 +01:00
Florian Renaud a851e5aa85 VoiceBroadcastPlayer - Add seek control views 2022-11-02 17:06:23 +01:00
Jorge Martín 5c55a3261f Merge remote-tracking branch 'origin/develop' into resilience-rc 2022-11-02 16:00:34 +01:00
ganfra 546d039805
Merge pull request #7506 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2022-11-02 12:11:08 +01:00
ganfra d954c9eae4
Merge pull request #6195 from vector-im/feature/bma/jitsi_5_1_0
Upgrade Jitsi SDK to 6.2.2
2022-11-02 12:10:25 +01:00
Weblate b73787f585 Merge branch 'origin/develop' into Weblate. 2022-11-02 10:28:26 +00:00
PotLice cd24ea7d60 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (2519 of 2519 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
2022-11-02 10:28:24 +00:00
Nui Harime b87ee907d3 Translated using Weblate (Russian)
Currently translated at 95.1% (2408 of 2531 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2022-11-02 10:28:24 +00:00
Roel ter Maat 64ff184817 Translated using Weblate (Dutch)
Currently translated at 100.0% (2531 of 2531 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
2022-11-02 10:28:24 +00:00
Szimszon 4ca7ee50b8 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2531 of 2531 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
2022-11-02 10:28:23 +00:00
Jiri Grönroos 92f8e08772 Translated using Weblate (Finnish)
Currently translated at 80.8% (2046 of 2531 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
2022-11-02 10:28:23 +00:00
Vri ad4d9ecf44 Translated using Weblate (German)
Currently translated at 100.0% (2531 of 2531 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2022-11-02 10:28:22 +00:00
Florian Renaud dac89add67
Merge pull request #7502 from vector-im/bugfix/fre/voice_broadcast_duplicated_chunks
Voice Broadcast - Fix duplicated chunks in the internal playlist during live broadcasts
2022-11-02 10:53:09 +01:00
Kat Gerasimova b0a15cd10b Add issue automation to tidy Help Wanted
All "good first issue" and "Hacktoberfest" qualify as "Help Wanted" so the label should be added automatically
2022-11-02 09:50:44 +00:00
Maxime NATUREL ac05e757be Small improvement to avoid tou many viewState updates 2022-11-02 09:37:10 +01:00
Maxime NATUREL 52a77e074f Renaming const for feature value 2022-11-02 09:37:10 +01:00
Maxime NATUREL e67cc2b2db Adding unit tests on GetNotificationsStatusUseCase 2022-11-02 09:37:10 +01:00
Maxime NATUREL 62912f891c Introducing a NotificationsStatus to render the push notification toggle in session overview screen 2022-11-02 09:37:10 +01:00
Maxime NATUREL 1acb42f61d Adding use case to check support for new enabled field support 2022-11-02 09:37:10 +01:00
Maxime NATUREL 38fe556978 Adding changelog entry 2022-11-02 09:37:10 +01:00
Amit Kumar b6746653f1
Add metrics plugin to track device download keys task (#7438)
* Add metrics tracking plugin for download device keys

* Add support for multiple metrics plugin

* Update copyright license header in matrix-sdk-android

* Add tests for MetricExtension

* Update changelog

* Improve MetricsExtension and reformatting
2022-11-02 13:43:57 +05:30
SpiritCroc 6a3d000be5 Fix frowning face emoji-only message detection
Change-Id: I9f1d41406feef32d5b83f73ef5759800981ccfbd
2022-11-02 09:10:41 +01:00
SpiritCroc 6c5e72a695 Fix space discovery search icon
Change-Id: I5cbcabd7dfeeabb728af03c2b7e7bcf2b34032f6
2022-11-02 08:37:34 +01:00
Florian Renaud 68062911a9 Changelog 2022-11-01 18:17:23 +01:00
Florian Renaud 20abef26b0 Filter duplicated events in live voice broadcasts 2022-11-01 17:59:59 +01:00
SpiritCroc 99d5107732 Changelog 7501 2022-11-01 15:49:46 +01:00
Kat Gerasimova 646cc7d67d Add issue automation for the VoIP team
Move VoIP issues to VoIP team board
2022-11-01 12:13:38 +00:00
SpiritCroc 411c8c9096 Fix duplicated pills when pills contain other spans
Fixes following issues:
- Duplicated pills if the mention contains an image: https://github.com/SchildiChat/SchildiChat-android/issues/148
- Duplicated pills if these contain underscores: https://github.com/SchildiChat/SchildiChat-android/issues/156
2022-11-01 11:21:27 +01:00
Weblate 2e8b67b670 Merge branch 'origin/develop' into Weblate. 2022-11-01 03:46:58 +00:00
phardyle 178326ce9f Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2531 of 2531 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
2022-11-01 03:46:57 +00:00
Jeff Huang 7acf965cc1 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2531 of 2531 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
2022-11-01 03:46:57 +00:00
PotLice d94b7bd8d8 Translated using Weblate (Chinese (Simplified))
Currently translated at 98.2% (2474 of 2519 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
2022-11-01 03:46:56 +00:00
Peter Vágner 75d82771bf Translated using Weblate (Slovak)
Currently translated at 100.0% (2531 of 2531 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
2022-11-01 03:46:56 +00:00