Commit Graph

14625 Commits

Author SHA1 Message Date
ganfra 7c27ce5e88 Merge branch 'release/1.4.6' into main 2022-03-23 16:24:01 +01:00
ganfra 55b1a60f96 Revert "Do not suggest collapse if there is only one section"
This reverts commit 6787980185.
2022-03-23 16:09:05 +01:00
Onuray Sahin 5f74442f57 Reorder functions. 2022-03-23 16:34:45 +03:00
Onuray Sahin f18a107df8 Merge branch 'develop' into feature/ons/live_location_service
* develop: (152 commits)
  Remove exhaustive.
  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
  Code review fixes.
  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
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
#	vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
#	vector/src/main/res/values/strings.xml
2022-03-23 16:25:01 +03:00
Onuray Sahin 96a2bc9ce4 Changelog added. 2022-03-23 15:47:40 +03:00
ganfra 4755ebfa97 Update Changes 2022-03-23 13:38:33 +01:00
Onuray Sahin 3fa4aea506 Navigate to room list when user clicks to the sticky notification. 2022-03-23 15:37:44 +03:00
Adam Brown 55b946a019 fixing the onboarding sanity test failing
- adds tapping the new take me home button within the sanity test
2022-03-23 12:57:53 +01:00
Onuray Sahin 6d0b823b66
Merge pull request #5404 from vector-im/feature/ons/voice_message_scrubbing
Voice Message Playback Scrolling Support
2022-03-23 14:32:58 +03:00
Onuray Sahin 7ead3f93f4 Remove exhaustive. 2022-03-23 13:52:53 +03: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
ganfra 20b2af4432
Merge pull request #5610 from vector-im/feature/adm/account-creation-sanity-test-update
Sanity test getting stuck on account created screen
2022-03-23 11:03:46 +01:00
Benoit Marty d5a89fc4aa
Merge pull request #5599 from vector-im/dependabot/github_actions/actions/cache-3
Bump actions/cache from 2 to 3
2022-03-23 10:23:29 +01:00
Benoit Marty e549ce15af
Merge pull request #5600 from vector-im/dependabot/github_actions/michaelkaye/setup-matrix-synapse-0.4.0
Bump michaelkaye/setup-matrix-synapse from 0.3.0 to 0.4.0
2022-03-23 10:22:39 +01:00
Benoit Marty c6fe084507
Merge pull request #4471 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.0
Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0 - BLOCKED
2022-03-23 10:08:53 +01:00
Adam Brown 5bbc9dc102 fixing the onboarding sanity test failing
- adds tapping the new take me home button within the sanity test
2022-03-23 09:02:37 +00:00
ganfra 951171cb94
Merge pull request #5607 from vector-im/feature/fga/weblate_1.4.6
Feature/fga/weblate 1.4.6
2022-03-22 19:39:00 +01:00
ganfra c06c9ea1d6 Fix lint issues on weblate sync 2022-03-22 18:55:34 +01:00
ganfra 3d3f5444b1
Merge pull request #5606 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2022-03-22 18:11:28 +01:00
Adam Brown fdf3cc36ce 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
2022-03-22 17:01:34 +00:00
ClaireG 6787980185
Do not suggest collapse if there is only one section 2022-03-22 17:31:21 +01:00
Weblate 095f06bd89 Merge branch 'origin/develop' into Weblate. 2022-03-22 15:59:34 +00:00
iaiz 8550db9f23 Translated using Weblate (Spanish)
Currently translated at 95.7% (2065 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
2022-03-22 15:58:54 +00:00
iaiz 707800532f Translated using Weblate (Spanish)
Currently translated at 66.6% (34 of 51 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/es/
2022-03-22 15:58:52 +00:00
Benoit Marty 012cdf4b4d runBlocking -> runTest
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
2022-03-22 16:52:18 +01:00
Benoit Marty 86829008c3 runBlockingTest -> runTest
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
2022-03-22 16:39:39 +01:00
Benoit Marty f791ddb7bb Small cleanup 2022-03-22 16:14:15 +01:00
Benoit Marty 03fee2a131 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
2022-03-22 16:14:15 +01:00
Benoit Marty 97bb5a9abb Also upgrade the coroutine lib 2022-03-22 16:13:06 +01:00
Benoit Marty 57bee40211 Fix compilation warning (exhaustive when) 2022-03-22 16:13:06 +01:00
Benoit Marty 7502158ba9 Fix compilation warning (exhaustive when) 2022-03-22 16:13:06 +01:00
Benoit Marty ed62a2f1c9 Format file (no other change) 2022-03-22 16:13:06 +01:00
Benoit Marty f07c9bf105 Fix compilation warning (exhaustive when) 2022-03-22 16:13:06 +01:00
dependabot[bot] e169c81a2c Bump moshi from 1.12.0 to 1.13.0
Bumps `moshi` from 1.12.0 to 1.13.0.

Updates `moshi-adapters` from 1.12.0 to 1.13.0
- [Release notes](https://github.com/square/moshi/releases)
- [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/moshi/compare/moshi-parent-1.12.0...moshi-parent-1.13.0)

Updates `moshi-kotlin-codegen` from 1.12.0 to 1.13.0
- [Release notes](https://github.com/square/moshi/releases)
- [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/moshi/compare/moshi-parent-1.12.0...moshi-parent-1.13.0)

---
updated-dependencies:
- dependency-name: com.squareup.moshi:moshi-adapters
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.squareup.moshi:moshi-kotlin-codegen
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-22 16:13:06 +01:00
dependabot[bot] 6f55a25a30 Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0
Bumps [kotlin-gradle-plugin](https://github.com/JetBrains/kotlin) from 1.5.31 to 1.6.0.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-22 16:13:06 +01:00
ganfra 073475854e
Merge pull request #5564 from SpiritCroc/timeline-chunk-double-linking
Fix another case of read markers not updating: Ensure proper double linking of TimelineChunks
2022-03-22 15:46:48 +01:00
ganfra 67804da205
Merge pull request #5604 from vector-im/feature/adm/toolbar-icon-positions
Fixing presence icon anchoring to the middle of the room icon
2022-03-22 15:16:17 +01:00
Onuray Sahin 24bdad3ae1 Code review fixes. 2022-03-22 17:04:35 +03:00
ganfra a2f64e7f3c
Merge pull request #5576 from vector-im/feature/aris/thread_labs_notice_users
Threads Migration
2022-03-22 14:57:07 +01:00
Adam Brown 1e6e8b546d 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
2022-03-22 13:43:43 +00:00
ericdecanini 7449d15d2f Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
2022-03-22 14:15:29 +01:00
Onuray Sahin 70c8a8bf34 Support sharing live location in multiple rooms. 2022-03-22 16:01:51 +03:00
ariskotsomitopoulos c6593f0cee PR remarks 2022-03-22 13:57:20 +02:00
Adam Brown 21e46c5840
Merge pull request #5601 from vector-im/dependabot/gradle/org.json-json-20220320
Bump json from 20211205 to 20220320
2022-03-22 11:00:13 +00:00
ariskotsomitopoulos a431d885f0 Increase the thread summaries limit 2022-03-22 11:20:47 +02:00
dependabot[bot] c2e3c63100
Bump json from 20211205 to 20220320
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20211205 to 20220320.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-21 23:09:06 +00:00
dependabot[bot] 13d0b23663
Bump michaelkaye/setup-matrix-synapse from 0.3.0 to 0.4.0
Bumps [michaelkaye/setup-matrix-synapse](https://github.com/michaelkaye/setup-matrix-synapse) from 0.3.0 to 0.4.0.
- [Release notes](https://github.com/michaelkaye/setup-matrix-synapse/releases)
- [Commits](https://github.com/michaelkaye/setup-matrix-synapse/compare/v0.3.0...v0.4.0)

---
updated-dependencies:
- dependency-name: michaelkaye/setup-matrix-synapse
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-21 23:03:32 +00:00
dependabot[bot] 6fd207764d
Bump actions/cache from 2 to 3
Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-21 23:03:30 +00:00
ganfra 794131d274
Merge pull request #5551 from SpiritCroc/local-echo
Fix local echos not being shown when re-opening rooms
2022-03-21 19:24:07 +01:00
Michael Kaye 4a8aeadbcf
Merge pull request #5471 from vector-im/michaelk/ci_script_improvements
CI Script improvements
2022-03-21 15:06:11 +00:00