Merge branch 'develop' into feature/nfe/remove_spaces_feedback

# Conflicts:
#	vector/src/main/res/values/strings.xml

.github/ISSUE_TEMPLATE/release.yml

@@ -18,6 +18,7 @@ body:
 
         - [ ] Weblate sync, fix lint issue if any (in a dedicated PR)
         - [ ] Check the update of the store descriptions (using Google Translate if necessary) to ensure that the changes are acceptable to be published to the stores.
+        - [ ] While Weblate is locked, and after the PR from Weblate has been merged, handle all the TODOs in the main `strings.xml` file
         - [ ] Run the script `./tools/release/pushPlayStoreMetaData.sh`. You can check in the GooglePlay console the Activity log to check the effect.
 
         ### Do the release

.github/PULL_REQUEST_TEMPLATE.md

@@ -17,7 +17,17 @@
 
 ## Screenshots / GIFs
 
-<!-- Only if UI have been changed -->
+<!-- Only if UI have been changed
+You can use a table like this to show screenshots comparison.
+Uncomment this markdown table below and edit the last line `|||`:
+|copy screenshot of before here|copy screenshot of after here|
+-->
+
+<!--
+|Before|After|
+|-|-|
+|||
+ -->
 
 ## Tests
 

.github/workflows/build.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Assemble ${{ matrix.target }} debug apk
         run: ./gradlew assemble${{ matrix.target }}Debug $CI_GRADLE_ARG_PROPERTIES --stacktrace
       - name: Upload ${{ matrix.target }} debug APKs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: vector-${{ matrix.target }}-debug
           path: |
@@ -61,7 +61,7 @@ jobs:
       - name: Assemble GPlay unsigned apk
         run: ./gradlew clean assembleGplayRelease $CI_GRADLE_ARG_PROPERTIES  --stacktrace
       - name: Upload Gplay unsigned APKs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: vector-gplay-release-unsigned
           path: |

.github/workflows/nightly.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
           java-version: 11
@@ -43,7 +43,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Start synapse server
-        uses: michaelkaye/setup-matrix-synapse@v0.4.0
+        uses: michaelkaye/setup-matrix-synapse@v1.0.1
         with:
           uploadLogs: true
           httpPort: 8080
@@ -196,7 +196,7 @@ jobs:
             - `[org.matrix.android.sdk.PermalinkParserTest]`<br>${{ steps.get-comment-body-permalink.outputs.permalink }}
           edit-mode: replace
       - name: Upload Test Report Log
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: always()
         with:
           name: integrationtest-error-results
@@ -230,12 +230,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Start synapse server
-        uses: michaelkaye/setup-matrix-synapse@v0.4.0
+        uses: michaelkaye/setup-matrix-synapse@v1.0.1
         with:
           uploadLogs: true
           httpPort: 8080
           disableRateLimiting: true
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
           java-version: '11'
@@ -256,7 +256,7 @@ jobs:
             adb logcat >> emulator.log &
             ./gradlew $CI_GRADLE_ARG_PROPERTIES connectedGplayDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest || (adb pull storage/emulated/0/Pictures/failure_screenshots && exit 1 )
       - name: Upload Test Report Log
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: always()
         with:
           name: uitest-error-results
@@ -269,7 +269,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with: 
           distribution: 'adopt'
           java-version: '11'
@@ -283,7 +283,7 @@ jobs:
             ${{ runner.os }}-gradle-
       - run: ./gradlew allCodeCoverageReport $CI_GRADLE_ARG_PROPERTIES
       - name: Upload Codecov data
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: always()
         with:
           name: codecov-xml
@@ -298,7 +298,7 @@ jobs:
       - codecov-units
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
           java-version: '11'

.github/workflows/quality.yml

@@ -29,7 +29,7 @@ jobs:
           ./gradlew ktlintCheck --continue
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ktlinting-report
           path: |
@@ -109,7 +109,7 @@ jobs:
         run: ./gradlew clean :vector:lint --stacktrace
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: lint-report
           path: |
@@ -142,7 +142,7 @@ jobs:
         run: ./gradlew clean lint${{ matrix.target }}Release --stacktrace
       - name: Upload ${{ matrix.target }} linting report
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: release-lint-report-${{ matrix.target }}
           path: |

.github/workflows/tests.yml

@@ -21,7 +21,7 @@ jobs:
       cancel-in-progress: true
     steps: 
       - uses: actions/checkout@v3 
-      - uses: actions/setup-java@v2 
+      - uses: actions/setup-java@v3 
         with: 
           distribution: 'adopt' 
           java-version: 11 

CHANGES.md

@@ -1,3 +1,52 @@
+Changes in Element v1.4.11 (2022-04-07)
+=======================================
+
+Bugfixes 🐛
+----------
+ - Choosing "leave all rooms and spaces" while leaving Space won't cause leaving DMs in this Space anymore ([#5609](https://github.com/vector-im/element-android/issues/5609))
+
+
+Changes in Element v1.4.10 (2022-04-05)
+=======================================
+
+Features ✨
+----------
+ - Allow scrolling position of Voice Message playback ([#5426](https://github.com/vector-im/element-android/issues/5426))
+ - Users will be able to provide feedback for threads ([#5647](https://github.com/vector-im/element-android/issues/5647))
+ - Update Jitsi lib from 3.10.0 to 5.0.2 ([#5654](https://github.com/vector-im/element-android/issues/5654))
+
+Bugfixes 🐛
+----------
+ - Replace "open settings" button by "disable" action in RageShake dialog if there is no session ([#4445](https://github.com/vector-im/element-android/issues/4445))
+ - Fixes room summaries showing encrypted content after verifying device ([#4867](https://github.com/vector-im/element-android/issues/4867))
+ - Fixes polls being votable after being ended ([#5473](https://github.com/vector-im/element-android/issues/5473))
+ - [Subscribing] Blank display name ([#5497](https://github.com/vector-im/element-android/issues/5497))
+ - Fixes voice call button disappearing in DM rooms with more than 2 members ([#5548](https://github.com/vector-im/element-android/issues/5548))
+ - Add loader in thread list ([#5562](https://github.com/vector-im/element-android/issues/5562))
+ - Fixed key export when overwriting existing files ([#5663](https://github.com/vector-im/element-android/issues/5663))
+
+In development 🚧
+----------------
+ - Adding combined account creation and server selection screen as part of the new FTUE ([#5277](https://github.com/vector-im/element-android/issues/5277))
+ - Finalising FTUE onboarding account creation personalization steps but keeping feature disabled until other parts are complete ([#5519](https://github.com/vector-im/element-android/issues/5519))
+ - Live Location Sharing - Foreground Service and Notification ([#5595](https://github.com/vector-im/element-android/issues/5595))
+ - Send beacon info state event when live location sharing started ([#5651](https://github.com/vector-im/element-android/issues/5651))
+ - Show a banner in timeline while location sharing service is running ([#5660](https://github.com/vector-im/element-android/issues/5660))
+ - Location sharing: adding possibility to choose duration of live sharing ([#5667](https://github.com/vector-im/element-android/issues/5667))
+
+Other changes
+-------------
+ - Improve main timeline thread summary rendering ([#5151](https://github.com/vector-im/element-android/issues/5151))
+ - "Add space" copy is replaced with "create space" in left sliding panel ([#5516](https://github.com/vector-im/element-android/issues/5516))
+ - Flattening the asynchronous onboarding state and passing all errors through the same pipeline ([#5517](https://github.com/vector-im/element-android/issues/5517))
+ - Changed items order in space menu. Changed capitalization for "space" in those items ([#5524](https://github.com/vector-im/element-android/issues/5524))
+ - Permalinks to root thread messages will now navigate you within the thread timeline ([#5567](https://github.com/vector-im/element-android/issues/5567))
+ - Live location sharing: adding way to override feature activation in debug ([#5581](https://github.com/vector-im/element-android/issues/5581))
+ - Adds unit tests around the login with matrix id flow ([#5628](https://github.com/vector-im/element-android/issues/5628))
+ - Setup the plugin org.owasp.dependencycheck ([#5654](https://github.com/vector-im/element-android/issues/5654))
+ - Implement threads beta opt-in mechanism to notify users about threads ([#5692](https://github.com/vector-im/element-android/issues/5692))
+
+
 Changes in Element v1.4.8 (2022-03-28)
 ======================================
 

CONTRIBUTING.md

@@ -144,6 +144,8 @@ Instead, please comment the original string with:
 ```xml
 <!-- TODO TO BE REMOVED -->
 ```
+And add `tools:ignore="UnusedResources"` to the string, to let lint ignore that the string is not used.
+
 The string will be removed during the next sync with Weblate.
 
 ### Accessibility

build.gradle

@@ -21,7 +21,7 @@ buildscript {
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
         classpath "com.likethesalad.android:stem-plugin:2.0.0"
-        classpath 'org.owasp:dependency-check-gradle:7.0.3'
+        classpath 'org.owasp:dependency-check-gradle:7.0.4.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

changelog.d/2396.wip

@@ -0,0 +1 @@
+Adds a new homeserver selection screen when creating an account

changelog.d/5079.misc

@@ -0,0 +1 @@
+Upgrade konfetti lib from 1.3.2 to 2.0.2

changelog.d/5262.bugfix

@@ -0,0 +1 @@
+The string `ftue_auth_carousel_workplace_body` was declared not translatable by mistake

changelog.d/5475.bugfix

@@ -0,0 +1 @@
+Fix some cases where the read marker line would not show up

changelog.d/5481.bugfix

@@ -0,0 +1 @@
+Fix sometimes read marker not properly updating

changelog.d/5554.bugfix

@@ -0,0 +1 @@
+Fix sometimes endless loading timeline

changelog.d/5570.bugfix

@@ -0,0 +1 @@
+Use member name instead of room name in DM creation item

changelog.d/5582.feature

@@ -0,0 +1 @@
+Add a setting to be able to always appear offline

changelog.d/5586.feature

@@ -0,0 +1 @@
+Adds the ability for audio attachments to be played in the timeline

changelog.d/5596.bugfix

@@ -0,0 +1 @@
+Align auto-reporting of decryption errors implementation with web client.

changelog.d/5609.bugfix

@@ -0,0 +1 @@
+Choosing "leave all rooms and spaces" while leaving Space won't cause leaving DMs in this Space anymore

changelog.d/5639.sdk

@@ -0,0 +1 @@
+Include original event in live decryption listeners and update sync status naming to InitialSyncProgressing for clarity.

changelog.d/5659.bugfix

@@ -0,0 +1 @@
+Fix endless loading if the event from a permalink is not found

changelog.d/5697.feature

@@ -0,0 +1 @@
+Live Location Sharing - Send location data

changelog.d/5703.misc

@@ -0,0 +1 @@
+Reduce error logs

changelog.d/5703.sdk

@@ -0,0 +1 @@
+KeysBackupService.getCurrentVersion takes a new type `KeysBackupLastVersionResult` in the callback.

changelog.d/5707.bugfix

@@ -0,0 +1 @@
+Redacted events are no longer visible.

changelog.d/5711.feature

@@ -0,0 +1 @@
+Live Location Sharing - Attach location data to beacon info state event

changelog.d/5719.feature

@@ -0,0 +1 @@
+Do not cancel the current incremental sync request and treatment when the app goes to background

changelog.d/5732.misc

@@ -0,0 +1 @@
+Updates the posthog dev environment url and api key

changelog.d/5735.bugfix

@@ -0,0 +1 @@
+Fixes the onboarding confetti rendering behind the content instead of in-front

fastlane/metadata/android/cs-CZ/changelogs/40104040.txt

@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: vylepšení indikátoru psaní. Opravy různých chyb a vylepšení stability.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases/tag/v1.4.4

fastlane/metadata/android/de-DE/changelogs/40104040.txt

@@ -0,0 +1,2 @@
+Neuer Tippindikator und Bugfixes
+Alle Änderungen: https://github.com/vector-im/element-android/releases/tag/v1.4.4

fastlane/metadata/android/en-US/changelogs/40104100.txt

@@ -0,0 +1,2 @@
+Main changes in this version: Scroll in voice message. Various bug fixes and stability improvements.
+Full changelog: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/en-US/changelogs/40104110.txt

@@ -0,0 +1,2 @@
+Main changes in this version: Various bug fixes and stability improvements.
+Full changelog: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/et/changelogs/40104040.txt

@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: kirjutusteatiste liidese uuendused ning pisiparandused ja stabiilsust parandavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.4.4

fastlane/metadata/android/fa/changelogs/40104040.txt

@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: به‌روز رسانی‌های رابط کاربری نشانگر نوشتن. چندین رفع اشکال و بهبودهای پایداری‌.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.4.4

fastlane/metadata/android/id/changelogs/40104040.txt

@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: pembaruan UI indikator pengetikan. Beberapa perbaikan kutu dan perbaikan stabilitas.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.4.4

fastlane/metadata/android/it-IT/changelogs/40104040.txt

@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: agg.mento indicatore scrittura. Correzioni errori e miglioramenti stabilità.
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.4.4

fastlane/metadata/android/pt-BR/changelogs/40104040.txt

@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: atualizações de UI de indicador de digitação. Vários consertos de bugs e melhorias de estabilidade.
+Changelog completo: https://github.com/vector-im/element-android/releases/tag/v1.4.4

fastlane/metadata/android/sk/changelogs/40104040.txt

@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: aktualizácie používateľského rozhrania indikátora písania. Rôzne opravy chýb a vylepšenia stability.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases/tag/v1.4.4

fastlane/metadata/android/sq/changelogs/40104040.txt

@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: përditësime UI treguesi shtypjeje. Ndreqje të metash të ndryshme dhe përmirësime qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases/tag/v1.4.4

fastlane/metadata/android/sv-SE/changelogs/40104040.txt

@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: gränssnittsuppdateringar för skrivindikator. Diverse buggfixar och stabilitetsförbättringar.
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.4.4

fastlane/metadata/android/uk/changelogs/40104040.txt

@@ -0,0 +1,2 @@
+Основні зміни в цій версії: оновлено індикатор набору. Виправлено різні вади й удосконалено стабільність.
+Вичерпний журнал змін: https://github.com/vector-im/element-android/releases/tag/v1.4.4

fastlane/metadata/android/zh-TW/changelogs/40104040.txt

@@ -0,0 +1,2 @@
+此版本中的主要變動：輸入指示器使用者介面更新。許多臭蟲修復與穩定性改善。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.4.4

library/ui-styles/src/main/res/drawable/bg_shadow_divider.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <gradient
+        android:angle="-90"
+        android:startColor="#00000000"
+        android:endColor="#1A000000"
+        />
+</shape>