Merge branch 'release/0.4.0'

.gitattributes

@@ -1,2 +1,3 @@
 **/snapshots/**/*.png filter=lfs diff=lfs merge=lfs -text
 **/docs/images-lfs/*.png filter=lfs diff=lfs merge=lfs -text
+libraries/mediaupload/impl/src/test/assets/* filter=lfs diff=lfs merge=lfs -text

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,5 +1,5 @@
 name: Bug report for the Element X Android app
-description: Report any issues that you have found with the Element X app. Please [check open issues](https://github.com/vector-im/element-x-android/issues) first, in case it has already been reported.
+description: Report any issues that you have found with the Element X app. Please [check open issues](https://github.com/element-hq/element-x-android/issues) first, in case it has already been reported.
 labels: [T-Defect]
 body:
   - type: markdown

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -5,7 +5,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/vector-im/element-meta/discussions/new?category=ideas).
+        Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/element-hq/element-meta/discussions/new?category=ideas).
   - type: textarea
     id: usecase
     attributes:

.github/dependabot.yml

@@ -13,7 +13,7 @@ updates:
     ignore:
       - dependency-name: "*"
     reviewers:
-      - "vector-im/element-x-android-reviewers"
+      - "element-hq/element-x-android-reviewers"
   # Updates for Gradle dependencies used in the app
   - package-ecosystem: "gradle"
     directory: "/"
@@ -23,4 +23,4 @@ updates:
     ignore:
       - dependency-name: "*"
     reviewers:
-      - "vector-im/element-x-android-reviewers"
+      - "element-hq/element-x-android-reviewers"

.github/pull_request_template.md

@@ -1,4 +1,4 @@
-<!-- Please read [CONTRIBUTING.md](https://github.com/vector-im/element-x-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
+<!-- Please read [CONTRIBUTING.md](https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
 
 ## Type of change
 
@@ -53,9 +53,9 @@ Uncomment this markdown table below and edit the last line `|||`:
 
 - [ ] Changes have been tested on an Android device or Android emulator with API 23
 - [ ] UI change has been tested on both light and dark themes
-- [ ] Accessibility has been taken into account. See https://github.com/vector-im/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
+- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
 - [ ] Pull request is based on the develop branch
-- [ ] Pull request includes a new file under ./changelog.d. See https://github.com/vector-im/element-x-android/blob/develop/CONTRIBUTING.md#changelog
+- [ ] Pull request includes a new file under ./changelog.d. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#changelog
 - [ ] Pull request includes screenshots or videos if containing UI changes
 - [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)
 - [ ] You've made a self review of your PR

.github/workflows/build.yml

@@ -33,12 +33,12 @@ jobs:
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
       - name: Use JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/gradle-build-action@v2.9.0
+        uses: gradle/gradle-build-action@v2.11.1
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Assemble debug APK
@@ -50,7 +50,7 @@ jobs:
         run: ./gradlew :app:assembleDebug -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
       - name: Upload APK APKs
         if: ${{ matrix.variant == 'debug' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: elementx-debug
           path: |

.github/workflows/danger.yml

@@ -11,7 +11,7 @@ jobs:
       - run: |
           npm install --save-dev @babel/plugin-transform-flow-strip-types
       - name: Danger
-        uses: danger/[email protected].0
+        uses: danger/[email protected].1
         with:
           args: "--dangerfile ./tools/danger/dangerfile.js"
         env:

.github/workflows/gradle-wrapper-update.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v1
         # Skip in forks
-        if: github.repository == 'vector-im/element-x-android'
+        if: github.repository == 'element-hq/element-x-android'
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           target-branch: develop

.github/workflows/maestro.yml

@@ -1,11 +1,10 @@
 name: Maestro
 
-# Run this flow only on pull request, and only when the pull request has been approved, to limit our usage of maestro cloud.
-# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-a-workflow-when-a-pull-request-is-approved
+# Run this flow only on pull request, and only when the pull request has the Run-Maestro label, to limit our usage of maestro cloud.
 on:
   workflow_dispatch:
-  pull_request_review:
-    types: [submitted]
+  pull_request:
+    types: [labeled]
 
 # Enrich gradle.properties for CI/CD
 env:
@@ -16,20 +15,25 @@ jobs:
   maestro-cloud:
     name: Maestro test suite
     runs-on: ubuntu-latest
-    if: github.event.review.state == 'approved' || github.event_name == 'workflow_dispatch'
+    if: github.event_name == 'workflow_dispatch' || github.event.label.name == 'Run-Maestro'
     strategy:
       fail-fast: false
     # Allow one per PR.
     concurrency:
       group: ${{ format('maestro-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
+      - name: Remove Run-Maestro label
+        if: ${{ github.event.label.name == 'Run-Maestro' }}
+        uses: actions-ecosystem/action-remove-labels@v1
+        with:
+          labels: Run-Maestro
       - uses: actions/checkout@v4
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         name: Use JDK 17
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options

.github/workflows/nightly.yml

@@ -14,11 +14,11 @@ jobs:
   nightly:
     name: Build and publish nightly bundle to Firebase
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'vector-im/element-x-android' }}
+    if: ${{ github.repository == 'element-hq/element-x-android' }}
     steps:
       - uses: actions/checkout@v4
       - name: Use JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'

.github/workflows/nightlyReports.yml

@@ -15,13 +15,13 @@ jobs:
   nightlyReports:
     name: Create kover report artifact and upload sonar result.
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'vector-im/element-x-android' }}
+    if: ${{ github.repository == 'element-hq/element-x-android' }}
     steps:
       - name: ⏬ Checkout with LFS
         uses: nschloe/[email protected]
 
       - name: Use JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
@@ -37,7 +37,7 @@ jobs:
 
       - name: ✅ Upload kover report
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: kover-results
           path: |
@@ -57,19 +57,19 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Use JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/gradle-build-action@v2.9.0
+        uses: gradle/gradle-build-action@v2.11.1
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Dependency analysis
         run: ./gradlew dependencyCheckAnalyze $CI_GRADLE_ARG_PROPERTIES
       - name: Upload dependency analysis
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: dependency-analysis
           path: build/reports/dependency-check-report.html

.github/workflows/quality.yml

@@ -35,19 +35,19 @@ jobs:
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
       - name: Use JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/gradle-build-action@v2.9.0
+        uses: gradle/gradle-build-action@v2.11.1
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Run code quality check suite
         run: ./gradlew runQualityChecks $CI_GRADLE_ARG_PROPERTIES
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: linting-report
           path: |
@@ -60,7 +60,7 @@ jobs:
           yarn add danger-plugin-lint-report --dev
       - name: Danger lint
         if: always()
-        uses: danger/[email protected].0
+        uses: danger/[email protected].1
         with:
           args: "--dangerfile ./tools/danger/dangerfile-lint.js"
         env:

.github/workflows/recordScreenshots.yml

@@ -2,33 +2,48 @@ name: Record screenshots
 
 on:
   workflow_dispatch:
+  pull_request:
+    types: [ labeled ]
 
 # Enrich gradle.properties for CI/CD
 env:
   GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3584m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.incremental=false -XX:+UseParallelGC
 
 jobs:
   record:
-    name: Record screenshots on branch ${{ github.ref_name }}
+    name: Record screenshots on branch ${{ github.event.pull_request.head.ref || github.ref_name }}
     runs-on: ubuntu-latest
+    if: github.event_name == 'workflow_dispatch' || github.event.label.name == 'Record-Screenshots'
 
     steps:
-      - name: ⏬ Checkout with LFS
+      - name: Remove Record-Screenshots label
+        if: github.event.label.name == 'Record-Screenshots'
+        uses: actions-ecosystem/action-remove-labels@v1
+        with:
+          labels: Record-Screenshots
+      - name: ⏬ Checkout with LFS (PR)
+        if: github.event.label.name == 'Record-Screenshots'
+        uses: nschloe/[email protected]
+        with:
+          persist-credentials: false
+          ref: ${{ github.event.pull_request.head.ref }}
+      - name: ⏬ Checkout with LFS (Branch)
+        if: github.event_name == 'workflow_dispatch'
         uses: nschloe/[email protected]
         with:
           persist-credentials: false
       - name: ☕️ Use JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       # Add gradle cache, this should speed up the process
       - name: Configure gradle
-        uses: gradle/gradle-build-action@v2.9.0
+        uses: gradle/gradle-build-action@v2.11.1
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Record screenshots
-        run: "./.github/workflows/scripts/recordScreenshots.sh"
+        run: ./.github/workflows/scripts/recordScreenshots.sh
         env:
           GITHUB_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
           GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}

.github/workflows/release.yml

@@ -20,20 +20,20 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Use JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/gradle-build-action@v2.9.0
+        uses: gradle/gradle-build-action@v2.11.1
       - name: Create app bundle
         env:
           ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
           ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
           ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
         run: ./gradlew bundleRelease $CI_GRADLE_ARG_PROPERTIES
       - name: Upload bundle as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: elementx-app-bundle-unsigned
           path: |

.github/workflows/scripts/recordScreenshots.sh

@@ -48,6 +48,9 @@ do
   esac
 done
 
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+echo Branch used: $BRANCH
+
 if [[ -z ${TOKEN} ]]; then
   echo "No token specified, either set the env var GITHUB_TOKEN or use the --token option"
   exit 1
@@ -70,8 +73,6 @@ git config user.email "[email protected]"
 git add -A
 git commit -m "Update screenshots"
 
-BRANCH=$(git rev-parse --abbrev-ref HEAD)
-
 echo "Pushing changes"
-git push "https://$TOKEN@github.com/$REPO.git" $BRANCH:refs/heads/$BRANCH
+git push "https://$TOKEN@github.com/$REPO.git" $BRANCH
 echo "Done!"

.github/workflows/sonar.yml

@@ -27,12 +27,12 @@ jobs:
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
       - name: Use JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/gradle-build-action@v2.9.0
+        uses: gradle/gradle-build-action@v2.11.1
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: 🔊 Publish results to Sonar

.github/workflows/sync-localazy.yml

@@ -9,11 +9,11 @@ jobs:
   sync-localazy:
     runs-on: ubuntu-latest
     # Skip in forks
-    if: github.repository == 'vector-im/element-x-android'
+    if: github.repository == 'element-hq/element-x-android'
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
       - name: Setup Localazy

.github/workflows/sync-sas-strings.yml

@@ -0,0 +1,35 @@
+name: Sync SAS strings
+on:
+  workflow_dispatch:
+  schedule:
+    # At 00:00 on every Monday UTC
+    - cron: '0 0 * * 1'
+
+jobs:
+  sync-sas-strings:
+    runs-on: ubuntu-latest
+    # Skip in forks
+    if: github.repository == 'element-hq/element-x-android'
+    # No concurrency required, runs every time on a schedule.
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.9
+      - name: Install Prerequisite dependencies
+        run: |
+          pip install requests
+      - name: Run SAS String script
+        run: ./tools/sas/import_sas_strings.py
+      - name: Create Pull Request for SAS Strings
+        uses: peter-evans/create-pull-request@v5
+        with:
+          commit-message: Sync SAS Strings
+          title: Sync SAS Strings
+          body: |
+            - Update SAS Strings from matrix-doc.
+          branch: sync-sas-strings
+          base: develop
+
+