Prevent ConcurrentModificationException

.gitattributes

@@ -1 +0,0 @@
-**/snapshots/**/*.png filter=lfs diff=lfs merge=lfs -text

.github/ISSUE_TEMPLATE/bug.yml

@@ -73,14 +73,3 @@ body:
         - 'No'
     validations:
       required: true
-  - type: dropdown
-    id: pr
-    attributes:
-      label: Are you willing to provide a PR?
-      description:  |
-        Providing a PR can drastically speed up the process of fixing this bug. Don't worry, it's still OK to answer 'No' :).
-      options:
-        - 'Yes'
-        - 'No'
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -34,14 +34,3 @@ body:
       placeholder: Is there anything else you'd like to add?
     validations:
       required: false
-  - type: dropdown
-    id: pr
-    attributes:
-      label: Are you willing to provide a PR?
-      description:  |
-        Don't worry, it's still OK to answer 'No' :).
-      options:
-        - 'Yes'
-        - 'No'
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/release.yml

@@ -21,8 +21,6 @@ body:
         - [ ] 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.
 
-        - [ ] Ensure all [the required PRs](https://github.com/vector-im/element-android/pulls?q=is%3Aopen+is%3Apr+label%3AZ-NextRelease) have been merged
-
         ### Do the release
 
         - [ ] Make sure `develop` and `main` are up to date (git pull)
@@ -31,7 +29,7 @@ body:
         - [ ] Check the rageshake with the current dev version: https://github.com/matrix-org/element-android-rageshakes/labels/1.2.3-dev
         - [ ] Run the integration test, and especially `UiAllScreensSanityTest.allScreensTest()`
         - [ ] Create an account on matrix.org and do some smoke tests that the sanity test does not cover like: 1-1 call, 1-1 video call, Jitsi call for instance
-        - [ ] Run towncrier: `towncrier build --version v1.2.3 --draft` (remove `--draft` do write the file CHANGES.md)
+        - [ ] Run towncrier: `towncrier --version v1.2.3 --draft` (remove `--draft` do write the file CHANGES.md)
         - [ ] Check that the folder `changelog.d` is empty. It can happen that some remaining files stay here
         - [ ] Check the file CHANGES.md consistency. It's possible to reorder items (most important changes first) or change their section if relevant. Also an opportunity to fix some typo, or rewrite things
         - [ ] Add file for fastlane under ./fastlane/metadata/android/en-US/changelogs
@@ -51,34 +49,24 @@ body:
 
         ### Once tested and validated internally
 
-        - [ ] Create a new open testing release on the GooglePlay console and upload the 4 signed Apks.
+        - [ ] Create a new beta release on the GooglePlay console and upload the 4 signed Apks.
         - [ ] Check that the version codes are correct
         - [ ] Copy the fastlane change to the GooglePlay console in the section en-GB.
-        - [ ] Push the open testing release to 100% of the users
-        - [ ] Notify the F-Droid team [here](https://matrix.to/#/!LAAuJLQXYHjMNWKrCK:matrix.org?via=matrix.org&via=bubu1.eu&via=lant.uk) so that they can schedule the publication on F-Droid
-        - [ ] The application is available to the PlayStore testers (live). Google can take between 1 hour and up to 7 days to approve the release.
-        - [ ] The application is available to the F-Droid users.
+        - [ ] Push to beta release to 100% of the users
+        - [ ] Notify the F-Droid team so that they can schedule the publication on F-Droid
 
-        ### Once open testing is live on PlayStore
+        ### Once Live on PlayStore
 
         - [ ] Ping the Android public room and update its topic
+        - [ ] Add an entry in the internal diary
 
-        ### Once Live on F-Droid
-
-        - [ ] Update the Android public room topic
-
-        ### After at least 2 days (generally next Monday)
+        ### After at least 2 days
 
         - [ ] Check the [rageshakes](https://github.com/matrix-org/element-android-rageshakes/issues)
         - [ ] Check the crash reports on the GooglePlay console
         - [ ] Check the Android Element room for any reported issues on the new version
-        - [ ] If all is OK, promote the open testing release to production. Generally using a 100% roll out, but can be a smaller value depending on the release content.
-        - [ ] The application is available to the PlayStore users (live). Google can take (again!) between 1 hour and up to 7 days to approve the release.
-
-        ### Once production is live on PlayStore
-
-        - [ ] Ping the Android public room and update its topic
-        - [ ] Add an entry in the internal diary
+        - [ ] If all is OK, push to production and notify Markus (Bubu) to release the F-Droid version
+        - [ ] Ping the Android public room and update its topic with the new available version
 
         ### Android SDK2
 
@@ -102,20 +90,12 @@ body:
 
         ##### Release on MavenCentral
 
-        - [ ] Checkout the branch `main`
         - [ ] Run the command `./gradlew publish --no-daemon --no-parallel`. You'll need some non-public element to do so
-        - [ ] Run the command `./gradlew closeAndReleaseRepository`. If it is working well, you can jump directly to the final step of this section.
-
-        If `./gradlew closeAndReleaseRepository` fails (for instance, several repositories are waiting to be handled), you have to close and release the repository manually. Do the following steps:
-
         - [ ] Connect to https://s01.oss.sonatype.org
         - [ ] Click on Staging Repositories and check the the files have been uploaded
         - [ ] Click on close
         - [ ] Wait (check Activity tab until step "Repository closed" is displayed)
         - [ ] Click on release. The staging repository will disappear
-
-        Final step
-
         - [ ] Check that the release is available in https://repo1.maven.org/maven2/org/matrix/android/matrix-android-sdk2/ (it can take a few minutes)
 
         ##### Release on GitHub

.github/workflows/build.yml

@@ -7,8 +7,9 @@ on:
 
 # Enrich gradle.properties for CI/CD
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
-  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
+  CI_GRADLE_ARG_PROPERTIES: >
+    -Porg.gradle.jvmargs=-Xmx2g
+    -Porg.gradle.parallel=false
 
 jobs:
   debug:
@@ -34,20 +35,19 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Assemble ${{ matrix.target }} debug apk
-        run: ./gradlew assemble${{ matrix.target }}Debug $CI_GRADLE_ARG_PROPERTIES
+        run: ./gradlew assemble${{ matrix.target }}Debug $CI_GRADLE_ARG_PROPERTIES --stacktrace
       - name: Upload ${{ matrix.target }} debug APKs
         uses: actions/upload-artifact@v3
         with:
           name: vector-${{ matrix.target }}-debug
           path: |
-            vector-app/build/outputs/apk/*/debug/*.apk
+            vector/build/outputs/apk/*/debug/*.apk
 
   release:
     name: Build unsigned GPlay APKs
     runs-on: ubuntu-latest
-    concurrency:
-      group: ${{ github.ref == 'refs/head/main' && format('build-release-apk-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('build-release-apk-develop-{0}', github.sha) || format('build-debug-{0}', github.ref)  }}
-      cancel-in-progress: ${{ github.ref != 'refs/head/main' }}
+    if: github.ref == 'refs/heads/main'
+    # Only runs on main, no concurrency.
     steps:
       - uses: actions/checkout@v3
       - uses: actions/cache@v3
@@ -59,34 +59,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Assemble GPlay unsigned apk
-        run: ./gradlew clean assembleGplayRelease $CI_GRADLE_ARG_PROPERTIES
+        run: ./gradlew clean assembleGplayRelease $CI_GRADLE_ARG_PROPERTIES  --stacktrace
       - name: Upload Gplay unsigned APKs
         uses: actions/upload-artifact@v3
         with:
           name: vector-gplay-release-unsigned
           path: |
-            vector-app/build/outputs/apk/*/release/*.apk
+            vector/build/outputs/apk/*/release/*.apk
 
-  exodus:
-    runs-on: ubuntu-latest
-    needs: release
-    steps:
-      - name: Obtain apk from artifact
-        id: download
-        uses: actions/download-artifact@v3
-        with:
-          name: vector-gplay-release-unsigned
-      - name: Show apks in artifact
-        run: ls -R ${{steps.download.outputs.download-path}}
-      - name: Execute exodus-standalone
-        uses: docker://exodusprivacy/exodus-standalone:latest
-        with:
-          args: /github/workspace/gplay/release/vector-gplay-universal-release-unsigned.apk -j -o /github/workspace/exodus.json
-      - name: Upload exodus json report
-        uses: actions/upload-artifact@v3
-        with:
-          name: exodus.json
-          path: |
-            exodus.json
-      - name: Check for trackers
-        run: "jq -e '.trackers == []' exodus.json > /dev/null || { echo '::error static analysis identified user tracking library' ; exit 1; }"
+# TODO add exodus checks

.github/workflows/danger.yml

@@ -1,20 +0,0 @@
-name: Danger CI
-
-on: [pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    name: Danger
-    steps:
-      - uses: actions/checkout@v3
-      - run: |
-          npm install --save-dev @babel/plugin-transform-flow-strip-types
-      - name: Danger
-        uses: danger/danger-js@11.1.2
-        with:
-          args: "--dangerfile tools/danger/dangerfile.js"
-        env:
-          DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
-          # Fallback for forks
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

@@ -1,8 +1,5 @@
 name: "Validate Gradle Wrapper"
-on:
-  pull_request: { }
-  push:
-    branches: [ main, develop ]
+on: [push, pull_request]
 
 jobs:
   validation:

.github/workflows/nightly.yml

@@ -1,46 +0,0 @@
-name: Build and release nightly APK
-
-on:
-  schedule:
-    # Every nights at 4
-    - cron: "0 4 * * *"
-
-env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
-  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
-
-jobs:
-  nightly:
-    name: Build and publish nightly Gplay APK to Firebase
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.8
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Install towncrier
-        run: |
-          python3 -m pip install towncrier
-      - name: Prepare changelog file
-        run: |
-          mv towncrier.toml towncrier.toml.bak
-          sed 's/CHANGES\.md/CHANGES_NIGHTLY\.md/' towncrier.toml.bak > towncrier.toml
-          rm towncrier.toml.bak
-          yes n | towncrier build --version nightly
-      - name: Build and upload Gplay Nightly APK
-        run: |
-          ./gradlew assembleGplayNightly appDistributionUploadGplayNightly $CI_GRADLE_ARG_PROPERTIES
-        env:
-          ELEMENT_ANDROID_NIGHTLY_KEYID: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_KEYID }}
-          ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD }}
-          ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD }}
-          FIREBASE_TOKEN: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_FIREBASE_TOKEN }}

.github/workflows/post-pr.yml

@@ -10,8 +10,9 @@ on:
 
 # Enrich gradle.properties for CI/CD
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
-  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
+  CI_GRADLE_ARG_PROPERTIES: >
+    -Porg.gradle.jvmargs=-Xmx4g
+    -Porg.gradle.parallel=false
 
 jobs:
 
@@ -28,10 +29,204 @@ jobs:
     steps:
       - run: echo "Run those tests!" # no-op success
         
+  # Run Android Tests
+  integration-tests:
+    name: Matrix SDK - Running Integration Tests
+    needs: should-i-run
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        api-level: [ 28 ]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'adopt'
+          java-version: 11
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v3
+        with:
+          python-version: 3.8
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Start synapse server
+        uses: michaelkaye/setup-matrix-synapse@v1.0.3
+        with:
+          uploadLogs: true
+          httpPort: 8080
+          disableRateLimiting: true
+          public_baseurl: "http://10.0.2.2:8080/"
+      # package: org.matrix.android.sdk.session
+      - name: Run integration tests for  Matrix SDK [org.matrix.android.sdk.session] API[${{ matrix.api-level }}]
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          arch: x86
+          profile: Nexus 5X
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          emulator-build: 7425822
+          script: |
+            adb root
+            adb logcat -c
+            touch emulator-session.log
+            chmod 777 emulator-session.log
+            adb logcat >> emulator-session.log &
+            ./gradlew $CI_GRADLE_ARG_PROPERTIES -Pandroid.testInstrumentationRunnerArguments.package='org.matrix.android.sdk.session' matrix-sdk-android:connectedDebugAndroidTest
+      - name: Read Results [org.matrix.android.sdk.session]
+        if: always()
+        id: get-comment-body-session
+        run: python3 ./tools/ci/render_test_output.py session ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
+      - name: Remove adb logcat
+        if: always()
+        run: pkill -9 adb
+      - name: Run integration tests for  Matrix SDK [org.matrix.android.sdk.account] API[${{ matrix.api-level }}]
+        if: always()
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          arch: x86
+          profile: Nexus 5X
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          emulator-build: 7425822
+          script: |
+            adb root
+            adb logcat -c
+            touch emulator-account.log
+            chmod 777 emulator-account.log
+            adb logcat >> emulator-account.log &
+            ./gradlew $CI_GRADLE_ARG_PROPERTIES  -Pandroid.testInstrumentationRunnerArguments.package='org.matrix.android.sdk.account' matrix-sdk-android:connectedDebugAndroidTest
+      - name: Read Results [org.matrix.android.sdk.account]
+        if: always()
+        id: get-comment-body-account
+        run: python3 ./tools/ci/render_test_output.py account ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
+      - name: Remove adb logcat
+        if: always()
+        run: pkill -9 adb
+      # package: org.matrix.android.sdk.internal
+      - name: Run integration tests for Matrix SDK [org.matrix.android.sdk.internal] API[${{ matrix.api-level }}]
+        if: always()
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          arch: x86
+          profile: Nexus 5X
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          emulator-build: 7425822
+          script: |
+            adb root
+            adb logcat -c
+            touch emulator-internal.log
+            chmod 777 emulator-internal.log
+            adb logcat >> emulator-internal.log &
+            ./gradlew $CI_GRADLE_ARG_PROPERTIES  -Pandroid.testInstrumentationRunnerArguments.package='org.matrix.android.sdk.internal' matrix-sdk-android:connectedDebugAndroidTest
+      - name: Read Results [org.matrix.android.sdk.internal]
+        if: always()
+        id: get-comment-body-internal
+        run: python3 ./tools/ci/render_test_output.py internal ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
+      - name: Remove adb logcat
+        if: always()
+        run: pkill -9 adb
+      # package: org.matrix.android.sdk.ordering
+      - name: Run integration tests for Matrix SDK [org.matrix.android.sdk.ordering] API[${{ matrix.api-level }}]
+        if: always()
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          arch: x86
+          profile: Nexus 5X
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          emulator-build: 7425822
+          script: |
+            adb root
+            adb logcat -c
+            touch emulator-ordering.log
+            chmod 777 emulator-ordering.log
+            adb logcat >> emulator-ordering.log &
+            ./gradlew $CI_GRADLE_ARG_PROPERTIES  -Pandroid.testInstrumentationRunnerArguments.package='org.matrix.android.sdk.ordering' matrix-sdk-android:connectedDebugAndroidTest
+      - name: Read Results [org.matrix.android.sdk.ordering]
+        if: always()
+        id: get-comment-body-ordering
+        run: python3 ./tools/ci/render_test_output.py ordering ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
+      - name: Remove adb logcat
+        if: always()
+        run: pkill -9 adb
+      # package: class PermalinkParserTest
+      - name: Run integration tests for Matrix SDK class [org.matrix.android.sdk.PermalinkParserTest] API[${{ matrix.api-level }}]
+        if: always()
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          arch: x86
+          profile: Nexus 5X
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          emulator-build: 7425822
+          script: |
+            adb root
+            adb logcat -c
+            touch emulator-permalink.log
+            chmod 777 emulator-permalink.log
+            adb logcat >> emulator-permalink.log &
+            ./gradlew $CI_GRADLE_ARG_PROPERTIES  -Pandroid.testInstrumentationRunnerArguments.class='org.matrix.android.sdk.PermalinkParserTest' matrix-sdk-android:connectedDebugAndroidTest
+      - name: Read Results [org.matrix.android.sdk.PermalinkParserTest]
+        if: always()
+        id: get-comment-body-permalink
+        run: python3 ./tools/ci/render_test_output.py permalink ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
+      - name: Remove adb logcat
+        if: always()
+        run: pkill -9 adb
+      # package: class PermalinkParserTest
+      - name: Find Comment
+        if: always() && github.event_name == 'pull_request'
+        uses: peter-evans/find-comment@v2
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: Integration Tests Results
+      - name: Publish results to PR
+        if: always() && github.event_name == 'pull_request'
+        uses: peter-evans/create-or-update-comment@v2
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            ### Matrix SDK
+            ## Integration Tests Results:
+            - `[org.matrix.android.sdk.session]`<br>${{ steps.get-comment-body-session.outputs.session }}
+            - `[org.matrix.android.sdk.account]`<br>${{ steps.get-comment-body-account.outputs.account }}
+            - `[org.matrix.android.sdk.internal]`<br>${{ steps.get-comment-body-internal.outputs.internal }}
+            - `[org.matrix.android.sdk.ordering]`<br>${{ steps.get-comment-body-ordering.outputs.ordering }}
+            - `[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@v3
+        if: always()
+        with:
+          name: integrationtest-error-results
+          path: |
+            emulator-permalink.log
+            emulator-internal.log
+            emulator-ordering.log
+            emulator-account.log
+            emulator-session.log
+
   ui-tests:
     name: UI Tests (Synapse)
     needs: should-i-run
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: macos-latest
     strategy:
       fail-fast: false
       matrix:
@@ -40,7 +235,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v3
         with:
           python-version: 3.8
       - uses: actions/cache@v3
@@ -87,13 +282,42 @@ jobs:
             emulator.log
             failure_screenshots/
 
+  codecov-units:
+    name: Unit tests with code coverage
+    needs: should-i-run
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with: 
+          distribution: 'adopt'
+          java-version: '11'
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - run: ./gradlew allCodeCoverageReport $CI_GRADLE_ARG_PROPERTIES
+      - name: Upload Codecov data
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: codecov-xml
+          path: |
+            build/reports/jacoco/allCodeCoverageReport/allCodeCoverageReport.xml
+
 # Notify the channel about delayed failures
   notify:
     name: Notify matrix
     runs-on: ubuntu-latest
     needs:
       - should-i-run
+      - integration-tests
       - ui-tests
+      - codecov-units
     if: always() && (needs.should-i-run.result == 'success' ) && ((needs.codecov-units.result != 'success' ) || (needs.ui-tests.result != 'success') || (needs.integration-tests.result != 'success'))
     # No concurrency required, runs every time on a schedule.
     steps:

.github/workflows/quality.yml

@@ -5,11 +5,6 @@ on:
   push:
     branches: [ main, develop ]
 
-# Enrich gradle.properties for CI/CD
-env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -XX:MaxPermSize=512m -Dkotlin.daemon.jvm.options="-Xmx2g" -Dkotlin.incremental=false
-  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
-
 jobs:
   check:
     name: Project Check Suite
@@ -19,7 +14,7 @@ jobs:
       - name: Run code quality check suite
         run: ./tools/check/check_code_quality.sh
 
-  # Knit for all the modules (https://github.com/Kotlin/kotlinx-knit)
+# Knit for all the modules (https://github.com/Kotlin/kotlinx-knit)
   knit:
     name: Knit
     runs-on: ubuntu-latest
@@ -27,68 +22,158 @@ jobs:
       - uses: actions/checkout@v3
       - name: Run knit
         run: |
-          ./gradlew knitCheck $CI_GRADLE_ARG_PROPERTIES
+          ./gradlew knit
 
-  # Check the project: ktlint, detekt, lint
-  lint:
-    name: Android Linter
+# ktlint for all the modules
+  ktlint:
+    name: Kotlin Linter
     runs-on: ubuntu-latest
     # Allow all jobs on main and develop. Just one per PR.
     concurrency:
-      group: ${{ github.ref == 'refs/heads/main' && format('lint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('lint-develop-{0}', github.sha) || format('lint-{0}', github.ref) }}
+      group: ${{ github.ref == 'refs/heads/main' && format('ktlint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('ktlint-develop-{0}', github.sha) || format('ktlint-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v3
       - name: Run ktlint
         run: |
-          ./gradlew ktlintCheck $CI_GRADLE_ARG_PROPERTIES --continue
-      - name: Run detekt
-        if: always()
-        run: |
-          ./gradlew detekt $CI_GRADLE_ARG_PROPERTIES
-      - name: Run lint
-        # Not always, if ktlint or detekt fail, avoid running the long lint check.
-        run: |
-          ./gradlew vector-app:lintGplayRelease $CI_GRADLE_ARG_PROPERTIES
-          ./gradlew vector-app:lintFdroidRelease $CI_GRADLE_ARG_PROPERTIES
+          ./gradlew ktlintCheck --continue
       - name: Upload reports
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: linting-report
+          name: ktlinting-report
           path: |
-            */build/reports/**/*.*
-      - name: Prepare Danger
+            */build/reports/ktlint/ktlint*/ktlint*.txt
+      - name: Handle Results
         if: always()
+        id: ktlint-results
         run: |
-          npm install --save-dev @babel/core
-          npm install --save-dev @babel/plugin-transform-flow-strip-types
-          yarn add danger-plugin-lint-report --dev
-      - name: Danger lint
-        if: always()
-        uses: danger/danger-js@11.1.2
+          results="$(cat */*/build/reports/ktlint/ktlint*/ktlint*.txt */build/reports/ktlint/ktlint*/ktlint*.txt | sed -r "s/\x1B\[([0-9]{1,3}(;[0-9]{1,2})?)?[mGK]//g")"
+          if [ -z  "$results" ]; then
+            echo "::set-output name=add_comment::false"
+          else
+            body="👎\`Failed${results}\`"
+            body="${body//'%'/'%25'}"
+            body="${body//$'\n'/'%0A'}"
+            body="${body//$'\r'/'%0D'}"
+            body="$( echo $body | sed 's/\/home\/runner\/work\/element-android\/element-android\//\`<br\/>\`/g')"
+            body="$( echo $body | sed 's/\/src\/main\/java\// 🔸 /g')"
+            body="$( echo $body | sed 's/im\/vector\/app\///g')"
+            body="$( echo $body | sed 's/im\/vector\/lib\/attachmentviewer\///g')"
+            body="$( echo $body | sed 's/im\/vector\/lib\/multipicker\///g')"
+            body="$( echo $body | sed 's/im\/vector\/lib\///g')"
+            body="$( echo $body | sed 's/org\/matrix\/android\/sdk\///g')"
+            body="$( echo $body | sed 's/\/src\/androidTest\/java\// 🔸 /g')"
+            echo "::set-output name=add_comment::true"
+            echo "::set-output name=body::$body"
+          fi
+      - name: Find Comment
+        if: always() && github.event_name == 'pull_request'
+        uses: peter-evans/find-comment@v2
+        id: fc
         with:
-          args: "--dangerfile tools/danger/dangerfile-lint.js"
-        env:
-          DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
-          # Fallback for forks
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: Ktlint Results
+      - name: Add comment if needed
+        if: always() && github.event_name == 'pull_request' && steps.ktlint-results.outputs.add_comment == 'true'
+        uses: peter-evans/create-or-update-comment@v2
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            ### Ktlint Results
 
-  # Gradle dependency analysis using https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin
-  dependency-analysis:
-    name: Dependency analysis
+            ${{ steps.ktlint-results.outputs.body }}
+          edit-mode: replace
+      - name: Delete comment if needed
+        if: always() && github.event_name == 'pull_request' && steps.fc.outputs.comment-id != '' && steps.ktlint-results.outputs.add_comment == 'false'
+        uses: actions/github-script@v3
+        with:
+          script: |
+            github.issues.deleteComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: ${{ steps.fc.outputs.comment-id }}
+            })
+
+# Lint for main module
+  android-lint:
+    name: Android Linter
     runs-on: ubuntu-latest
     # Allow all jobs on main and develop. Just one per PR.
     concurrency:
-      group: ${{ github.ref == 'refs/heads/main' && format('dep-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('dep-develop-{0}', github.sha) || format('dep-{0}', github.ref) }}
+      group: ${{ github.ref == 'refs/heads/main' && format('android-lint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('android-lint-develop-{0}', github.sha) || format('android-lint-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v3
-      - name: Dependency analysis
-        run: ./gradlew dependencyCheckAnalyze $CI_GRADLE_ARG_PROPERTIES
-      - name: Upload dependency analysis
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Lint analysis
+        run: ./gradlew clean :vector:lint --stacktrace
+      - name: Upload reports
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: dependency-analysis
-          path: build/reports/dependency-check-report.html
+          name: lint-report
+          path: |
+            vector/build/reports/*.*
+
+# Lint for Gplay and Fdroid release APK
+  apk-lint:
+    name: Lint APK (${{ matrix.target }})
+    runs-on: ubuntu-latest
+    if: github.ref != 'refs/heads/main'
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [ Gplay, Fdroid ]
+    # Allow all jobs on develop. Just one per PR.
+    concurrency:
+      group: ${{ github.ref == 'refs/heads/develop' && format('apk-lint-develop-{0}-{1}', matrix.target, github.sha) || format('apk-lint-{0}-{1}', matrix.target, github.ref) }}
+      cancel-in-progress: true
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Lint ${{ matrix.target }} release
+        run: ./gradlew clean lint${{ matrix.target }}Release --stacktrace
+      - name: Upload ${{ matrix.target }} linting report
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: release-lint-report-${{ matrix.target }}
+          path: |
+            vector/build/reports/*.*
+
+  detekt:
+    name: Detekt Analysis
+    runs-on: ubuntu-latest
+    # Allow all jobs on main and develop. Just one per PR.
+    concurrency:
+      group: ${{ github.ref == 'refs/heads/main' && format('detekt-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('detekt-develop-{0}', github.sha) || format('detekt-{0}', github.ref) }}
+      cancel-in-progress: true
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run detekt
+        run: |
+          ./gradlew detekt
+      - name: Upload reports
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: detekt-report
+          path: |
+            */build/reports/detekt/detekt.html

.github/workflows/sonarqube.yml

@@ -0,0 +1,81 @@
+name: Sonarqube nightly
+
+on:
+  schedule:
+    - cron: '0 20 * * *'
+
+# Enrich gradle.properties for CI/CD
+env:
+  CI_GRADLE_ARG_PROPERTIES: >
+    -Porg.gradle.jvmargs=-Xmx4g
+    -Porg.gradle.parallel=false
+jobs:
+  codecov-units:
+    name: Unit tests with code coverage
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with: 
+          distribution: 'adopt'
+          java-version: '11'
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - run: ./gradlew allCodeCoverageReport $CI_GRADLE_ARG_PROPERTIES
+      - name: Upload Codecov data
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: codecov-xml
+          path: |
+            build/reports/jacoco/allCodeCoverageReport/allCodeCoverageReport.xml
+
+  sonarqube:
+    name: Sonarqube upload
+    runs-on: ubuntu-latest
+    needs:
+      - codecov-units
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - uses: actions/download-artifact@v3
+        with:
+          name: codecov-xml # will restore to allCodeCoverageReport.xml by default; we restore to the same location in following tasks
+      - run: mkdir -p build/reports/jacoco/allCodeCoverageReport/
+      - run: mv allCodeCoverageReport.xml build/reports/jacoco/allCodeCoverageReport/
+      - run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
+        env:
+          ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
+
+# Notify the channel about sonarqube failures
+  notify:
+    name: Notify matrix
+    runs-on: ubuntu-latest
+    needs:
+      - sonarqube
+      - codecov-units
+    if: always() && (needs.sonarqube.result != 'success' || needs.codecov-units.result != 'success') 
+    steps:
+      - uses: michaelkaye/matrix-hookshot-action@v1.0.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          hookshot_url: ${{ secrets.ELEMENT_ANDROID_HOOKSHOT_URL }}
+          text_template: "Sonarqube run (on ${{ github.ref }}): {{#each job_statuses }}{{#with this }}{{#if completed }}  {{name}} {{conclusion}} at {{completed_at}}, {{/if}}{{/with}}{{/each}}"
+          html_template: "Sonarqube run (on ${{ github.ref }}): {{#each job_statuses }}{{#with this }}{{#if completed }}<br />{{icon conclusion}} {{name}} <font color='{{color conclusion}}'>{{conclusion}} at {{completed_at}} <a href=\"{{html_url}}\">[details]</a></font>{{/if}}{{/with}}{{/each}}"

.github/workflows/sync-from-external-sources.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v3
         with:
           python-version: 3.8
       - name: Install Prerequisite dependencies
@@ -40,7 +40,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v3
         with:
           python-version: 3.8
       - name: Install Prerequisite dependencies

.github/workflows/tests.yml

@@ -1,148 +1,84 @@
 name: Test
 
 on:
-  pull_request: { }
+  pull_request: {}
   push:
-    branches: [ main, develop ]
+    branches: [main, develop]
 
 # Enrich gradle.properties for CI/CD
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
-  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 4 --no-daemon
+  CI_GRADLE_ARG_PROPERTIES: >
+    -Porg.gradle.jvmargs=-Xmx2g
+    -Porg.gradle.parallel=false
 
 jobs:
-  tests:
-    name: Runs all tests
-    runs-on: buildjet-4vcpu-ubuntu-2204
-    strategy:
-      matrix:
-        api-level: [28]
+  # Build Android Tests
+  build-android-tests: 
+    name: Build Android Tests 
+    runs-on: ubuntu-latest 
+    concurrency:
+      group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('build-android-tests-{0}', github.ref) }}
+      cancel-in-progress: true
+    steps: 
+      - uses: actions/checkout@v3 
+      - uses: actions/setup-java@v3 
+        with: 
+          distribution: 'adopt' 
+          java-version: 11 
+      - uses: actions/cache@v3 
+        with: 
+          path: | 
+            ~/.gradle/caches 
+            ~/.gradle/wrapper 
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} 
+          restore-keys: | 
+            ${{ runner.os }}-gradle- 
+      - name: Build Android Tests  
+        run: ./gradlew clean assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES --stacktrace 
+ 
+  unit-tests:
+    name: Run Unit Tests
+    runs-on: ubuntu-latest
     # Allow all jobs on main and develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('unit-tests-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/cache@v3
         with:
-          lfs: true
-          fetch-depth: 0
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'adopt'
-          java-version: '11'
-      - uses: gradle/gradle-build-action@v2
-
-      - name: Run screenshot tests
-        run: ./gradlew verifyScreenshots $CI_GRADLE_ARG_PROPERTIES
-
-      - name: Archive Screenshot Results on Error
-        if: failure()
-        uses: actions/upload-artifact@v3
-        with:
-          name: screenshot-results
           path: |
-            **/out/failures/
-            **/build/reports/tests/*UnitTest/
-
-      - uses: actions/setup-python@v4
-        with:
-          python-version: 3.8
-      - uses: michaelkaye/setup-matrix-synapse@v1.0.3
-        with:
-          uploadLogs: true
-          httpPort: 8080
-          disableRateLimiting: true
-          public_baseurl: "http://10.0.2.2:8080/"
-
-      - name: Run all the codecoverage tests at once
-        uses: reactivecircus/android-emulator-runner@v2
-        # continue-on-error: true
-        with:
-          api-level: ${{ matrix.api-level }}
-          arch: x86
-          profile: Nexus 5X
-          target: playstore
-          force-avd-creation: false
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: true
-          # emulator-build: 7425822
-          script: |
-            ./gradlew gatherGplayDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES
-            ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
-            ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
-            ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
-      # NB: continue-on-error marks steps.tests.conclusion = 'success' but leaves steps.tests.outcome = 'failure'
-      ### - name: Run all the codecoverage tests at once (retry if emulator failed)
-      ###   uses: reactivecircus/android-emulator-runner@v2
-      ###   if: always() && steps.tests.outcome == 'failure' # don't run if previous step succeeded.
-      ###   with:
-      ###     api-level: 28
-      ###     arch: x86
-      ###     profile: Nexus 5X
-      ###     force-avd-creation: false
-      ###     emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-      ###     disable-animations: true
-      ###     emulator-build: 7425822
-      ###     script: |
-      ###       ./gradlew gatherGplayDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES
-      ###       ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
-      ###       ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
-      ###       ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
-
-      - name: Upload Integration Test Report Log
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: integration-test-error-results
-          path: |
-            */build/outputs/androidTest-results/connected/
-            */build/reports/androidTests/connected/
-
-      # we may have failed a previous step and retried, that's OK
-      - name: Publish results to Sonar
-        env:
-          GITHUB_TOKEN: ${{ secrets.SONARQUBE_GITHUB_API_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
-        if: ${{ always() && env.GITHUB_TOKEN != '' && env.SONAR_TOKEN != '' && env.ORG_GRADLE_PROJECT_SONAR_LOGIN != '' }}
-        run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
-
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Run unit tests
+        run: ./gradlew clean test $CI_GRADLE_ARG_PROPERTIES --stacktrace
       - name: Format unit test results
         if: always()
         run: python3 ./tools/ci/render_test_output.py unit ./**/build/test-results/**/*.xml
+      - name: Publish Unit Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v1
+        if: always() &&
+          github.event.sender.login != 'dependabot[bot]' &&
+          ( github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository )
+        with:
+          files: ./**/build/test-results/**/*.xml
 
-# can't be run on macos due to containers.
-#      - name: Publish Unit Test Results
-#        uses: EnricoMi/publish-unit-test-result-action@v1
-#        if: always() &&
-#          github.event.sender.login != 'dependabot[bot]' &&
-#          ( github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository )
-#        with:
-#          files: ./**/build/test-results/**/*.xml
-
-# Unneeded as part of the test suite above, kept around in case we want to re-enable them.
-#
-#  # Build Android Tests
-#  build-android-tests: 
-#    name: Build Android Tests 
-#    runs-on: ubuntu-latest 
-#    concurrency:
-#      group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('build-android-tests-{0}', github.ref) }}
-#      cancel-in-progress: true
-#    steps: 
-#      - uses: actions/checkout@v3 
-#      - uses: actions/setup-java@v3 
-#        with: 
-#          distribution: 'adopt' 
-#          java-version: 11 
-#      - uses: actions/cache@v3 
-#        with: 
-#          path: | 
-#            ~/.gradle/caches 
-#            ~/.gradle/wrapper 
-#          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} 
-#          restore-keys: | 
-#            ${{ runner.os }}-gradle- 
-#      - name: Build Android Tests  
-#        run: ./gradlew clean assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES
+# Notify the channel about runs against develop or main that have failures, as PRs should have caught these first.
+  notify:
+    runs-on: ubuntu-latest
+    needs:
+      - unit-tests
+      - build-android-tests
+    if: ${{ (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main' ) && failure() }}
+    steps:
+      - uses: michaelkaye/matrix-hookshot-action@v0.3.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          matrix_access_token: ${{ secrets.ELEMENT_ANDROID_NOTIFICATION_ACCESS_TOKEN }}
+          matrix_room_id: ${{ secrets.ELEMENT_ANDROID_INTERNAL_ROOM_ID }}
+          text_template: "Build is broken for ${{ github.ref }}: {{#each job_statuses }}{{#with this }}{{#if completed }}{{name}} {{conclusion}} at {{completed_at}}, {{/if}}{{/with}}{{/each}}"
+          html_template: "Build is broken for ${{ github.ref }}: {{#each job_statuses }}{{#with this }}{{#if completed }}<br />{{icon conclusion }} {{name}} <font color='{{color conclusion }}'>{{conclusion}} at {{completed_at}} <a href=\"{{html_url}}\">[details]</a></font>{{/if}}{{/with}}{{/each}}"
 

.github/workflows/triage-labelled.yml

@@ -9,15 +9,15 @@ jobs:
     name: Add Z-Labs label for features behind labs flags
     runs-on: ubuntu-latest
     if: >
-      contains(github.event.issue.labels.*.name, 'A-Maths') ||
-      contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
-      contains(github.event.issue.labels.*.name, 'A-Polls') ||
-      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
-      contains(github.event.issue.labels.*.name, 'A-Message-Bubbles') ||
-      contains(github.event.issue.labels.*.name, 'Z-IA') ||
-      contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
-      contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
-      contains(github.event.issue.labels.*.name, 'A-Tags')
+        contains(github.event.issue.labels.*.name, 'A-Maths') ||
+        contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
+        contains(github.event.issue.labels.*.name, 'A-Polls') ||
+        contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
+        contains(github.event.issue.labels.*.name, 'A-Message-Bubbles') ||
+        contains(github.event.issue.labels.*.name, 'Z-IA') ||
+        contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
+        contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
+        contains(github.event.issue.labels.*.name, 'A-Tags')
     steps:
       - uses: actions/github-script@v5
         with:
@@ -42,13 +42,20 @@ jobs:
           column-name: "Need info"
           label-name: "X-Needs-Info"
 
-  add_design_issues_to_project:
-    name: X-Needs-Design to Design project board
+  add_priority_design_issues_to_project:
+    name: P1 X-Needs-Design to Design project board
     runs-on: ubuntu-latest
     # Skip in forks
     if: >
       github.repository == 'vector-im/element-android' &&
-      contains(github.event.issue.labels.*.name, 'X-Needs-Design')
+      contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
+      (contains(github.event.issue.labels.*.name, 'S-Critical') &&
+        (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+          contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+        contains(github.event.issue.labels.*.name, 'S-Major') &&
+        contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+        contains(github.event.issue.labels.*.name, 'A11y') &&
+        contains(github.event.issue.labels.*.name, 'O-Frequent'))
     steps:
       - uses: octokit/graphql-action@v2.x
         id: add_to_project
@@ -72,7 +79,7 @@ jobs:
     name: X-Needs-Product to Design project board
     runs-on: ubuntu-latest
     if: >
-      contains(github.event.issue.labels.*.name, 'X-Needs-Product')
+        contains(github.event.issue.labels.*.name, 'X-Needs-Product')
     steps:
       - uses: octokit/graphql-action@v2.x
         id: add_to_project
@@ -98,8 +105,10 @@ jobs:
     # Skip in forks
     if: >
       github.repository == 'vector-im/element-android' &&
-      (contains(github.event.issue.labels.*.name, 'Team: Delight') ||
-       contains(github.event.issue.labels.*.name, 'Z-AppLayout'))
+      (contains(github.event.issue.labels.*.name, 'A-Spaces') ||
+        contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
+        contains(github.event.issue.labels.*.name, 'A-Subspaces') ||
+        contains(github.event.issue.labels.*.name, 'Z-IA'))
     steps:
       - uses: octokit/graphql-action@v2.x
         with:
@@ -142,6 +151,32 @@ jobs:
         env:
           PROJECT_ID: "PN_kwDOAM0swc2KCw"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  move_threads_issues:
+    name: A-Threads to Thread board
+    runs-on: ubuntu-latest
+    # Skip in forks
+    if: >
+      github.repository == 'vector-im/element-android' &&
+      contains(github.event.issue.labels.*.name, 'A-Threads')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!,$contentid:ID!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc0rRA"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
   move_message_bubbles_issues:
     name: A-Message-Bubbles to Message bubbles board
     runs-on: ubuntu-latest
@@ -166,7 +201,7 @@ jobs:
         env:
           PROJECT_ID: "PN_kwDOAM0swc3m-g"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
+ 
   move_ftue_issues:
     name: Z-FTUE to Mobile FTUE board
     runs-on: ubuntu-latest
@@ -223,12 +258,9 @@ jobs:
     # Skip in forks
     if: >
       github.repository == 'vector-im/element-android' &&
-      (contains(github.event.issue.labels.*.name, 'Z-BBQ-Alpha') ||
-        contains(github.event.issue.labels.*.name, 'Z-BBQ-Beta') ||
-        contains(github.event.issue.labels.*.name, 'Z-BBQ-Release') ||
-        contains(github.event.issue.labels.*.name, 'Z-Banquet-Alpha') ||
-        contains(github.event.issue.labels.*.name, 'Z-Banquet-Beta') ||
-        contains(github.event.issue.labels.*.name, 'Z-Banquet-Release'))
+      (contains(github.event.issue.labels.*.name, 'Z-ElementX-Alpha') ||
+        contains(github.event.issue.labels.*.name, 'Z-ElementX-Beta') ||
+        contains(github.event.issue.labels.*.name, 'Z-ElementX'))
     steps:
       - uses: octokit/graphql-action@v2.x
         with:

.github/workflows/triage-priority-bugs.yml

@@ -14,7 +14,10 @@ jobs:
         !contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') &&
         !contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') &&
         !contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') &&
-        !contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification')) &&
+        !contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification') &&
+        !contains(github.event.issue.labels.*.name, 'A-Spaces') &&
+        !contains(github.event.issue.labels.*.name, 'A-Spaces-Settings') &&
+        !contains(github.event.issue.labels.*.name, 'A-Subspaces')) &&
       (contains(github.event.issue.labels.*.name, 'T-Defect') &&
         contains(github.event.issue.labels.*.name, 'S-Critical') &&
         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
@@ -27,7 +30,7 @@ jobs:
       - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:
           project: Android App Team
-          column: Important Issues & Topics (P1)
+          column: P1
           repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   P1_issues_to_crypto_team_workboard:

.github/workflows/validate-lfs.yml

@@ -1,15 +0,0 @@
-name: Validate Git LFS
-
-on: [pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    name: Validate
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          lfs: 'true'
-
-      - run: |
-          ./tools/validate_lfs.sh

.gitignore

@@ -16,10 +16,4 @@
 /fastlane/private
 /fastlane/report.xml
 
-/**/build
-
-# Added by yarn
-/package.json
-/yarn.lock
-/node_modules
-**/out/failures
+/library/build

.idea/dictionaries/bmarty.xml

@@ -40,7 +40,6 @@
       <w>sygnal</w>
       <w>threepid</w>
       <w>uisi</w>
-      <w>unifiedpush</w>
       <w>unpublish</w>
       <w>unwedging</w>
       <w>vctr</w>

.travis.yml

@@ -0,0 +1,18 @@
+# FTR: Configuration on https://travis-ci.org/github/vector-im/element-android/settings
+#
+# - Build only if .travis.yml is present -> On
+# - Limit concurrent jobs                -> Off
+# - Build pushed branches                -> On (build the branch)
+# - Build pushed pull request            -> On (build the PR after auto-merge)
+#
+# - Auto cancel branch builds            -> On
+# - Auto cancel pull request builds      -> On
+
+sudo: false
+
+notifications:
+  email: false
+
+# Just run a simple script here
+script:
+  - ./tools/travis/check_pr.sh

CHANGES.md

@@ -1,504 +1,3 @@
-Changes in Element v1.5.0 (2022-09-23)
-======================================
-
-Features ✨
-----------
- - Deferred DMs - Enable and move the feature to labs settings ([#7180](https://github.com/vector-im/element-android/issues/7180))
-
-Bugfixes 🐛
-----------
- - Fix text margin in QR code view when no display name is set ([#5424](https://github.com/vector-im/element-android/issues/5424))
- - [App Layout] Recents carousel now scrolled to first position when new item added to or moved to this position ([#6776](https://github.com/vector-im/element-android/issues/6776))
- - Fixed problem when room list's scroll did jump after rooms placeholders were replaced with rooms summary items ([#7079](https://github.com/vector-im/element-android/issues/7079))
- - Fixes crash when quickly double clicking FABs in the new app layout ([#7102](https://github.com/vector-im/element-android/issues/7102))
- - Fixes space list and new chat bottom sheets showing too small in New App Layout (especially evident in landscape) ([#7103](https://github.com/vector-im/element-android/issues/7103))
- - [App Layout] Room leaving prompt dialog now waits user to confirm leaving before do so ([#7122](https://github.com/vector-im/element-android/issues/7122))
- - Fix empty verification bottom sheet. ([#7130](https://github.com/vector-im/element-android/issues/7130))
- - [New Layout] Fixes new chat dialog not getting dismissed after selecting its actions ([#7132](https://github.com/vector-im/element-android/issues/7132))
- - Fixes Room List not getting updated when fragment is not in focus ([#7186](https://github.com/vector-im/element-android/issues/7186))
-
-In development 🚧
-----------------
- - Create DM room only on first message - Add a spinner when sending the first message ([#6970](https://github.com/vector-im/element-android/issues/6970))
- - [Device Manager] Filter Other Sessions ([#7045](https://github.com/vector-im/element-android/issues/7045))
- - [Device management] Session details screen ([#7077](https://github.com/vector-im/element-android/issues/7077))
- - Create DM room only on first message - Fix glitch in the room list ([#7121](https://github.com/vector-im/element-android/issues/7121))
- - Create DM room only on first message - Handle the local rooms within the new AppLayout ([#7153](https://github.com/vector-im/element-android/issues/7153))
-
-Other changes
--------------
- - [Modules] Lifts the application variants to the app module ([#6779](https://github.com/vector-im/element-android/issues/6779))
- - Ensure that we do not expect all the Event fields when requesting `rooms/{roomId}/hierarchy` endpoint. ([#7035](https://github.com/vector-im/element-android/issues/7035))
- - Move some GitHub actions to buildjet runners, and remove the second attempt to run integration tests. ([#7108](https://github.com/vector-im/element-android/issues/7108))
- - Exclude legacy android support annotation library ([#7140](https://github.com/vector-im/element-android/issues/7140))
- - Pulling no longer hosted im.dlg:android-dialer directly into the repository and removing legacy support library usages ([#7142](https://github.com/vector-im/element-android/issues/7142))
- - Fixing build cache misses when compiling the vector module ([#7157](https://github.com/vector-im/element-android/issues/7157))
-
-Changes in Element v1.4.36 (2022-09-10)
-=======================================
-
-New App Layout can be enabled in the Labs settings. Please give it a try!
-
-Features ✨
-----------
- - Adds New App Layout into Labs ([#7038](https://github.com/vector-im/element-android/issues/7038))
- - Try to detect devices that lack Opus encoder support, use bundled libopus library for those. ([#7010](https://github.com/vector-im/element-android/issues/7010))
- - Suggest @room when @channel, @everyone, or @here is typed in composer ([#6529](https://github.com/vector-im/element-android/issues/6529))
-
-Bugfixes 🐛
-----------
- - Fix long incremental sync. ([#6917](https://github.com/vector-im/element-android/issues/6917))
- - Fix push with FCM ([#7068](https://github.com/vector-im/element-android/issues/7068))
- - FTUE - Fixes optional email registration step always being mandatory ([#6969](https://github.com/vector-im/element-android/issues/6969))
- - Fixes /addToSpace and /joinSpace commands showing invalid syntax warnings ([#6844](https://github.com/vector-im/element-android/issues/6844))
- - Fix low occurrence crashes. ([#6967](https://github.com/vector-im/element-android/issues/6967))
- - Fix crash when opening an unknown room ([#6978](https://github.com/vector-im/element-android/issues/6978))
- - Fix crash on PIN code settings screen. ([#6979](https://github.com/vector-im/element-android/issues/6979))
- - Fix autoplayed animated stickers ([#6982](https://github.com/vector-im/element-android/issues/6982))
- - Catch race condition crash in voice recording ([#6989](https://github.com/vector-im/element-android/issues/6989))
- - Fix invite to room when in a space buttons not working. ([#7054](https://github.com/vector-im/element-android/issues/7054))
-
-In development 🚧
-----------------
- - Create DM room only on first message - Create the DM and navigate to the new room after sending an event ([#5525](https://github.com/vector-im/element-android/issues/5525))
- - [App Layout] New empty states for home screen ([#6835](https://github.com/vector-im/element-android/issues/6835))
- - [App Layout] Bottom navigation tabs are removed for new home screen ([#6565](https://github.com/vector-im/element-android/issues/6565))
- - [App Layout] fixed space switching dialog measured with wrong height sometimes ([#6750](https://github.com/vector-im/element-android/issues/6750))
- - [App Layout] Fabs doesn't go off screen anymore ([#6765](https://github.com/vector-im/element-android/issues/6765))
- - [New Layout] Adds back navigation through spaces ([#6877](https://github.com/vector-im/element-android/issues/6877))
- - [App Layout] new room invites screen ([#6889](https://github.com/vector-im/element-android/issues/6889))
- - [App Layout] - Invites now show empty screen after you reject last invite ([#6876](https://github.com/vector-im/element-android/issues/6876))
- - [App Layout] - space switcher now has empty state ([#6754](https://github.com/vector-im/element-android/issues/6754))
- - [App Layout] - Improves Developer Mode Debug Button UX and adds it to New App Layout ([#6871](https://github.com/vector-im/element-android/issues/6871))
- - [New Layout] Changes space sheet to accordion-style with expandable subspaces ([#6907](https://github.com/vector-im/element-android/issues/6907))
- - [New Layout] Adds space invites ([#6924](https://github.com/vector-im/element-android/issues/6924))
- - [App Layout] fixed invites count badge bottom margin on a home screen ([#6947](https://github.com/vector-im/element-android/issues/6947))
- - [New Layout] Improves talkback accessibility ([#7016](https://github.com/vector-im/element-android/issues/7016))
- - [New Layout] Changes space icon in fab and in release notes screen ([#7039](https://github.com/vector-im/element-android/issues/7039))
- - [New Layout] Adds header to spaces bottom sheet ([#7040](https://github.com/vector-im/element-android/issues/7040))
- - [App Layout] New App Layout is enabled by default (Edit: has to be enabled in Labs) ([#6958](https://github.com/vector-im/element-android/issues/6958))
- - [App Layout] Obsolete settings are not shown when App Layout flag is enabled ([#6646](https://github.com/vector-im/element-android/issues/6646))
- - [Devices Management] Session overview screen ([#6961](https://github.com/vector-im/element-android/issues/6961))
- - [Devices Management] Refactor some code to improve testability ([#7043](https://github.com/vector-im/element-android/issues/7043))
- - [Device Manager] Current Session Section ([#6902](https://github.com/vector-im/element-android/issues/6902))
- - [Device Manager] Other Sessions Section ([#6945](https://github.com/vector-im/element-android/issues/6945))
- - [Device Manager] Render Security Recommendations ([#6964](https://github.com/vector-im/element-android/issues/6964))
-
-Improved Documentation 📚
-------------------------
- - Clarify that setting up a FCM Rewrite Proxy is not necessary for use of the UnifiedPush FCM distributor. ([#6727](https://github.com/vector-im/element-android/issues/6727))
-
-Other changes
--------------
- - Increase sticker size ([#6982](https://github.com/vector-im/element-android/issues/6982))
- - Focus input field when editing homeserver address to speed up login and registration. ([#6926](https://github.com/vector-im/element-android/issues/6926))
- - Log basic Http information in production. ([#6925](https://github.com/vector-im/element-android/issues/6925))
- - Converts the vector module to a library with a parent vector-app application module ([#6407](https://github.com/vector-im/element-android/issues/6407))
- - Creates a dedicated strings module ([#3955](https://github.com/vector-im/element-android/issues/3955))
- - Remove FragmentModule and the Fragment factory. No need to Inject the constructor on your Fragment, just add @AndroidEntryPoint annotation and @Inject class members. ([#6894](https://github.com/vector-im/element-android/issues/6894))
- - Small refactor of UnifiedPushHelper ([#6936](https://github.com/vector-im/element-android/issues/6936))
- - CI: only run sonarqube task when token is known ([#7057](https://github.com/vector-im/element-android/issues/7057))
-
-
-Changes in Element v1.4.34 (2022-08-23)
-=======================================
-
-Features ✨
-----------
- - [Notification] - Handle creation of notification for live location and poll start ([#6746](https://github.com/vector-im/element-android/issues/6746))
-
-Bugfixes 🐛
-----------
- - Fixes onboarding requiring matrix.org to be accessible on the first step, the server can now be manually changed ([#6718](https://github.com/vector-im/element-android/issues/6718))
- - Fixing sign in/up for homeservers that rely on the SSO fallback url ([#6827](https://github.com/vector-im/element-android/issues/6827))
- - Fixes uncaught exceptions in the SyncWorker to cause the worker to become stuck in the failure state ([#6836](https://github.com/vector-im/element-android/issues/6836))
- - Fixes onboarding captcha crashing when no WebView is available by showing an error with information instead ([#6855](https://github.com/vector-im/element-android/issues/6855))
- - Removes ability to continue registration after the app has been destroyed, fixes the next steps crashing due to missing information from the previous steps ([#6860](https://github.com/vector-im/element-android/issues/6860))
- - Fixes crash when exiting the login or registration entry screens whilst they're loading ([#6861](https://github.com/vector-im/element-android/issues/6861))
- - Fixes server selection being unable to trust certificates ([#6864](https://github.com/vector-im/element-android/issues/6864))
- - Ensure SyncThread is started when the app is launched after a Push has been received. ([#6884](https://github.com/vector-im/element-android/issues/6884))
- - Fixes missing firebase notifications after logging in when UnifiedPush distributor is installed ([#6891](https://github.com/vector-im/element-android/issues/6891))
-
-In development 🚧
-----------------
- - Create DM room only on first message - Trigger the flow when the "Direct Message" action is selected from the room member details screen ([#5525](https://github.com/vector-im/element-android/issues/5525))
- - added filter tabs for new App layout's Home screen ([#6505](https://github.com/vector-im/element-android/issues/6505))
- - [App Layout] added dialog to configure app layout ([#6506](https://github.com/vector-im/element-android/issues/6506))
- - Adds space list bottom sheet for new app layout ([#6749](https://github.com/vector-im/element-android/issues/6749))
- - [App Layout] Dialpad moved from bottom navigation tab to a separate activity accessed via home screen context menu ([#6787](https://github.com/vector-im/element-android/issues/6787))
- - Makes toolbar switch title based on space in New App Layout ([#6795](https://github.com/vector-im/element-android/issues/6795))
- - [Devices management] Add a feature flag and empty screen for future new layout ([#6798](https://github.com/vector-im/element-android/issues/6798))
- - Adds new chat bottom sheet as the click action of the main FAB in the new app layout ([#6801](https://github.com/vector-im/element-android/issues/6801))
- - [Devices management] Other sessions section in new layout ([#6806](https://github.com/vector-im/element-android/issues/6806))
- - [New Layout] Adds space settings accessible through clicking the toolbar ([#6859](https://github.com/vector-im/element-android/issues/6859))
- - Adds New App Layout FABs (hidden behind feature flag) ([#6693](https://github.com/vector-im/element-android/issues/6693))
-
-SDK API changes ⚠️
-------------------
- - Rename `DebugService.logDbUsageInfo` (resp. `Session.logDbUsageInfo`) to `DebugService.getDbUsageInfo` (resp. `Session.getDbUsageInfo`) and return a String instead of logging. The caller may want to log the String. ([#6884](https://github.com/vector-im/element-android/issues/6884))
-
-Other changes
--------------
- - Removes the Login2 proof of concept - replaced by the FTUE changes ([#5974](https://github.com/vector-im/element-android/issues/5974))
- - Enable auto-capitalization for Room creation Title field ([#6645](https://github.com/vector-im/element-android/issues/6645))
- - Decouples the variant logic from the vector module ([#6783](https://github.com/vector-im/element-android/issues/6783))
- - Add a developer setting to enable LeakCanary at runtime ([#6786](https://github.com/vector-im/element-android/issues/6786))
- - [Create Room] Reduce some boilerplate with room state event contents ([#6799](https://github.com/vector-im/element-android/issues/6799))
- - [Call] Memory leak after a call ([#6808](https://github.com/vector-im/element-android/issues/6808))
- - Fix some string template ([#6843](https://github.com/vector-im/element-android/issues/6843))
-
-
-Changes in Element v1.4.32 (2022-08-10)
-=======================================
-
-Features ✨
-----------
- - [Location Share] Render fallback UI when map fails to load ([#6711](https://github.com/vector-im/element-android/issues/6711))
-
-Bugfixes 🐛
-----------
- - Fix message content sometimes appearing in the log ([#6706](https://github.com/vector-im/element-android/issues/6706))
- - Disable 'Enable biometrics' option if there are not biometric authenticators enrolled. ([#6713](https://github.com/vector-im/element-android/issues/6713))
- - Fix crash when biometric key is used when coming back to foreground and KeyStore reports that the device is still locked. ([#6768](https://github.com/vector-im/element-android/issues/6768))
- - Catch all exceptions on lockscreen system key migrations. ([#6769](https://github.com/vector-im/element-android/issues/6769))
- - Fixes crash when entering non ascii characters during account creation ([#6735](https://github.com/vector-im/element-android/issues/6735))
- - Fixes onboarding login/account creation errors showing after navigation ([#6737](https://github.com/vector-im/element-android/issues/6737))
- - [Location sharing] Invisible text on map symbol ([#6687](https://github.com/vector-im/element-android/issues/6687))
-
-In development 🚧
-----------------
-  - Adds new app layout toolbar ([#6655](https://github.com/vector-im/element-android/issues/6655))
-
-Other changes
--------------
- - [Modularization] Provides abstraction to avoid direct usages of BuildConfig ([#6406](https://github.com/vector-im/element-android/issues/6406))
- - Refactors SpaceStateHandler (previously AppStateHandler) and adds unit tests for it ([#6598](https://github.com/vector-im/element-android/issues/6598))
- - Setup Danger to the project ([#6637](https://github.com/vector-im/element-android/issues/6637))
- - [Location Share] Open maximized map on tapping on live sharing notification ([#6642](https://github.com/vector-im/element-android/issues/6642))
- - [Location sharing] Align naming of components for live location feature ([#6647](https://github.com/vector-im/element-android/issues/6647))
- - [Location share] Update minimum sending period to 5 seconds for a live ([#6653](https://github.com/vector-im/element-android/issues/6653))
- - [Location sharing] - Fix the memory leaks ([#6674](https://github.com/vector-im/element-android/issues/6674))
- - [Timeline] Memory leak in audio message playback tracker ([#6678](https://github.com/vector-im/element-android/issues/6678))
- - [FTUE] Memory leak on FtueAuthSplashCarouselFragment ([#6680](https://github.com/vector-im/element-android/issues/6680))
- - Link directly to DCO docs from danger message. ([#6739](https://github.com/vector-im/element-android/issues/6739))
-
-
-Changes in Element v1.4.31 (2022-08-01)
-=======================================
-
-Bugfixes 🐛
-----------
- - Fixes crash when returning to the app after backgrounding ([#6709](https://github.com/vector-im/element-android/issues/6709))
- - Fix message content sometimes appearing in the log ([#6706](https://github.com/vector-im/element-android/issues/6706))
-
-
-Changes in Element v1.4.30 (2022-07-29)
-=======================================
-
-Features ✨
-----------
- - [FTUE] - Enable improved login and register onboarding flows ([#2585](https://github.com/vector-im/element-android/issues/2585))
- - Adds settings screen to change app font scale or enable using system setting ([#5687](https://github.com/vector-im/element-android/issues/5687))
- - [Location sharing] - Delete action on a live message ([#6437](https://github.com/vector-im/element-android/issues/6437))
- - [Timeline] - Collapse redacted events ([#6487](https://github.com/vector-im/element-android/issues/6487))
- - Improve lock screen implementation with extra security measures ([#6522](https://github.com/vector-im/element-android/issues/6522))
- - Move initialization of the Session to a background thread. MainActivity is restoring the session now, instead of VectorApplication. Useful when for instance a long migration of a database is required. ([#6548](https://github.com/vector-im/element-android/issues/6548))
- - Share location with other apps ([#6567](https://github.com/vector-im/element-android/issues/6567))
- - Support element call widget ([#6616](https://github.com/vector-im/element-android/issues/6616))
- - [FTUE] Updates FTUE registration to include username availability check and update copy ([#6546](https://github.com/vector-im/element-android/issues/6546))
- - [FTUE] - Allows the email address to be changed during the verification process ([#6622](https://github.com/vector-im/element-android/issues/6622))
- - [FTUE] Updates the copy within the FTUE onboarding ([#6547](https://github.com/vector-im/element-android/issues/6547))
- - [FTUE] Test session feedback ([#6620](https://github.com/vector-im/element-android/issues/6620))
- - [FTUE] - Improved reset password error message ([#6621](https://github.com/vector-im/element-android/issues/6621))
-
-Bugfixes 🐛
-----------
- - Fixes wrong voice message being displayed and played on the timeline. ([#6213](https://github.com/vector-im/element-android/issues/6213))
- - Fixes the room list not taking into account the Show all rooms in Home preference ([#6665](https://github.com/vector-im/element-android/issues/6665))
- - Stop using unstable names for withheld codes ([#5115](https://github.com/vector-im/element-android/issues/5115))
- - Fixes room not being in space after upgrade ([#6200](https://github.com/vector-im/element-android/issues/6200))
- - Fixed issues with reporting sync state events from different threads ([#6341](https://github.com/vector-im/element-android/issues/6341))
- - Display specific message when verification QR code is malformed ([#6395](https://github.com/vector-im/element-android/issues/6395))
- - When there is no way to verify a device (no 4S nor other device) propose to reset verification keys ([#6466](https://github.com/vector-im/element-android/issues/6466))
- - Unwedging could cause the SDK to force creating a new olm session every hour ([#6534](https://github.com/vector-im/element-android/issues/6534))
- - [Location Share] - Wrong room live location status bar visibility in timeline ([#6537](https://github.com/vector-im/element-android/issues/6537))
- - Fix infinite loading when opening a DM when the current room is the same DM. ([#6549](https://github.com/vector-im/element-android/issues/6549))
- - Do not log the live location of the user ([#6579](https://github.com/vector-im/element-android/issues/6579))
- - Fix backup saving several times the same keys ([#6585](https://github.com/vector-im/element-android/issues/6585))
- - Check user power level before sharing live location ([#6587](https://github.com/vector-im/element-android/issues/6587))
- - [Location Share] - Live is considered as ended while still active ([#6596](https://github.com/vector-im/element-android/issues/6596))
- - Put EC permission shortcuts behind labs flag (PSG-630) ([#6634](https://github.com/vector-im/element-android/issues/6634))
- - ObjectAnimators are not canceled in TypingMessageDotsView ([#6663](https://github.com/vector-im/element-android/issues/6663))
-
-SDK API changes ⚠️
-------------------
- - Communities/Groups are removed completely ([#5733](https://github.com/vector-im/element-android/issues/5733))
- - SDK - The SpaceFilter is query parameter is no longer nullable, use SpaceFilter.NoFilter instead ([#6666](https://github.com/vector-im/element-android/issues/6666))
-
-Other changes
--------------
- - Nightly build publication on Firebase ([#6478](https://github.com/vector-im/element-android/issues/6478))
- - Communities/Groups are removed completely ([#5733](https://github.com/vector-im/element-android/issues/5733))
- - Improves performance on search screen by replacing flattenParents with directParentName in RoomSummary ([#6314](https://github.com/vector-im/element-android/issues/6314))
- - Log durations of DB migration and migration steps. ([#6538](https://github.com/vector-im/element-android/issues/6538))
- - [Location Share] - Standardise "Stop" texts for live ([#6541](https://github.com/vector-im/element-android/issues/6541))
- - Adds NewAppLayoutEnabled feature flag ([#6584](https://github.com/vector-im/element-android/issues/6584))
- - [Location sharing] - Small improvements of UI for live ([#6607](https://github.com/vector-im/element-android/issues/6607))
- - Live Location Sharing - Reset zoom level while focusing a user ([#6609](https://github.com/vector-im/element-android/issues/6609))
- - Fix a typo in the terms and conditions step during registration. ([#6612](https://github.com/vector-im/element-android/issues/6612))
- - [Location sharing] - OnTap on the top live status bar, display the expanded map view ([#6625](https://github.com/vector-im/element-android/issues/6625))
- - [Location Share] - Expanded map state when no more live location shares ([#6635](https://github.com/vector-im/element-android/issues/6635))
-
-
-Changes in Element v1.4.28 (2022-07-13)
-=======================================
-
-Features ✨
-----------
- - Improve user experience when he is first invited to a room. Users will be able to decrypt and view previous messages ([#5853](https://github.com/vector-im/element-android/issues/5853))
- - [Location sharing] - Reply action on a live message ([#6401](https://github.com/vector-im/element-android/issues/6401))
- - Show a loader if all the Room Members are not yet loaded. ([#6413](https://github.com/vector-im/element-android/issues/6413))
-
-Bugfixes 🐛
-----------
- - Fixes numbered lists always starting from 1 ([#4777](https://github.com/vector-im/element-android/issues/4777))
- - Adds LoginType to SessionParams to fix soft logout form not showing for SSO and Password type ([#5398](https://github.com/vector-im/element-android/issues/5398))
- - Use stable endpoint for alias management instead of MSC2432. Contributed by Nico. ([#6288](https://github.com/vector-im/element-android/issues/6288))
- - [Poll] Fixes visible and wrong votes in closed poll after removing 2 previous polls ([#6430](https://github.com/vector-im/element-android/issues/6430))
- - Fix HTML entities being displayed in messages ([#6442](https://github.com/vector-im/element-android/issues/6442))
- - Gallery picker can pick external images ([#6450](https://github.com/vector-im/element-android/issues/6450))
- - Fixes crash when sharing plain text, such as a url ([#6451](https://github.com/vector-im/element-android/issues/6451))
- - Fix crashes on Timeline [Thread] due to range validation ([#6461](https://github.com/vector-im/element-android/issues/6461))
- - Fix crashes when opening Thread ([#6463](https://github.com/vector-im/element-android/issues/6463))
- - Fix ConcurrentModificationException on BackgroundDetectionObserver ([#6469](https://github.com/vector-im/element-android/issues/6469))
- - Fixes inconsistency with rooms within spaces showing or disappearing from home ([#6510](https://github.com/vector-im/element-android/issues/6510))
-
-In development 🚧
-----------------
- - FTUE - Adds support for resetting the password during the FTUE onboarding journey ([#5284](https://github.com/vector-im/element-android/issues/5284))
- - Create DM room only on first message - Design implementation & debug feature flag ([#5525](https://github.com/vector-im/element-android/issues/5525))
-
-Other changes
--------------
- - Replacing Epoxy annotation layout id references with getDefaultLayoutId ([#6389](https://github.com/vector-im/element-android/issues/6389))
- - Ensure `RealmList<T>.clearWith()` extension is correctly used. ([#6392](https://github.com/vector-im/element-android/issues/6392))
- - [Poll] - Add a description under undisclosed poll when not ended ([#6423](https://github.com/vector-im/element-android/issues/6423))
- - Add `android:hasFragileUserData="true"` in the manifest ([#6429](https://github.com/vector-im/element-android/issues/6429))
- - Add code check to prevent modification of frozen class ([#6434](https://github.com/vector-im/element-android/issues/6434))
- - Let your Activity or Fragment implement `VectorMenuProvider` if they provide a menu. ([#6436](https://github.com/vector-im/element-android/issues/6436))
- - Rename Android Service to use `AndroidService` suffix ([#6458](https://github.com/vector-im/element-android/issues/6458))
-
-
-Changes in Element v1.4.27 (2022-07-06)
-=======================================
-
-Bugfixes 🐛
-----------
- - Fixes crash when sharing plain text, such as a url ([#6451](https://github.com/vector-im/element-android/issues/6451))
- - Fix crashes on Timeline [Thread] due to range validation ([#6461](https://github.com/vector-im/element-android/issues/6461))
- - Fix crashes when opening Thread ([#6463](https://github.com/vector-im/element-android/issues/6463))
- - Fix ConcurrentModificationException on BackgroundDetectionObserver ([#6469](https://github.com/vector-im/element-android/issues/6469))
-
-
-Changes in Element v1.4.26 (2022-06-30)
-=======================================
-
-Features ✨
-----------
- - Use UnifiedPush and allows user to have push without FCM. ([#3448](https://github.com/vector-im/element-android/issues/3448))
- - Replace ffmpeg-kit with libopus and libopusenc. ([#6203](https://github.com/vector-im/element-android/issues/6203))
- - Improve lock screen implementation. ([#6217](https://github.com/vector-im/element-android/issues/6217))
- - Allow sharing text based content via android's share menu (eg .ics files) ([#6285](https://github.com/vector-im/element-android/issues/6285))
- - Promote live location labs flag ([#6350](https://github.com/vector-im/element-android/issues/6350))
- - [Location sharing] - Stop any active live before starting a new one ([#6364](https://github.com/vector-im/element-android/issues/6364))
- - Expose pusher profile tag in advanced settings ([#6369](https://github.com/vector-im/element-android/issues/6369))
-
-Bugfixes 🐛
-----------
- - Fixes concurrent modification crash when signing out or launching the app ([#5821](https://github.com/vector-im/element-android/issues/5821))
- - Refactor - better naming, return native user id and not sip user id and create a dm with the native user instead of with the sip user. ([#6101](https://github.com/vector-im/element-android/issues/6101))
- - Fixed /upgraderoom command not doing anything ([#6154](https://github.com/vector-im/element-android/issues/6154))
- - Fixed crash when opening large images in the timeline ([#6290](https://github.com/vector-im/element-android/issues/6290))
- - [Location sharing] Fix crash when starting/stopping a live when offline ([#6315](https://github.com/vector-im/element-android/issues/6315))
- - Fix loop in timeline and simplify management of chunks and timeline events. ([#6318](https://github.com/vector-im/element-android/issues/6318))
- - Update design and behaviour on widget permission bottom sheet ([#6326](https://github.com/vector-im/element-android/issues/6326))
- - Fix | Some user verification requests couldn't be accepted/declined ([#6328](https://github.com/vector-im/element-android/issues/6328))
- - [Location sharing] Fix stop of a live not possible from another device ([#6349](https://github.com/vector-im/element-android/issues/6349))
- - Fix backslash escapes in formatted messages ([#6357](https://github.com/vector-im/element-android/issues/6357))
- - Fixes wrong error message when signing in with wrong credentials ([#6371](https://github.com/vector-im/element-android/issues/6371))
- - [Location Share] - Adding missing prefix "u=" for uncertainty in geo URI ([#6375](https://github.com/vector-im/element-android/issues/6375))
-
-In development 🚧
-----------------
- - FTUE - Adds automatic homeserver selection when typing a full matrix id during registration or login ([#6162](https://github.com/vector-im/element-android/issues/6162))
-
-Improved Documentation 📚
-------------------------
- - Update the PR process doc to come back to one reviewer with optional additional reviewers. ([#6396](https://github.com/vector-im/element-android/issues/6396))
-
-SDK API changes ⚠️
-------------------
- - Group all location sharing related API into LocationSharingService ([#5864](https://github.com/vector-im/element-android/issues/5864))
- - Add support for MSC2457 - opting in or out of logging out all devices when changing password ([#6191](https://github.com/vector-im/element-android/issues/6191))
- - Create `QueryStateEventValue` to do query on `stateKey` for State Event. Also remove the default parameter values for those type. ([#6319](https://github.com/vector-im/element-android/issues/6319))
-
-Other changes
--------------
- - - Notify of the latest known location in LocationTracker to avoid multiple locations at start
-  - Debounce location updates
-  - Improve location providers access ([#5913](https://github.com/vector-im/element-android/issues/5913))
- - Add unit tests for LiveLocationAggregationProcessor code ([#6155](https://github.com/vector-im/element-android/issues/6155))
- - Making screenshots in bug reports opt in instead of opt out ([#6261](https://github.com/vector-im/element-android/issues/6261))
- - Setup [Flipper](https://fbflipper.com/) ([#6300](https://github.com/vector-im/element-android/issues/6300))
- - CreatePollViewModel unit tests ([#6320](https://github.com/vector-im/element-android/issues/6320))
- - Fix flaky test in voice recording feature. ([#6329](https://github.com/vector-im/element-android/issues/6329))
- - Poll view state unit tests ([#6366](https://github.com/vector-im/element-android/issues/6366))
- - Let LoadRoomMembersTask insert by chunk to release db. ([#6394](https://github.com/vector-im/element-android/issues/6394))
-
-
-Changes in Element v1.4.25 (2022-06-27)
-=======================================
-
-Bugfixes 🐛
-----------
-- Second attempt to fix session database migration to version 30.
-
-Changes in Element v1.4.24 (2022-06-22)
-=======================================
-
-Bugfixes 🐛
-----------
-- First attempt to fix session database migration to version 30.
-
-Changes in Element v1.4.23 (2022-06-21)
-=======================================
-
-Bugfixes 🐛
-----------
- - Fix loop in timeline and simplify management of chunks and timeline events. ([#6318](https://github.com/vector-im/element-android/issues/6318))
-
-
-Changes in Element v1.4.22 (2022-06-14)
-=======================================
-
-Features ✨
-----------
- - Make read receipt avatar list more compact ([#5970](https://github.com/vector-im/element-android/issues/5970))
- - Allow .well-known configuration to override key sharing mode ([#6147](https://github.com/vector-im/element-android/issues/6147))
- - Re-organize location settings flags ([#6244](https://github.com/vector-im/element-android/issues/6244))
- - Add report action for live location messages ([#6280](https://github.com/vector-im/element-android/issues/6280))
-
-Bugfixes 🐛
-----------
- - Fix cases of missing, swapped, or duplicated messages ([#5528](https://github.com/vector-im/element-android/issues/5528))
- - Fix wrong status of live location sharing in timeline ([#6209](https://github.com/vector-im/element-android/issues/6209))
- - Fix StackOverflowError while recording voice message ([#6222](https://github.com/vector-im/element-android/issues/6222))
- - Text cropped: "Secure backup" ([#6232](https://github.com/vector-im/element-android/issues/6232))
- - Fix copyright attributions of map views ([#6247](https://github.com/vector-im/element-android/issues/6247))
- - Fix flickering bottom bar of live location item ([#6264](https://github.com/vector-im/element-android/issues/6264))
-
-In development 🚧
-----------------
- - FTUE - Adds Sign Up tracking ([#5285](https://github.com/vector-im/element-android/issues/5285))
-
-SDK API changes ⚠️
-------------------
- - Some methods from `Session` have been moved to a new `SyncService`, that you can retrieve from a `Session`.
-  - `SyncStatusService` method has been moved to the new `SyncService`
-  - `InitSyncStep` have been moved and renamed to `InitialSyncStep`
-  - `SyncStatusService.Status` has been renamed to `SyncRequestState`
-  - The existing `SyncService` has been renamed to `SyncAndroidService` because of name clash with the new SDK Service ([#6029](https://github.com/vector-im/element-android/issues/6029))
- - Allows `AuthenticationService.getLoginFlow` to fail without resetting state from previously successful calls ([#6093](https://github.com/vector-im/element-android/issues/6093))
- - Allows new passwords to be passed at the point of confirmation when resetting a password ([#6169](https://github.com/vector-im/element-android/issues/6169))
-
-Other changes
--------------
- - Adds support for parsing homeserver versions without a patch number ([#6017](https://github.com/vector-im/element-android/issues/6017))
- - Updating exit onboarding dialog copy formatting to match iOS ([#6087](https://github.com/vector-im/element-android/issues/6087))
- - Disables when arrow alignment in code style ([#6126](https://github.com/vector-im/element-android/issues/6126))
-
-
-Changes in Element 1.4.20 (2022-06-13)
-======================================
-
-Bugfixes 🐛
-----------
- - Fix: All rooms are shown in Home regardless of the switch state. ([#6272](https://github.com/vector-im/element-android/issues/6272))
- - Fix regression on EventInsertLiveObserver getting blocked so there is no event being processed anymore. ([#6278](https://github.com/vector-im/element-android/issues/6278))
-
-
-Changes in Element 1.4.19 (2022-06-07)
-======================================
-
-Bugfixes 🐛
-----------
- - Fix | performance regression on roomlist + proper display of space parents in explore rooms. ([#6233](https://github.com/vector-im/element-android/issues/6233))
-
-
-Changes in Element v1.4.18 (2022-05-31)
-=======================================
-
-Features ✨
-----------
- - Space explore screen changes: removed space card, added rooms filtering ([#5658](https://github.com/vector-im/element-android/issues/5658))
- - Adds space or user id as a subtitle under rooms in search ([#5860](https://github.com/vector-im/element-android/issues/5860))
- - Adds up navigation in spaces ([#6073](https://github.com/vector-im/element-android/issues/6073))
- - Labs flag for enabling live location sharing ([#6098](https://github.com/vector-im/element-android/issues/6098))
- - Added support for mandatory backup or passphrase from .well-known configuration. ([#6133](https://github.com/vector-im/element-android/issues/6133))
- - Security - Asking for user confirmation when tapping URLs which contain unicode directional overrides ([#6163](https://github.com/vector-im/element-android/issues/6163))
- - Add settings switch to allow autoplaying animated images ([#6166](https://github.com/vector-im/element-android/issues/6166))
- - Live Location Sharing - User List Bottom Sheet ([#6170](https://github.com/vector-im/element-android/issues/6170))
-
-Bugfixes 🐛
-----------
- - Fix some notifications not clearing when read ([#4862](https://github.com/vector-im/element-android/issues/4862))
- - Do not switch away from home space on notification when "Show all Rooms in Home" is selected. ([#5827](https://github.com/vector-im/element-android/issues/5827))
- - Use fixed text size in read receipt counter ([#5856](https://github.com/vector-im/element-android/issues/5856))
- - Revert: Use member name instead of room name in DM creation item ([#6032](https://github.com/vector-im/element-android/issues/6032))
- - Poll refactoring with unit tests ([#6074](https://github.com/vector-im/element-android/issues/6074))
- - Correct .well-known/matrix/client handling for server_names which include ports. ([#6095](https://github.com/vector-im/element-android/issues/6095))
- - Glide - Use current drawable while loading new static map image ([#6103](https://github.com/vector-im/element-android/issues/6103))
- - Fix sending multiple invites to a room reaching only one or two people ([#6109](https://github.com/vector-im/element-android/issues/6109))
- - Prevent widget web view from reloading on screen / orientation change ([#6140](https://github.com/vector-im/element-android/issues/6140))
- - Fix decrypting redacted event from sending errors ([#6148](https://github.com/vector-im/element-android/issues/6148))
- - Make widget web view request system permissions for camera and microphone (PSF-1061) ([#6149](https://github.com/vector-im/element-android/issues/6149))
-
-In development 🚧
-----------------
- - Adds email input and verification screens to the new FTUE onboarding flow ([#5278](https://github.com/vector-im/element-android/issues/5278))
- - FTUE - Adds the redesigned Sign In screen ([#5283](https://github.com/vector-im/element-android/issues/5283))
- - [Live location sharing] Update message in timeline during the live ([#5689](https://github.com/vector-im/element-android/issues/5689))
- - FTUE - Overrides sign up flow ordering for matrix.org only ([#5783](https://github.com/vector-im/element-android/issues/5783))
- - Live location sharing: navigation from timeline to map screen
-  Live location sharing: show user pins on map screen ([#6012](https://github.com/vector-im/element-android/issues/6012))
- - FTUE - Adds homeserver login/register deeplink support ([#6023](https://github.com/vector-im/element-android/issues/6023))
- - [Live location sharing] Update entity in DB when a live is timed out ([#6123](https://github.com/vector-im/element-android/issues/6123))
-
-SDK API changes ⚠️
-------------------
-- Notifies other devices when a verification request sent from an Android device is accepted.` ([#5724](https://github.com/vector-im/element-android/issues/5724))
-- Some `val` have been changed to `fun` to increase their visibility in the generated documentation. Just add `()` if you were using them.
-- `KeysBackupService.state` has been replaced by `KeysBackupService.getState()`
-- `KeysBackupService.isStucked` has been replaced by `KeysBackupService.isStuck()`
-- SDK documentation improved ([#5952](https://github.com/vector-im/element-android/issues/5952))
-- Improve replay attacks and reduce duplicate message index errors ([#6077](https://github.com/vector-im/element-android/issues/6077))
-- Remove `RoomSummaryQueryParams.roomId`. If you need to observe a single room, use the new API `RoomService.getRoomSummaryLive(roomId: String)`
-- `ActiveSpaceFilter` has been renamed to `SpaceFilter`
-- `RoomCategoryFilter.ALL` has been removed, just pass `null` to not filter on Room category. ([#6143](https://github.com/vector-im/element-android/issues/6143))
-
-Other changes
--------------
- - leaving space experience changed to be aligned with iOS ([#5728](https://github.com/vector-im/element-android/issues/5728))
- - @Ignore a number of tests that are currently failing in CI. ([#6025](https://github.com/vector-im/element-android/issues/6025))
- - Remove ShortcutBadger lib and usage (it was dead code) ([#6041](https://github.com/vector-im/element-android/issues/6041))
- - Test: Ensure calling 'fail()' is not caught by the catch block ([#6089](https://github.com/vector-im/element-android/issues/6089))
- - Excludes transitive optional non FOSS google location dependency from fdroid builds ([#6100](https://github.com/vector-im/element-android/issues/6100))
- - Fixed grammar errors in /vector/src/main/res/values/strings.xml ([#6132](https://github.com/vector-im/element-android/issues/6132))
- - Downgrade gradle from 7.2.0 to 7.1.3 ([#6141](https://github.com/vector-im/element-android/issues/6141))
- - Add Lao language to the in-app settings. ([#6196](https://github.com/vector-im/element-android/issues/6196))
- - Remove the background location permission request ([#6198](https://github.com/vector-im/element-android/issues/6198))
-
-
 Changes in Element v1.4.16 (2022-05-17)
 =======================================
 

CONTRIBUTING.md

@@ -1,42 +1,10 @@
-# Contributing to Element Android
-
-<!--- TOC -->
-
-* [Contributing code to Matrix](#contributing-code-to-matrix)
-* [Android Studio settings](#android-studio-settings)
-  * [Template](#template)
-* [Compilation](#compilation)
-* [I want to help translating Element](#i-want-to-help-translating-element)
-* [I want to submit a PR to fix an issue](#i-want-to-submit-a-pr-to-fix-an-issue)
-  * [Kotlin](#kotlin)
-  * [Changelog](#changelog)
-  * [Code quality](#code-quality)
-    * [Internal tool](#internal-tool)
-    * [ktlint](#ktlint)
-    * [lint](#lint)
-  * [Unit tests](#unit-tests)
-  * [Tests](#tests)
-  * [Internationalisation](#internationalisation)
-    * [Adding new string](#adding-new-string)
-      * [Plurals](#plurals)
-    * [Editing existing strings](#editing-existing-strings)
-    * [Removing existing strings](#removing-existing-strings)
-    * [Renaming string ids](#renaming-string-ids)
-    * [Reordering strings](#reordering-strings)
-  * [Accessibility](#accessibility)
-  * [Layout](#layout)
-  * [Authors](#authors)
-* [Thanks](#thanks)
-
-<!--- END -->
-
-## Contributing code to Matrix
+# Contributing code to Matrix
 
 Please read https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md
 
 Element Android support can be found in this room: [![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org).
 
-The rest of the document contains specific rules for Matrix Android projects
+# Specific rules for Matrix Android projects
 
 ## Android Studio settings
 
@@ -152,21 +120,17 @@ You should consider adding Unit tests with your PR, and also integration tests (
 
 Translations are handled using an external tool: [Weblate](https://translate.element.io/projects/element-android/)
 
-**As a general rule, please never edit or add or remove translations to the project in a Pull Request**. It can lead to merge conflict if the translations are also modified in Weblate side. Pull Request containing change(s) on the translation files cannot be merged.
+As a general rule, please never edit or add or remove translations to the project in a Pull Request. It can lead to merge conflict if the translations are also modified in Weblate side.
 
 #### Adding new string
 
-When adding new string resources, please only add new entries in the file `values/strings.xml` ([this file](./library/ui-strings/src/main/res/values/strings.xml)). Translations will be added later by the community of translators using Weblate.
+When adding new string resources, please only add new entries in the file `value/strings.xml`. Translations will be added later by the community of translators using Weblate.
 
-The file `values/strings.xml` must only contain American English (U. S. English) values, as this is the default language of the Android operating system. So for instance, please use "color" instead of "colour". Element Android will still use the language set on the system by the user, like any other Android applications which provide translations. The system language can be any other English language variants, or any other languages. Note that this is also possible to override the system language using the Element Android in-app language settings.
+The file `value/strings.xml` must only contain American English (U. S. English) values, as this is the default language of the Android operating system. So for instance, please use "color" instead of "colour". Element Android will still use the language set on the system by the user, like any other Android applications which provide translations. The system language can be any other English language variants, or any other languages. Note that this is also possible to override the system language using the Element Android in-app language settings.
 
-New strings can be added anywhere in the file `values/strings.xml`, not necessarily at the end of the file. Generally, it's even better to add the new strings in some dedicated section per feature, and not at the end of the file, to avoid merge conflict between 2 PR adding strings at the end of the same file.
+New strings can be added anywhere in the file `value/strings.xml`, not necessarily at the end of the file. Generally, it's even better to add the new strings in some dedicated section per feature, and not at the end of the file, to avoid merge conflict between 2 PR adding strings at the end of the same file.
 
-##### Plurals
-
-Please use `plurals` resources when appropriate, and note that some languages have specific rules for `plurals`, so even if the string will always be at the plural form for English, please always create a `plurals` resource.
-
-Specific plural forms can be found [here](https://unicode-org.github.io/cldr-staging/charts/37/supplemental/language_plural_rules.html).
+Do not hesitate to use plurals when appropriate.
 
 #### Editing existing strings
 
@@ -186,23 +150,6 @@ And add `tools:ignore="UnusedResources"` to the string, to let lint ignore that
 
 The string will be removed during the next sync with Weblate.
 
-#### Renaming string ids
-
-This is possible to rename ids of the String resources, but since translation files cannot be edited, add TODO in the main strings.xml file above the strings you want to rename. 
-
-```xml
-<!-- TODO Rename id to put_new_id_here -->
-<string name="current_id">Hello Matrix world!</string>
-```
-
-The string id(s) will be renamed during the next Weblate sync.
-
-#### Reordering strings
-
-To group strings per feature, or for any other reasons, it is possible to reorder string resources, but only in the [main strings.xml file](./library/ui-strings/src/main/res/values/strings.xml). ). We do not mind about ordering in the translation files, and anyway this is forbidden to edit manually the translation files.
-
-It is also possible to add empty lines between string resources, and to add XML comments. Please note that the XML comment just above a String resource will also appear on Weblate and be visible to the translators.
-
 ### Accessibility
 
 Please consider accessibility as an important point. As a minimum requirement, in layout XML files please use attributes such as `android:contentDescription` and `android:importantForAccessibility`, and test with a screen reader if it's working well. You can add new string resources, dedicated to accessibility, in this case, please prefix theirs id with `a11y_`.

Gemfile

@@ -1,4 +1,3 @@
 source "https://rubygems.org"
 
 gem "fastlane"
-gem 'danger'

Gemfile.lock

@@ -24,29 +24,10 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.0.3)
-    claide-plugins (0.9.2)
-      cork
-      nap
-      open4 (~> 1.3)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    cork (0.3.0)
-      colored2 (~> 3.1)
-    danger (8.6.1)
-      claide (~> 1.0)
-      claide-plugins (>= 0.9.2)
-      colored2 (~> 3.1)
-      cork (~> 0.1)
-      faraday (>= 0.9.0, < 2.0)
-      faraday-http-cache (~> 2.0)
-      git (~> 1.7)
-      kramdown (~> 2.3)
-      kramdown-parser-gfm (~> 1.0)
-      no_proxy_fix
-      octokit (~> 4.7)
-      terminal-table (>= 1, < 4)
     declarative (0.0.20)
     digest-crc (0.6.3)
       rake (>= 12.0.0, < 14.0.0)
@@ -71,8 +52,6 @@ GEM
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
-    faraday-http-cache (2.4.0)
-      faraday (>= 0.8)
     faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
@@ -119,8 +98,6 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    git (1.11.0)
-      rchardet (~> 1.8)
     google-apis-androidpublisher_v3 (0.8.0)
       google-apis-core (>= 0.4, < 2.a)
     google-apis-core (0.4.0)
@@ -166,28 +143,17 @@ GEM
     jmespath (1.4.0)
     json (2.5.1)
     jwt (2.2.3)
-    kramdown (2.4.0)
-      rexml
-    kramdown-parser-gfm (1.1.0)
-      kramdown (~> 2.0)
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
-    nap (1.1.0)
     naturally (2.2.1)
-    no_proxy_fix (0.1.2)
-    octokit (4.25.1)
-      faraday (>= 1, < 3)
-      sawyer (~> 0.9)
-    open4 (1.3.4)
     os (1.1.1)
     plist (3.6.0)
     public_suffix (4.0.6)
     rake (13.0.6)
-    rchardet (1.8.0)
     representable (3.1.1)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -197,9 +163,6 @@ GEM
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    sawyer (0.9.2)
-      addressable (>= 2.3.5)
-      faraday (>= 0.17.3, < 3)
     security (0.1.3)
     signet (0.15.0)
       addressable (~> 2.3)
@@ -237,11 +200,9 @@ GEM
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
-  universal-darwin-21
   x86_64-darwin-20
 
 DEPENDENCIES
-  danger
   fastlane
 
 BUNDLED WITH

README.md

@@ -1,9 +1,9 @@
 [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
 [![Weblate](https://translate.element.io/widgets/element-android/-/svg-badge.svg)](https://translate.element.io/engage/element-android/?utm_source=widget)
 [![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-android&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=vector-im_element-android)
-[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-android&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=vector-im_element-android)
-[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-android&metric=bugs)](https://sonarcloud.io/summary/new_code?id=vector-im_element-android)
+[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=alert_status)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=bugs)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
 
 # Element Android
 
@@ -44,12 +44,10 @@ If you would like to receive releases more quickly (bearing in mind that they ma
 
 ## Contributing
 
-Please refer to [CONTRIBUTING.md](./CONTRIBUTING.md) if you want to contribute on Matrix Android projects!
+Please refer to [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) if you want to contribute on Matrix Android projects!
 
 Come chat with the community in the dedicated Matrix [room](https://matrix.to/#/#element-android:matrix.org).
 
-Also [this documentation](./docs/_developer_onboarding.md) can hopefully help developers to start working on the project.
-
 ## Triaging issues
 
 Issues are triaged by community members and the Android App Team, following the [triage process](https://github.com/vector-im/element-meta/wiki/Triage-process).

build.gradle

@@ -24,16 +24,13 @@ buildscript {
         classpath libs.gradle.gradlePlugin
         classpath libs.gradle.kotlinPlugin
         classpath libs.gradle.hiltPlugin
-        classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.3'
-        classpath 'com.google.gms:google-services:4.3.13'
-        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513'
+        classpath 'com.google.gms:google-services:4.3.10'
+        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.2.2"
-        classpath 'org.owasp:dependency-check-gradle:7.2.0'
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10"
+        classpath "com.likethesalad.android:stem-plugin:2.1.1"
+        classpath 'org.owasp:dependency-check-gradle:7.1.0.1'
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.6.21"
         classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
-        classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
-        classpath 'app.cash.paparazzi:paparazzi-gradle-plugin:1.0.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -41,12 +38,9 @@ buildscript {
 
 plugins {
     // ktlint Plugin
-    id "org.jlleitschuh.gradle.ktlint" version "11.0.0"
+    id "org.jlleitschuh.gradle.ktlint" version "10.3.0"
     // Detekt
-    id "io.gitlab.arturbosch.detekt" version "1.21.0"
-
-    // Dependency Analysis
-    id 'com.autonomousapps.dependency-analysis' version "1.13.1"
+    id "io.gitlab.arturbosch.detekt" version "1.20.0"
 }
 
 // https://github.com/jeremylong/DependencyCheck
@@ -72,14 +66,6 @@ allprojects {
                 groups.mavenCentral.group.each { includeGroup it }
             }
         }
-        // snapshots repository
-        maven {
-            url "https://oss.sonatype.org/content/repositories/snapshots"
-            content {
-                groups.snapshot.regex.each { includeGroupByRegex it }
-                groups.snapshot.group.each { includeGroup it }
-            }
-        }
         maven {
             url 'https://jitpack.io'
             content {
@@ -136,11 +122,6 @@ allprojects {
         enableExperimentalRules = true
         // display the corresponding rule
         verbose = true
-        reporters {
-            reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.PLAIN)
-            // To have XML report for Danger
-            reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
-        }
         disabledRules = [
                 // TODO Re-enable these 4 rules after reformatting project
                 "indent",
@@ -161,8 +142,6 @@ allprojects {
                 "experimental:comment-wrapping",
                 // - A KDoc comment after any other element on the same line must be separated by a new line
                 "experimental:kdoc-wrapping",
-                // Ignore error "Redundant curly braces", since we use it to fix false positives, for instance in "elementLogs.${i}.txt"
-                "string-template",
         ]
     }
 
@@ -186,7 +165,7 @@ def launchTask = getGradle()
         .toString()
         .toLowerCase()
 
-if (launchTask.contains("coverage".toLowerCase())) {
+if (launchTask.contains("codeCoverageReport".toLowerCase())) {
     apply from: 'coverage.gradle'
 }
 
@@ -198,8 +177,8 @@ apply plugin: 'org.sonarqube'
 
 sonarqube {
     properties {
-        property "sonar.projectName", "element-android"
-        property "sonar.projectKey", "vector-im_element-android"
+        property "sonar.projectName", "Element-Android"
+        property "sonar.projectKey", "im.vector.app.android"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.projectVersion", project(":vector").android.defaultConfig.versionName
         property "sonar.sourceEncoding", "UTF-8"
@@ -209,7 +188,7 @@ sonarqube {
         property "sonar.links.issue", "https://github.com/vector-im/element-android/issues"
         property "sonar.organization", "new_vector_ltd_organization"
         property "sonar.java.coveragePlugin", "jacoco"
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/generateCoverageReport/generateCoverageReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/allCodeCoverageReport/allCodeCoverageReport.xml"
         property "sonar.login", project.hasProperty("SONAR_LOGIN") ? SONAR_LOGIN : "invalid"
     }
 }
@@ -225,7 +204,7 @@ project(":vector") {
     }
 }
 
-project(":library:external:diff-match-patch") {
+project(":library:diff-match-patch") {
     sonarqube {
         skipProject = true
     }
@@ -240,85 +219,3 @@ project(":library:external:diff-match-patch") {
 //        }
 //    }
 //}
-
-dependencyAnalysis {
-    dependencies {
-        bundle("kotlin-stdlib") {
-            includeGroup("org.jetbrains.kotlin")
-        }
-        bundle("react") {
-            includeGroup("com.facebook.react")
-        }
-    }
-    issues {
-        all {
-            ignoreKtx(true)
-            onUsedTransitiveDependencies {
-                // Transitively used dependencies that should be declared directly
-                severity("ignore")
-            }
-            onUnusedDependencies {
-                severity("fail")
-            }
-            onUnusedAnnotationProcessors {
-                severity("fail")
-                exclude("com.airbnb.android:epoxy-processor", "com.google.dagger:hilt-compiler") // False positives
-            }
-        }
-        project(":library:jsonviewer") {
-            onUnusedDependencies {
-                exclude("org.json:json") // Used in unit tests, overwrites the one bundled into Android
-            }
-        }
-        project(":library:ui-styles")
-        project(":matrix-sdk-android") {
-            onUnusedDependencies {
-                exclude("io.reactivex.rxjava2:rxkotlin") // Transitively required for mocking realm as monarchy doesn't expose Rx
-            }
-        }
-        project(":matrix-sdk-android-flow") {
-            onUnusedDependencies {
-                exclude("androidx.paging:paging-runtime-ktx") // False positive
-            }
-        }
-        project(":vector") {
-            onUnusedDependencies {
-                // False positives
-                exclude(
-                        "androidx.fragment:fragment-testing",
-                        "com.facebook.soloader:soloader",
-                        "com.vanniktech:emoji-google",
-                        "com.vanniktech:emoji-material",
-                        "org.maplibre.gl:android-plugin-annotation-v9",
-                        "org.maplibre.gl:android-sdk",
-                )
-            }
-        }
-    }
-}
-
-tasks.register("recordScreenshots", GradleBuild) {
-    startParameter.projectProperties.screenshot = ""
-    tasks = [':vector:recordPaparazziDebug']
-}
-
-tasks.register("verifyScreenshots", GradleBuild) {
-    startParameter.projectProperties.screenshot = ""
-    tasks = [':vector:verifyPaparazziDebug']
-}
-
-ext.initScreenshotTests = { project ->
-    def hasScreenshots = project.hasProperty("screenshot")
-    if (hasScreenshots) {
-        project.apply plugin: 'app.cash.paparazzi'
-    }
-    project.dependencies { testCompileOnly "app.cash.paparazzi:paparazzi:1.0.0" }
-    project.android.testOptions.unitTests.all {
-        def screenshotTestCapture = "**/*ScreenshotTest*"
-        if (hasScreenshots) {
-            include screenshotTestCapture
-        } else {
-            exclude screenshotTestCapture
-        }
-    }
-}

changelog.d/5278.wip

@@ -0,0 +1 @@
+Adds email input and verification screens to the new FTUE onboarding flow

changelog.d/5658.feature

@@ -0,0 +1 @@
+Space explore screen changes: removed space card, added rooms filtering

changelog.d/5689.wip

@@ -0,0 +1 @@
+[Live location sharing] Update message in timeline during the live

changelog.d/5724.sdk

@@ -0,0 +1 @@
+- Notifies other devices when a verification request sent from an Android device is accepted.`

changelog.d/5728.misc

@@ -0,0 +1 @@
+leaving space experience changed to be aligned with iOS

changelog.d/5783.wip

@@ -0,0 +1 @@
+FTUE - Overrides sign up flow ordering for matrix.org only

changelog.d/5798.misc

@@ -1 +0,0 @@
-Adds screenshot testing tooling

changelog.d/5856.bugfix

@@ -0,0 +1 @@
+Use fixed text size in read receipt counter

changelog.d/6012.wip

@@ -0,0 +1 @@
+Live location sharing: navigation from timeline to map screen

changelog.d/6025.misc

@@ -0,0 +1 @@
+@Ignore a number of tests that are currently failing in CI.

changelog.d/6032.bugfix

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

changelog.d/6041.misc

@@ -0,0 +1 @@
+Remove ShortcutBadger lib and usage (it was dead code)

changelog.d/6074.bugfix

@@ -0,0 +1 @@
+Poll refactoring with unit tests

changelog.d/6089.misc

@@ -0,0 +1 @@
+Test: Ensure calling 'fail()' is not caught by the catch block

changelog.d/6095.bugfix

@@ -0,0 +1 @@
+Correct .well-known/matrix/client handling for server_names which include ports.

changelog.d/6098.feature

@@ -0,0 +1 @@
+Labs flag for enabling live location sharing

changelog.d/6103.bugfix

@@ -0,0 +1 @@
+Glide - Use current drawable while loading new static map image

changelog.d/6109.bugfix

@@ -0,0 +1 @@
+Fix sending multiple invites to a room reaching only one or two people

changelog.d/6929.misc

@@ -1 +0,0 @@
-Target API 12 and compile with Android SDK 32.

changelog.d/7114.wip

@@ -1 +0,0 @@
-[Device management] Verify current session

changelog.d/7126.doc

@@ -1 +0,0 @@
-Draft onboarding documentation of the project at `./docs/_developer_onboarding.md`

changelog.d/7126.misc

@@ -1 +0,0 @@
-Add support to `/devtools` command.

changelog.d/7143.wip

@@ -1 +0,0 @@
-[Device management] Verify another session

changelog.d/7158.wip

@@ -1 +0,0 @@
-[Device management] Rename a session

changelog.d/7159.misc

@@ -1 +0,0 @@
-Fix lint warning, and cleanup the code

changelog.d/7170.wip

@@ -1 +0,0 @@
-[Device Manager] Unverified and inactive sessions list

changelog.d/7193.misc

@@ -1 +0,0 @@
-Mutualize the pending auth handling

changelog.d/7198.sdk

@@ -1 +0,0 @@
-Allow the sync timeout to be configured (mainly useful for testing)

changelog.d/7211.misc

@@ -1 +0,0 @@
- CI: Prevent modification of translations by developer.

coverage.gradle

@@ -1,37 +1,9 @@
-def excludes = [
-// dependency injection graph
-'**/*Module.*',
-'**/*Module*.*',
-
-// Framework entry points
-'**/*Activity*',
-'**/*Fragment*',
-'**/*Application*',
-'**/*AndroidService*',
-
-// We would like to exclude android widgets as well but our naming is inconsistent
-
-// Proof of concept
-'**/*Login2*',
-
-// Generated
-'**/*JsonAdapter*',
-'**/*Item.*',
-'**/*$Holder.*',
-'**/*ViewHolder.*',
-'**/*View.*',
-'**/*BottomSheet.*'
-]
+def excludes = [ ]
 
 def initializeReport(report, projects, classExcludes) {
     projects.each { project -> project.apply plugin: 'jacoco' }
+    report.executionData { fileTree(rootProject.rootDir.absolutePath).include("**/build/jacoco/*.exec") }
 
-    report.executionData {
-        fileTree(rootProject.rootDir.absolutePath).include(
-                "**/build/**/*.exec",
-                "**/build/outputs/code_coverage/**/coverage.ec",
-        )
-    }
     report.reports {
         xml.enabled true
         html.enabled true
@@ -71,21 +43,13 @@ def collectProjects(predicate) {
     return subprojects.findAll { it.buildFile.isFile() && predicate(it) }
 }
 
-task generateCoverageReport(type: JacocoReport) {
+task allCodeCoverageReport(type: JacocoReport) {
     outputs.upToDateWhen { false }
     rootProject.apply plugin: 'jacoco'
-    def projects = collectProjects { ['vector-app', 'vector', 'matrix-sdk-android'].contains(it.name) }
+    // to limit projects in a specific report, add
+    // def excludedProjects = [ ... ]
+    // def projects = collectProjects { !excludedProjects.contains(it.name) }
+    def projects = collectProjects { true }
+    dependsOn { projects*.test }
     initializeReport(it, projects, excludes)
 }
-
-task unitTestsWithCoverage(type: GradleBuild) {
-    // the 7.1.3 android gradle plugin has a bug where enableTestCoverage generates invalid coverage
-    startParameter.projectProperties.coverage = [enableTestCoverage: false]
-    tasks = ['testDebugUnitTest']
-}
-
-task instrumentationTestsWithCoverage(type: GradleBuild) {
-    startParameter.projectProperties.coverage = [enableTestCoverage: true]
-    startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui'
-    tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
-}

dependencies.gradle

@@ -1,41 +1,37 @@
 ext.versions = [
 
         'minSdk'            : 21,
-        'compileSdk'        : 32,
-        'targetSdk'         : 32,
+        'compileSdk'        : 31,
+        'targetSdk'         : 31,
         'sourceCompat'      : JavaVersion.VERSION_11,
         'targetCompat'      : JavaVersion.VERSION_11,
 ]
 
-def gradle = "7.2.2"
+def gradle = "7.2.0"
 // Ref: https://kotlinlang.org/releases.html
-def kotlin = "1.7.10"
-def kotlinCoroutines = "1.6.4"
-def dagger = "2.43.2"
-def appDistribution = "16.0.0-beta04"
+def kotlin = "1.6.21"
+def kotlinCoroutines = "1.6.1"
+def dagger = "2.42"
 def retrofit = "2.9.0"
 def arrow = "0.8.2"
 def markwon = "4.6.2"
 def moshi = "1.13.0"
-def lifecycle = "2.5.1"
+def lifecycle = "2.4.1"
 def flowBinding = "1.2.0"
-def flipper = "0.164.0"
 def epoxy = "4.6.2"
-def mavericks = "2.7.0"
+def mavericks = "2.6.1"
 def glide = "4.13.2"
 def bigImageViewer = "1.8.1"
 def jjwt = "0.11.5"
-// Temporary version to unblock #6929. Once 0.16.0 is released we should use it, and revert
-// the whole commit which set version 0.16.0-SNAPSHOT
-def vanniktechEmoji = "0.16.0-SNAPSHOT"
-
-def fragment = "1.5.3"
+def vanniktechEmoji = "0.9.0"
 
 // Testing
-def mockk = "1.12.3" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819
+def mockk = "1.12.4"
 def espresso = "3.4.0"
 def androidxTest = "1.4.0"
 def androidxOrchestrator = "1.4.1"
+
+
 ext.libs = [
         gradle      : [
                 'gradlePlugin'            : "com.android.tools.build:gradle:$gradle",
@@ -49,14 +45,11 @@ ext.libs = [
                 'coroutinesTest'          : "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutines"
         ],
         androidx    : [
-                'activity'                : "androidx.activity:activity:1.5.1",
-                'appCompat'               : "androidx.appcompat:appcompat:1.5.1",
-                'biometric'               : "androidx.biometric:biometric:1.1.0",
-                'core'                    : "androidx.core:core-ktx:1.8.0",
+                'appCompat'               : "androidx.appcompat:appcompat:1.4.1",
+                'core'                    : "androidx.core:core-ktx:1.7.0",
                 'recyclerview'            : "androidx.recyclerview:recyclerview:1.2.1",
                 'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.3",
-                'fragmentKtx'             : "androidx.fragment:fragment-ktx:$fragment",
-                'fragmentTesting'         : "androidx.fragment:fragment-testing:$fragment",
+                'fragmentKtx'             : "androidx.fragment:fragment-ktx:1.4.1",
                 'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.4",
                 'work'                    : "androidx.work:work-runtime-ktx:2.7.1",
                 'autoFill'                : "androidx.autofill:autofill:1.1.0",
@@ -76,36 +69,20 @@ ext.libs = [
                 'testRules'               : "androidx.test:rules:$androidxTest",
                 'espressoCore'            : "androidx.test.espresso:espresso-core:$espresso",
                 'espressoContrib'         : "androidx.test.espresso:espresso-contrib:$espresso",
-                'espressoIntents'         : "androidx.test.espresso:espresso-intents:$espresso",
-                'viewpager2'              : "androidx.viewpager2:viewpager2:1.0.0",
-                'transition'              : "androidx.transition:transition:1.2.0",
+                'espressoIntents'         : "androidx.test.espresso:espresso-intents:$espresso"
         ],
         google      : [
-                'material'                : "com.google.android.material:material:1.6.1",
-                'appdistributionApi'      : "com.google.firebase:firebase-appdistribution-api-ktx:$appDistribution",
-                'appdistribution'         : "com.google.firebase:firebase-appdistribution:$appDistribution",
-                // Phone number https://github.com/google/libphonenumber
-                'phonenumber'             : "com.googlecode.libphonenumber:libphonenumber:8.12.55"
+                'material'                : "com.google.android.material:material:1.6.0"
         ],
         dagger      : [
                 'dagger'                  : "com.google.dagger:dagger:$dagger",
                 'daggerCompiler'          : "com.google.dagger:dagger-compiler:$dagger",
                 'hilt'                    : "com.google.dagger:hilt-android:$dagger",
-                'hiltAndroidTesting'      : "com.google.dagger:hilt-android-testing:$dagger",
                 'hiltCompiler'            : "com.google.dagger:hilt-compiler:$dagger"
         ],
-        flipper     : [
-                'flipper'                 : "com.facebook.flipper:flipper:$flipper",
-                'flipperNetworkPlugin'    : "com.facebook.flipper:flipper-network-plugin:$flipper",
-        ],
-        element     : [
-                'opusencoder'             : "io.element.android:opusencoder:1.1.0",
-        ],
         squareup    : [
-                'moshi'                  : "com.squareup.moshi:moshi:$moshi",
-                'moshiKt'                : "com.squareup.moshi:moshi-kotlin:$moshi",
+                'moshi'                  : "com.squareup.moshi:moshi-adapters:$moshi",
                 'moshiKotlin'            : "com.squareup.moshi:moshi-kotlin-codegen:$moshi",
-                'moshiAdapters'          : "com.squareup.moshi:moshi-adapters:$moshi",
                 'retrofit'               : "com.squareup.retrofit2:retrofit:$retrofit",
                 'retrofitMoshi'          : "com.squareup.retrofit2:converter-moshi:$retrofit"
         ],
@@ -130,10 +107,6 @@ ext.libs = [
                 'mavericks'              : "com.airbnb.android:mavericks:$mavericks",
                 'mavericksTesting'       : "com.airbnb.android:mavericks-testing:$mavericks"
         ],
-        maplibre    : [
-                'androidSdk'             : "org.maplibre.gl:android-sdk:9.5.2",
-                'pluginAnnotation'       : "org.maplibre.gl:android-plugin-annotation-v9:1.0.0"
-        ],
         mockk      : [
                 'mockk'                   : "io.mockk:mockk:$mockk",
                 'mockkAndroid'            : "io.mockk:mockk-android:$mockk"
@@ -170,5 +143,3 @@ ext.libs = [
                 'junit'                  : "junit:junit:4.13.2"
         ]
 ]
-
-

dependencies_groups.gradle

@@ -9,7 +9,6 @@ ext.groups = [
                         'com.github.jetradarmobile',
                         'com.github.MatrixFrog',
                         'com.github.tapadoo',
-                        'com.github.UnifiedPush',
                         'com.github.vector-im',
                         'com.github.yalantis',
                         'com.github.Zhuinden',
@@ -32,24 +31,15 @@ ext.groups = [
                 ],
                 group: [
                         'com.android',
-                        'com.android.ndk.thirdparty',
                         'com.android.tools',
                         'com.google.firebase',
                         'com.google.testing.platform',
                 ]
         ],
-        snapshot: [
-                regex: [
-                ],
-                group: [
-                        'com.vanniktech',
-                ]
-        ],
         mavenCentral: [
                 regex: [
                 ],
                 group: [
-                        'app.cash.paparazzi',
                         'ch.qos.logback',
                         'com.adevinta.android',
                         'com.airbnb.android',
@@ -62,7 +52,6 @@ ext.groups = [
                         'com.dropbox.core',
                         'com.soywiz.korlibs.korte',
                         'com.facebook.fbjni',
-                        'com.facebook.flipper',
                         'com.facebook.fresco',
                         'com.facebook.infer.annotation',
                         'com.facebook.soloader',
@@ -77,10 +66,11 @@ ext.groups = [
                         'com.gabrielittner.threetenbp',
                         'com.getkeepsafe.relinker',
                         'com.github.bumptech.glide',
+                        'com.github.filippudak',
+                        'com.github.filippudak.progresspieview',
                         'com.github.javaparser',
                         'com.github.piasy',
                         'com.github.shyiko.klob',
-                        'com.github.rubensousa',
                         'com.google',
                         'com.google.android',
                         'com.google.api.grpc',
@@ -103,7 +93,6 @@ ext.groups = [
                         'com.ibm.icu',
                         'com.jakewharton.android.repackaged',
                         'com.jakewharton.timber',
-                        'com.kgurgul.flipper',
                         'com.linkedin.dexmaker',
                         'com.mapbox.mapboxsdk',
                         'com.nulab-inc',
@@ -113,9 +102,7 @@ ext.groups = [
                         'com.pinterest.ktlint',
                         'com.posthog.android',
                         'com.squareup',
-                        'com.squareup.curtains',
                         'com.squareup.duktape',
-                        'com.squareup.leakcanary',
                         'com.squareup.moshi',
                         'com.squareup.okhttp3',
                         'com.squareup.okio',
@@ -126,15 +113,13 @@ ext.groups = [
                         'com.sun.xml.bind.mvn',
                         'com.sun.xml.fastinfoset',
                         'com.thoughtworks.qdox',
-                        // 'com.vanniktech',
+                        'com.vanniktech',
                         'commons-cli',
                         'commons-codec',
                         'commons-io',
                         'commons-logging',
                         'info.picocli',
                         'io.arrow-kt',
-                        'io.element.android',
-                        'io.github.davidburstrom.contester',
                         'io.github.detekt.sarif4k',
                         'io.github.microutils',
                         'io.github.reactivecircus.flowbinding',
@@ -151,14 +136,11 @@ ext.groups = [
                         'it.unimi.dsi',
                         'jakarta.activation',
                         'jakarta.xml.bind',
-                        'javax.activation',
                         'javax.annotation',
                         'javax.inject',
-                        'javax.xml.bind',
                         'jline',
                         'jp.wasabeef',
                         'junit',
-                        'kxml2',
                         'me.saket',
                         'net.bytebuddy',
                         'net.java',
@@ -186,14 +168,11 @@ ext.groups = [
                         'org.glassfish.jaxb',
                         'org.hamcrest',
                         'org.jacoco',
-                        'org.java-websocket',
-                        'org.jcodec',
                         'org.jetbrains',
                         'org.jetbrains.dokka',
                         'org.jetbrains.intellij.deps',
                         'org.jetbrains.kotlin',
                         'org.jetbrains.kotlinx',
-                        'org.jetbrains.trove4j',
                         'org.json',
                         'org.jsoup',
                         'org.junit',

docs/_developer_onboarding.md

@@ -1,259 +0,0 @@
-# Developer on boarding
-
-<!--- TOC -->
-
-* [Introduction](#introduction)
-  * [Quick introduction to Matrix](#quick-introduction-to-matrix)
-    * [Matrix data](#matrix-data)
-      * [Room](#room)
-      * [Event](#event)
-    * [Sync](#sync)
-      * [Glossary about syncs](#glossary-about-syncs)
-  * [The Android project](#the-android-project)
-  * [Matrix SDK](#matrix-sdk)
-  * [Application](#application)
-    * [MvRx](#mvrx)
-      * [Behavior](#behavior)
-    * [Epoxy](#epoxy)
-    * [Other frameworks](#other-frameworks)
-  * [Push](#push)
-  * [Dependencies management](#dependencies-management)
-  * [Test](#test)
-  * [Other points](#other-points)
-    * [Logging](#logging)
-    * [Rageshake](#rageshake)
-  * [Tips](#tips)
-* [Happy coding!](#happy-coding)
-
-<!--- END -->
-
-## Introduction
-
-This doc is a quick introduction about the project and its architecture.
-
-It's aim is to help new developers to understand the overall project and where to start developing.
-
-Other useful documentation:
-- all the docs in this folder!
-- the [contributing doc](../CONTRIBUTING.md), that you should also read carefully.
-
-### Quick introduction to Matrix
-
-Matrix website: [matrix.org](https://matrix.org), [discover page](https://matrix.org/discover).
-*Note*: Matrix.org is also hosting a homeserver ([.well-known file](https://matrix.org/.well-known/matrix/client)).
-The reference homeserver (this is how Matrix servers are called) implementation is [Synapse](https://github.com/matrix-org/synapse/). But other implementations exist. The Matrix specification is here to ensure that any Matrix client, such as Element Android and its SDK can talk to any Matrix server.
-
-Have a quick look to the client-server API documentation: [Client-server documentation](https://spec.matrix.org/v1.3/client-server-api/). Other network API exist, the list is here: (https://spec.matrix.org/latest/)
-
-Matrix is an open source protocol. Change are possible and are tracked using [this GitHub repository](https://github.com/matrix-org/matrix-doc/). Changes to the protocol are called MSC: Matrix Spec Change. These are PullRequest to this project.
-
-Matrix object are Json data. Unstable prefixes must be used for Json keys when the MSC is not merged (i.e. accepted). 
-
-#### Matrix data
-
-There are many object and data in the Matrix worlds. Let's focus on the most important and used, `Room` and `Event`
-
-##### Room
-
-`Room` is a place which contains ordered `Event`s. They are identified with their `room_id`. Nearly all the data are stored in rooms, and shared using homeserver to all the Room Member.
-
-*Note*: Spaces are also Rooms with a different `type`.
-
-##### Event
-
-`Events` are items of a Room, where data is embedded.
-
-There are 2 types of Room Event:
-
-- Regular Events: contain useful content for the user (message, image, etc.), but are not necessarily displayed as this in the timeline (reaction, message edition, call signaling).
-- State Events: contain the state of the Room (name, topic, etc.). They have a non null value for the key `state_key`.
-
-Also all the Room Member details are in State Events: one State Event per member. In this case, the `state_key` is the matrixId (= userId).
-
-Important Fields of an Event:
-- `event_id`: unique across the Matrix universe;
-- `room_id`: the room the Event belongs to;
-- `type`: describe what the Event contain, especially in the `content` section, and how the SDK should handle this Event;
-- `content`: dynamic Event data; depends on the `type`.
-
-So we have a triple `event_id`, `type`, `state_key` which uniquely defines an Event.
-
-#### Sync
-
-The `Sync` is a way for the Matrix client to be up to date regarding the user data hosted by the server. All the Events are coming through the sync response. More details can be found here: [spec.matrix.org/v1.3/client-server-api/#syncing](https://spec.matrix.org/v1.3/client-server-api/#syncing)
-When the application is in foreground, this is a looping request. We are using Https requests, which offer the advantage to be compatible with any homeserver. A sync token is used as request parameter, to let the server know what the client knows.
-The `SyncThread` is responsible to manage the sync request loop.
-
-When the application is in background, a Push will trigger a sync request.
-
-##### Glossary about syncs
-
-- **initial sync**: a sync request without a token. This is the first request a client perform after login or after a clear cache. The server will include in the response all your rooms with the full state (all the room membership Event will not be present), with the latest messages for each room. We are in the process to replace this by version 3: sliding sync. All data are inserted to the Database (currently [Realm](https://www.mongodb.com/docs/realm/sdk/java/)).
-- **incremental sync**: sync request with a token.
-- **gappy sync**: sync request where all the new Events are not returned for one or several Rooms. Also called `limited sync`. It can be limited per Room. To get all the missing Events, a Room pagination API has to be called.
-- **sync token**: `next_batch` value in the previous sync response. Will be provided as the `since` parameter for the next sync request.
-
-### The Android project
-
-The project should compile out of the box.
-
-The project is split into several modules. The main ones are:
-For the app
-- `vector-app`: application entry point;
-- `vector`: legacy application, but now a library. In the process of being split into several modules;
-- `vector-config`: this is where all the configuration of the application should occurs. Should because we are in the process of migrating all the configuration here;
-- `library/ui-strings`: this is where all the string resources are stored. Please refer to [contributing doc](../CONTRIBUTING.md) to know how to make change on this module;
-- `library/ui-styles`: this is where the Android styles are defined.
-
-For the SDK
-- `matrix-sdk-android`: the main SDK module. The sources are in this project, but are also exported to [its own project](https://github.com/matrix-org/matrix-android-sdk2). All the PRs and issues related to the SDK take place in the Element Android project;
-- `matrix-sdk-android-flow`: contains some wrapper to expose `Flow` to the application.
-
-### Matrix SDK
-
-SDK exposes `Services` to the client application. `Services` are public interface, and are defined in this parent package: `org.matrix.android.sdk.api`. Default implementation are internal to the SDK, in this parent package: `org.matrix.android.sdk.internal`. Note that you also have to declare the classes as `internal` when adding classes to the `org.matrix.android.sdk.internal` package.
-
-Interface allows us to replace the implementation for testing purpose.
-
-A generated documentation of the SDK is available [here](https://matrix-org.github.io/matrix-android-sdk2/). Updated after each release. Please ensure that the documentation (KDoc) of all the SDK Services is up to date, and is clear for a SDK user.
-The SDK generated documentation also contains information about the entry points of the SDK.
-
-[Dagger](https://dagger.dev/) is used to inject all the dependencies to the SDK classes.
-
-SDK is exposing data as `LiveData`, but we are progressively migrating to `Flow`. Database is the source of truth.
-
-Example:
-- Client send an Event using the `SendService`;
-- At the end a `SendEvent` task is used;
-- Retrofit API is used to send data to the server;
-- Goes to the server, which returns only the `event_id`;
-- The `Event` is coming back from the `sync` response with eventually extra added data.
-
-### Application
-
-This is the UI part of the project.
-
-There are two variants of the application: `Gplay` and `Fdroid`.
-
-The main difference is about using Firebase on `Gplay` variant, to have Push from Google Services. `FDroid` variant cannot contain closed source dependency.
-
-`Fdroid` is using background polling to lack the missing of Pushed. Now a solution using UnifiedPush has ben added to the project. See refer to [the dedicated documentation](./unifiedpush.md) for more details.
-
-#### MvRx
-
-[Maverick](https://airbnb.io/mavericks/#/README) (or MvRx) is an Android MVI framework that helps to develop Reactive application on Android.
-
-- Activity: holder for Fragment. See the parent [VectorBaseActivity](../vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt);
-- Fragment: manage screen of the application. See the parent [VectorBaseFragment](../vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt);
-- BottomSheet: see the parent [VectorBaseBottomSheetDialogFragment](../vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt);
-- ViewModel: this is where the logic is placed. All our ViewModel has a `handle()` which takes action as parameter. See the parent [VectorViewModel](../vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt);
-- VectorSharedActionViewModel: Specific ViewModel that can be used to communicate between Fragment(s) and the host Activity. See the parent [VectorSharedActionViewModel](../vector/src/main/java/im/vector/app/core/platform/VectorSharedActionViewModel.kt);
-- ViewState: this are `data class`, and this represent the state of the View. Has to be copied and set to be updated. Fragment will update the UI regarding the current state (`invalidate()` method). `Async` class from MvRx can be used in the ViewState, especially for asynchronous data loading. Nullability can also be used for optional data. ViewStates have to implement `MavericksState`;
-- ViewEvents: useful when the ViewModel asks the View to trigger a specific action: navigation, show dialog, etc. See the parent [VectorViewEvents](../vector/src/main/java/im/vector/app/core/platform/VectorViewEvents.kt);
-- ViewAction (`VectorViewModelAction`): useful when the UI (generally the Fragment) asks the ViewModel to do something. See the parent [VectorViewModelAction](../vector/src/main/java/im/vector/app/core/platform/VectorViewModelAction.kt);
-- Controller: see the `Epoxy` section just below.
-
-##### Behavior
-
-Fragment asks the ViewModel to perform an action (coming from the user, but not necessarily. ViewModel can then talk to the SDK, updates the state once or several times. Fragment update the UI regarding the new state.
-
-When ViewModel is instantiated, it can subscribe using the SDK Services to get live state of the data.
-
-`invalidate()` has to be used by default, but it's possible to listen to specific member(s) of the `ViewState` using `onEach`. TODO Add an example.
-`awaitState()` method
-
-#### Epoxy
-
-[Epoxy](https://github.com/airbnb/epoxy) is an Android library for building complex screens in a RecyclerView. Please read [the introduction](https://github.com/airbnb/epoxy#epoxy).
-
-- Controller declares items of the RecyclerView. Controller is injected in the Fragment. Controller extends `EpoxyController`, or one of its subclass, especially `TypedEpoxyController`;
-- Fragment gives the state to the controller using `setData`;
-- `buildModels` will be called by the framework;
-- Controller will create ordered Items.
-
-Epoxy does the diffing, and handle many other thing for us, like handling item type, etc.
-
-See for instance the controller [AccountDataEpoxyController](../vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt)) for a simple example.
-
-Warning: do not use twice the same item `id` or it will crash.
-
-#### Other frameworks
-
-- Dependency injection is managed by [Dagger](https://dagger.dev/) (SDK) and [Hilt](https://developer.android.com/training/dependency-injection/hilt-android) (App);
-- [Retrofit](https://square.github.io/retrofit/) and [OkHttp3](https://square.github.io/okhttp/): network requests;
-- [Moshi](https://github.com/square/moshi) is used to parse and serialize Json object; 
-
-### Push
-
-Please see the dedicated documentation for more details.
-
-This is the classical scenario:
-
-- App receives a Push. Note: Push is ignored if app is in foreground;
-- App asks the SDK to load Event data (fastlane mode). We have a change to get the data faster and display the notification faster;
-- App asks the SDK to perform a sync request.
-
-### Dependencies management
-
-All the dependencies are declared in `build.gradle` files. But some versions are declared in [this dedicated file](../dependencies.gradle).
-
-When adding a new dependency, you will have to update the file [dependencies_groups.gradle](../dependencies_groups.gradle) to allow the dependency to be downloaded from the artifact repository. Sometimes sub-dependencies need to be added too, until the project can compile.
-
-[Dependabot](https://github.com/dependabot) is set up on the project. This tool will automatically create Pull Request to upgrade our dependencies one by one.
-dependencies_group, gradle files, Dependabot, etc.
-
-### Test
-
-Please refer to [this dedicated document](./ui-tests.md).
-
-TODO add link to the dedicated screenshot test documentation
-
-### Other points
-
-#### Logging
-
-**Important warning: ** NEVER log private user data, or use the flag `LOG_PRIVATE_DATA`. Be very careful when logging `data class`, all the content will be output!
-
-[Timber](https://github.com/JakeWharton/timber) is used to log data to logcat. We do not use directly the `Log` class. If possible please use a tag, as per
-
-````kotlin
-Timber.tag(loggerTag.value).d("my log")
-````
-
-because automatic tag (= class name) will not be available on the release version.
-
-Also generally it is recommended to provide the `Throwable` to the Timber log functions.
-
-Last point, not that `Timber.v` function may have no effect on some devices. Prefer using `Timber.d` and up.
-
-#### Rageshake
-
-Rageshake is a feature to send bug report directly from the application. Just shake your phone and you will be prompted to send a bug report.
-
-Bug report can contain:
-- a screenshot of the current application state
-- the application logs from up to 15 application starts
-- the logcat logs
-- the key share history (crypto data)
-
-The data will be sent to an internal server, which is not publicly accessible. A GitHub issue will also be created to a private GitHub repository.
-
-Rageshake can be very useful to get logs from a release version of the application.
-
-### Tips
-
-- Element Android has a `developer mode` in the `Settings/Advanced settings`. Other useful options are available here;
-- Show hidden Events can also help to debug feature. When developer mode is enabled, it is possible to view the source (= the Json content) of any Events;
-- Type `/devtools` in a Room composer to access a developer menu. There are some other entry points. Developer mode has to be enabled;
-- Hidden debug menu: when developer mode is enabled and on debug build, there are some extra screens that can be accessible using the green wheel. In those screens, it will be possible to toggle some feature flags;
-- Using logcat, filtering with `onResume` can help you to understand what screen are currently displayed on your device. Searching for string displayed on the screen can also help to find the running code in the codebase.
-- When this is possible, prefer using `sealed interface` instead of `sealed class`;
-- When writing temporary code, using the string "DO NOT COMMIT" in a comment can help to avoid committing things by mistake. If committed and pushed, the CI will detect this String and will warn the user about it.
-
-## Happy coding!
-
-The team is here to support you, feel free to ask anything to other developers.
-
-Also please feel to update this documentation, if incomplete/wrong/obsolete/etc.
-
-**Thanks!**

docs/add_threePids.md

@@ -1,34 +1,5 @@
 # Adding and removing ThreePids to an account
 
-<!--- TOC -->
-
-* [Add email](#add-email)
-  * [User enter the email](#user-enter-the-email)
-    * [The email is already added to an account](#the-email-is-already-added-to-an-account)
-    * [The email is free](#the-email-is-free)
-* [User receives an e-mail](#user-receives-an-e-mail)
-  * [User clicks on the link](#user-clicks-on-the-link)
-  * [User returns on Element](#user-returns-on-element)
-  * [User enters his password](#user-enters-his-password)
-    * [The link has not been clicked](#the-link-has-not-been-clicked)
-    * [Wrong password](#wrong-password)
-    * [The link has been clicked and the account password is correct](#the-link-has-been-clicked-and-the-account-password-is-correct)
-* [Remove email](#remove-email)
-  * [User want to remove an email from his account](#user-want-to-remove-an-email-from-his-account)
-    * [Email was not bound to an identity server](#email-was-not-bound-to-an-identity-server)
-    * [Email was bound to an identity server](#email-was-bound-to-an-identity-server)
-* [Add phone number](#add-phone-number)
-    * [The phone number is already added to an account](#the-phone-number-is-already-added-to-an-account)
-    * [The phone number is free](#the-phone-number-is-free)
-* [User receive a text message](#user-receive-a-text-message)
-  * [User enter the code to the app](#user-enter-the-code-to-the-app)
-    * [Wrong code](#wrong-code)
-    * [Correct code](#correct-code)
-* [Remove phone number](#remove-phone-number)
-  * [User wants to remove a phone number from his account](#user-wants-to-remove-a-phone-number-from-his-account)
-
-<!--- END -->
-
 ## Add email
 
 ### User enter the email

docs/analytics.md

@@ -1,13 +1,5 @@
 # Analytics in Element
 
-<!--- TOC -->
-
-* [Solution](#solution)
-* [How to add a new Event](#how-to-add-a-new-event)
-* [Forks of Element](#forks-of-element)
-
-<!--- END -->
-
 ## Solution
 
 Element is using PostHog to send analytics event.

docs/color_migration_guide.md

@@ -1,14 +1,5 @@
 # Color migration
 
-<!--- TOC -->
-
-  * [Changes](#changes)
-  * [Main change for developers](#main-change-for-developers)
-  * [Remaining work](#remaining-work)
-  * [Migration guide](#migration-guide)
-
-<!--- END -->
-
 ### Changes
 
 - use colors defined in https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=557%3A0

docs/danger.md

@@ -1,106 +0,0 @@
-## Danger
-
-<!--- TOC -->
-
-* [What does danger checks](#what-does-danger-checks)
-  * [PR check](#pr-check)
-  * [Quality check](#quality-check)
-* [Setup](#setup)
-* [Run danger locally](#run-danger-locally)
-* [Danger user](#danger-user)
-* [Useful links](#useful-links)
-
-<!--- END -->
-
-## What does danger checks
-
-### PR check
-
-See the [dangerfile](../tools/danger/dangerfile.js). If you add rules in the dangerfile, please update the list below!
-
-Here are the checks that Danger does so far:
-
-- PR description is not empty
-- Big PR got a warning to recommend to split
-- PR contains a file for towncrier and extension is checked
-- PR does not modify frozen classes
-- PR contains a Sign-Off, with exception for Element employee contributors
-- PR with change on layout should include screenshot in the description
-- PR which adds png file warn about the usage of vector drawables
-- non draft PR should have a reviewer
-- files containing translations are not modified by developers
-
-### Quality check
-
-After all the checks that generate checkstyle XML report, such as Ktlint, lint, or Detekt, Danger is run with this [dangerfile](../tools/danger/dangerfile-lint.js), in order to post comments to the PR with the detected error and warnings.
-
-To run locally, you will have to install the plugin `danger-plugin-lint-report` using:
-
-```shell
-yarn add danger-plugin-lint-report --dev
-```
-
-## Setup
-
-This operation should not be necessary, since Danger is already setup for the project.
-
-To setup danger to the project, run:
-
-```shell
-bundle exec danger init
-```
-
-## Run danger locally
-
-When modifying the [dangerfile](../tools/danger/dangerfile.js), you can check it by running Danger locally.
-
-To run danger locally, install it and run:
-
-```shell
-bundle exec danger pr <PR_URL> --dangerfile=./tools/danger/dangerfile.js
-```
-
-For instance:
-
-```shell
-bundle exec danger pr https://github.com/vector-im/element-android/pull/6637 --dangerfile=./tools/danger/dangerfile.js
-```
-
-We may need to create a GitHub token to have less API rate limiting, and then set the env var:
-
-```shell
-export DANGER_GITHUB_API_TOKEN='YOUR_TOKEN'
-```
-
-Swift and Kotlin (just in case)
-
-```shell
-bundle exec danger-swift pr <PR_URL> --dangerfile=./tools/danger/dangerfile.js
-bundle exec danger-kotlin pr <PR_URL> --dangerfile=./tools/danger/dangerfile.js
-```
-
-## Danger user
-
-To let Danger check all the PRs, including PRs form forks, a GitHub account have been created:
-- login: ElementBot
-- password: Stored on Passbolt
-- GitHub token: A token with limited access has been created and added to the repository https://github.com/vector-im/element-android as secret DANGER_GITHUB_API_TOKEN. This token is not saved anywhere else. In case of problem, just delete it and create a new one, then update the secret.
-
-PRs from forks do not always have access to the secret `secrets.DANGER_GITHUB_API_TOKEN`, so `secrets.GITHUB_TOKEN` is also provided to the job environment. If `secrets.DANGER_GITHUB_API_TOKEN` is available, it will be used, so user `ElementBot` will comment the PR. Else `secrets.GITHUB_TOKEN` will be used, and bot `github-actions` will comment the PR.
-
-## Useful links
-
-- https://danger.systems/
-- https://danger.systems/js/
-- https://danger.systems/js/guides/getting_started.html
-- https://danger.systems/js/reference.html
-- https://github.com/danger/awesome-danger
-
-Some danger files to get inspired from
-
-- https://github.com/artsy/emission/blob/master/dangerfile.ts
-- https://github.com/facebook/react-native/blob/master/bots/dangerfile.js
-- https://github.com/apollographql/apollo-client/blob/master/config/dangerfile.ts
-- https://github.com/styleguidist/react-styleguidist/blob/master/dangerfile.js
-- https://github.com/storybooks/storybook/blob/master/dangerfile.js
-- https://github.com/ReactiveX/rxjs/blob/master/dangerfile.js

docs/design.md

@@ -1,31 +1,5 @@
 # Element Android design
 
-<!--- TOC -->
-
-* [Introduction](#introduction)
-* [How to import from Figma to the Element Android project](#how-to-import-from-figma-to-the-element-android-project)
-  * [Colors](#colors)
-  * [Text](#text)
-  * [Dimension, position and margin](#dimension-position-and-margin)
-  * [Icons](#icons)
-    * [Export drawable from Figma](#export-drawable-from-figma)
-    * [Import in Android Studio](#import-in-android-studio)
-  * [Images](#images)
-* [Figma links](#figma-links)
-  * [Coumpound](#coumpound)
-  * [Login](#login)
-    * [Login v2](#login-v2)
-  * [Room list](#room-list)
-  * [Timeline](#timeline)
-  * [Voice message](#voice-message)
-  * [Room settings](#room-settings)
-  * [VoIP](#voip)
-  * [Presence](#presence)
-  * [Spaces](#spaces)
-  * [List to be continued...](#list-to-be-continued)
-
-<!--- END -->
-
 ## Introduction
 
 Design at element.io is done using Figma - https://www.figma.com

docs/flipper.md

@@ -1,58 +0,0 @@
-# Flipper
-
-<!--- TOC -->
-
-* [Introduction](#introduction)
-* [Setup](#setup)
-  * [Troubleshoot](#troubleshoot)
-    * [No device found issue](#no-device-found-issue)
-    * [Diagnostic Activity](#diagnostic-activity)
-    * [Other](#other)
-* [Links](#links)
-
-<!--- END -->
-
-## Introduction
-
-[Flipper](https://fbflipper.com) is a powerful tool from Meta, which allow to inspect the running application details and states from your computer.
-
-Flipper is configured in the Element Android project to let the developers be able to:
-- inspect all the Realm databases content;
-- do layout inspection;
-- see the crash logs;
-- see the logcat;
-- see all the network requests;
-- see all the SharedPreferences;
-- take screenshots and record videos of the device;
-- and more!
-
-## Setup
-
-- Install Flipper on your computer. Follow instructions here: https://fbflipper.com/docs/getting-started/index/
-- Run the debug version of Element on an emulator or on a real device.
-
-### Troubleshoot
-
-#### No device found issue
-
-The configuration of the Flipper application has to be updated. The issue has been asked and answered here: https://stackoverflow.com/questions/71744103/android-emulator-unable-to-connect-to-flipper/72608113#72608113
-
-#### Diagnostic Activity
-
-Flipper comes with a Diagnostic Activity that you can start from command line using:
-
-```shell
-adb shell am start -n im.vector.app.debug/com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity
-```
-
-It provides some log which can help to figure out what's going on client side.
-
-#### Other
-
-https://fbflipper.com/docs/getting-started/troubleshooting/android/ may help.
-
-## Links
-
-- Official Flipper website: https://fbflipper.com
-- Realm Plugin for Flipper: https://github.com/kamgurgul/Flipper-Realm
-- Dedicated Matrix room: https://matrix.to/#/#unifiedpush:matrix.org

docs/hilt_migration.md

@@ -7,8 +7,8 @@ Hilt is built on top of Dagger 2 and simplify usage by removing needs to create
 When you create a new feature, you should have the following:
 
 Annotate your Activity with @AndroidEntryPoint
-Annotate your Fragment with @AndroidEntryPoint
 If you have a BottomSheetFragment => Annotate it with @AndroidEntryPoint
+Otherwise => Add your Fragment to the FragmentModule
 Add your ViewModel.Factory to the MavericksViewModelModule
 Makes sure your ViewModel as the following code:
 

docs/identity_server.md

@@ -1,19 +1,5 @@
 # Identity server
 
-<!--- TOC -->
-
-* [Introduction](#introduction)
-* [Implementation](#implementation)
-* [Related MSCs](#related-mscs)
-* [Steps and requirements](#steps-and-requirements)
-* [Screens](#screens)
-  * [Settings](#settings)
-  * [Discovery screen](#discovery-screen)
-  * [Set identity server screen](#set-identity-server-screen)
-* [Ref:](#ref:)
-
-<!--- END -->
-
 Issue: #607
 PR: #1354
 

docs/integration_tests.md

@@ -1,18 +1,5 @@
 # Integration tests
 
-<!--- TOC -->
-
-* [Pre requirements](#pre-requirements)
-* [Install and run Synapse](#install-and-run-synapse)
-* [Run the test](#run-the-test)
-* [Stop Synapse](#stop-synapse)
-* [Troubleshoot](#troubleshoot)
-  * [Android Emulator does cannot reach the homeserver](#android-emulator-does-cannot-reach-the-homeserver)
-  * [Tests partially run but some fail with "Unable to contact localhost:8080"](#tests-partially-run-but-some-fail-with-"unable-to-contact-localhost:8080")
-  * [virtualenv command fails](#virtualenv-command-fails)
-
-<!--- END -->
-
 Integration tests are useful to ensure that the code works well for any use cases.
 
 They can also be used as sample on how to use the Matrix SDK.

docs/jitsi.md

@@ -1,32 +1,20 @@
 # Jitsi in Element Android
 
-<!--- TOC -->
-
-* [Native Jitsi SDK](#native-jitsi-sdk)
-  * [How to build the Jitsi Meet SDK](#how-to-build-the-jitsi-meet-sdk)
-    * [Jitsi version](#jitsi-version)
-    * [Run the build script](#run-the-build-script)
-    * [Link with the new generated library](#link-with-the-new-generated-library)
-    * [Sanity tests](#sanity-tests)
-    * [Export the build library](#export-the-build-library)
-
-<!--- END -->
-
 Native Jitsi support has been added to Element Android by the PR [#1914](https://github.com/vector-im/element-android/pull/1914). The description of the PR contains some documentation about the behaviour in each possible room configuration.
 
 Also, ensure to have a look on [the documentation from Element Web](https://github.com/vector-im/element-web/blob/develop/docs/jitsi.md)
 
 The official documentation about how to integrate the Jitsi SDK in an Android app is available here: https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-android-sdk.
 
-## Native Jitsi SDK
+# Native Jitsi SDK
 
 The Jitsi SDK is built by ourselves with the flag LIBRE_BUILD, to be able to be integrated on the F-Droid version of Element Android.
 
 The generated maven repository is then host in the project https://github.com/vector-im/jitsi_libre_maven
 
-### How to build the Jitsi Meet SDK
+## How to build the Jitsi Meet SDK
 
-#### Jitsi version
+### Jitsi version
 
 Update the script `./tools/jitsi/build_jisti_libs.sh` with the tag of the project `https://github.com/jitsi/jitsi-meet`.
 
@@ -34,7 +22,7 @@ Latest tag can be found from this page: https://github.com/jitsi/jitsi-meet-rele
 
 Currently we are building the version with the tag `android-sdk-3.10.0`.
 
-#### Run the build script
+### Run the build script
 
 At the root of the Element Android, run the following script:
 
@@ -44,7 +32,7 @@ At the root of the Element Android, run the following script:
 
 It will build the Jitsi Meet Android library and put every generated files in the folder `/tmp/jitsi`
 
-#### Link with the new generated library
+### Link with the new generated library
 
 - Update the file `./build.gradle` to use the previously created local Maven repository. Currently we have this line:
 
@@ -69,7 +57,7 @@ implementation('com.facebook.react:react-native-webrtc:1.92.1-jitsi-9093212@aar'
 - Perform a gradle sync and build the project
 - Perform test
 
-#### Sanity tests
+### Sanity tests
 
 In order to validate that the upgrade of the Jitsi and WebRTC dependency does not break anything, the following sanity tests have to be performed, using two devices:
 - Make 1-1 audio call (so using WebRTC)
@@ -77,7 +65,7 @@ In order to validate that the upgrade of the Jitsi and WebRTC dependency does no
 - Create and join a conference call with audio only (so using Jitsi library). Leave the conference. Join it again.
 - Create and join a conference call with audio and video (so using Jitsi library) Leave the conference. Join it again.
 
-#### Export the build library
+### Export the build library
 
 If all the tests are passed, you can export the generated Jitsi library to our Maven repository.
 
@@ -93,4 +81,4 @@ url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-3.10.
 
 - Build the project and perform the sanity tests again.
 
-- Update the file `/CHANGES.md` to notify about the library upgrade, and create a regular PR for project Element Android.
+- Update the file `/CHANGES.md` to notify about the library upgrade, and create a regular PR for project Element Android.

docs/nightly_build.md

@@ -1,54 +0,0 @@
-# Nightly builds
-
-<!--- TOC -->
-
-* [Configuration](#configuration)
-* [How to register to get nightly build](#how-to-register-to-get-nightly-build)
-* [Build nightly manually](#build-nightly-manually)
-
-<!--- END -->
-
-## Configuration
-
-The nightly build will contain what's on develop, in release mode, for Gplay variant. It is signed using a dedicated signature, and has a dedicated appId (`im.vector.app.nightly`), so it can be installed along with the production version of Element Android. The only other difference compared to Element Android is a different app icon background. We do not want to change the app name since it will also affect some strings in the app, and we do want to do that.
-
-Nightly builds are built and released to Firebase every days, and automatically.
-
-This is recommended to exclusively use this app, with your main account, instead of Element Android, and fallback to Element Android just in case of regression, to discover as soon as possible any regression, and report it to the team. To avoid double notification, you may want to disable the notification from the Element Android production version. Just open Element Android, navigate to `Settings/Notifications` and uncheck `Enable notifications for this session`.
-
-*Note:* Due to a limitation of Firebase, the nightly build is the universal build, which means that the size of the APK is a bit bigger, but this should not have any other side effect.
-
-## How to register to get nightly build
-
-Provide your email to the Android team, who will add it to the list "External testers" on Firebase. You will then receive an invite on the provided email.
-
-Follow the instructions on the email to install the latest nightly build. This is not clear yet if new nightly build will be automatically installed or not.
-
-## Build nightly manually
-
-Nightly build can be built manually from your computer. You will need to retrieved some secrets from Passbolt and add them to your file `~/.gradle/gradle.properties`:
-
-```
-signing.element.nightly.storePassword=VALUE_FROM_PASSBOLT
-signing.element.nightly.keyId=VALUE_FROM_PASSBOLT
-signing.element.nightly.keyPassword=VALUE_FROM_PASSBOLT
-```
-
-You will also need to add the environment variable `FIREBASE_TOKEN`:
-
-```sh
-export FIREBASE_TOKEN=VALUE_FROM_PASSBOLT
-```
-
-Then you can run the following commands (which are also used in the file for [the GitHub action](../.github/workflows/nightly.yml)):
-
-```sh
-git checkout develop
-mv towncrier.toml towncrier.toml.bak
-sed 's/CHANGES\.md/CHANGES_NIGHTLY\.md/' towncrier.toml.bak > towncrier.toml
-rm towncrier.toml.bak
-yes n | towncrier build --version nightly
-./gradlew assembleGplayNightly appDistributionUploadGplayNightly $CI_GRADLE_ARG_PROPERTIES
-```
-
-Then you can reset the change on the codebase.

docs/notifications.md

@@ -1,42 +1,37 @@
 This document aims to describe how Element android displays notifications to the end user. It also clarifies notifications and background settings in the app.
 
 # Table of Contents
-
-<!--- TOC -->
-
-* [Prerequisites Knowledge](#prerequisites-knowledge)
-  * [How does a matrix client get a message from a homeserver?](#how-does-a-matrix-client-get-a-message-from-a-homeserver?)
-  * [How does a mobile app receives push notification](#how-does-a-mobile-app-receives-push-notification)
-  * [Push VS Notification](#push-vs-notification)
-  * [Push in the matrix federated world](#push-in-the-matrix-federated-world)
-  * [How does the homeserver know when to notify a client?](#how-does-the-homeserver-know-when-to-notify-a-client?)
-  * [Push vs privacy, and mitigation](#push-vs-privacy-and-mitigation)
-  * [Background processing limitations](#background-processing-limitations)
-* [Element Notification implementations](#element-notification-implementations)
-  * [Requirements](#requirements)
-  * [Foreground sync mode (Gplay and F-Droid)](#foreground-sync-mode-gplay-and-f-droid)
-  * [Push (FCM) received in background](#push-fcm-received-in-background)
-  * [FCM Fallback mode](#fcm-fallback-mode)
-  * [F-Droid background Mode](#f-droid-background-mode)
-* [Application Settings](#application-settings)
-
-<!--- END -->
+1. [Prerequisites Knowledge](#prerequisites-knowledge)
+    * [How does a matrix client get a message from a homeserver?](#how-does-a-matrix-client-get-a-message-from-a-homeserver)
+    * [How does a mobile app receives push notification?](#how-does-a-mobile-app-receives-push-notification)
+    * [Push VS Notification](#push-vs-notification)
+    * [Push in the matrix federated world](#push-in-the-matrix-federated-world)
+    * [How does the homeserver know when to notify a client?](#how-does-the-homeserver-know-when-to-notify-a-client)
+    * [Push vs privacy, and mitigation](#push-vs-privacy-and-mitigation)
+    * [Background processing limitations](#background-processing-limitations)
+2. [Element Notification implementations](#element-notification-implementations)
+    * [Requirements](#requirements) 
+    * [Foreground sync mode (Gplay & F-Droid)](#foreground-sync-mode-gplay-f-droid)
+    * [Push (FCM) received in background](#push-fcm-received-in-background)
+    * [FCM Fallback mode](#fcm-fallback-mode)
+    * [F-Droid background Mode](#f-droid-background-mode)
+3. [Application Settings](#application-settings)
 
 
 First let's start with some prerequisite knowledge
 
-## Prerequisites Knowledge
+# Prerequisites Knowledge
 
-### How does a matrix client get a message from a homeserver?
+## How does a matrix client get a message from a homeserver?
 
 In order to get messages from a homeserver, a matrix client need to perform a ``sync`` operation.
 
 `To read events, the intended flow of operation is for clients to first call the /sync API without a since parameter. This returns the most recent message events for each room, as well as the state of the room at the start of the returned timeline. `
 
-The client need to call the `sync` API periodically in order to get incremental updates of the server state (new messages).
+The client need to call the `sync`API periodically in order to get incremental updates of the server state (new messages).
 This mechanism is known as **HTTP long Polling**.
 
-Using the **HTTP Long Polling** mechanism a client polls a server requesting new information.
+Using the **HTTP Long Polling** mechanism  a client polls a server requesting new information.
 The server *holds the request open until new data is available*.
 Once available, the server responds and sends the new information.
 When the client receives the new information, it immediately sends another request, and the operation is repeated.
@@ -57,7 +52,7 @@ By default, this is 0, so the server will return immediately even if the respons
 
 When the Element Android app is open (i.e in foreground state), the default timeout is 30 seconds, and delay is 0.
 
-### How does a mobile app receives push notification
+## How does a mobile app receives push notification
 
 Push notification is used as a way to wake up a mobile application when some important information is available and should be processed.
 
@@ -71,22 +66,22 @@ FCM will only work on android devices that have Google plays services installed
 (In simple terms, Google Play Services is a background service that runs on Android, which in turn helps in integrating Google’s advanced functionalities to other applications)
 
 De-Googlified devices need to rely on something else in order to stay up to date with a server.
-There some cases when devices with google services cannot use FCM (network infrastructure limitations -firewalls-,
- privacy and or independence requirement, source code licence)
+There some cases when devices with google services cannot use FCM (network infrastructure limitations -firewalls- ,
+ privacy and or independency requirement, source code licence)
 
-### Push VS Notification
+## Push VS Notification
 
 This need some disambiguation, because it is the source of common confusion:
 
 
-*The fact that you see a notification on your screen does not mean that you have successfully configured your PUSH platform.*
+*The fact that you see a notification on your screen does not mean that you have successfully configured your PUSH plateform.*
 
   Technically there is a difference between a push and a notification. A notification is what you see on screen and/or in the notification Menu/Drawer (in the top bar of the phone).
 
   Notifications are not always triggered by a push (One can display a notification locally triggered by an alarm)
 
 
-### Push in the matrix federated world
+## Push in the matrix federated world
 
 In order to send a push to a mobile, App developers need to have a server that will use the FCM APIs, and these APIs requires authentication!
 This server is called a **Push Gateway** in the matrix world
@@ -123,11 +118,11 @@ Client/Server API  +              |                    |  |      |            |
 ```
 
 Recommended reading:
-* https://thomask.sdf.org/blog/2016/12/11/riots-magical-push-notifications-in-ios.html
+ * https://thomask.sdf.org/blog/2016/12/11/riots-magical-push-notifications-in-ios.html
 * https://matrix.org/docs/spec/client_server/r0.4.0.html#id128
 
 
-### How does the homeserver know when to notify a client?
+## How does the homeserver know when to notify a client?
 
 This is defined by [**push rules**](https://matrix.org/docs/spec/client_server/r0.4.0.html#push-rules-).
 
@@ -145,14 +140,14 @@ Of course, content patterns matching cannot be used for encrypted messages serve
 
 That is why clients are able to **process the push rules client side** to decide what kind of notification should be presented for a given event.
 
-### Push vs privacy, and mitigation
+## Push vs privacy, and mitigation
 
 As seen previously, App developers don't directly send a push to the end user's device, they use a Push Provider as intermediary. So technically this intermediary is able to read the content of what is sent.
 
 App developers usually mitigate this by sending a `silent notification`, that is a notification with no identifiable data, or with an encrypted payload. When the push is received the app can then synchronise to it's server in order to generate a local notification.
 
 
-### Background processing limitations
+## Background processing limitations
 
 A mobile applications process live in a managed word, meaning that its process can be limited (e.g no network access), stopped or killed at almost anytime by the Operating System.
 
@@ -172,15 +167,15 @@ The documentation on this subject is vague, and as per our experiments not alway
 
 It is getting more and more complex to have reliable notifications when FCM is not used.
 
-## Element Notification implementations
+# Element Notification implementations
 
-### Requirements
+## Requirements
 
 Element Android must work with and without FCM.
 * The Element android app published on F-Droid do not rely on FCM (all related dependencies are not present)
 * The Element android app published on google play rely on FCM, with a fallback mode when FCM registration has failed (e.g outdated or missing Google Play Services)
 
-### Foreground sync mode (Gplay and F-Droid)
+## Foreground sync mode (Gplay & F-Droid)
 
 When in foreground, Element performs sync continuously with a timeout value set to 10 seconds (see HttpPooling).
 
@@ -188,9 +183,9 @@ As this mode does not need to live beyond the scope of the application, and as p
 
 This mode is turned on when the app enters foreground, and off when enters background.
 
-In background, and depending on whether push is available or not, Element will use different methods to perform the syncs (Workers / Alarms / Service)
+In background, and depending on wether push is available or not, Element will use different methods to perform the syncs (Workers / Alarms / Service)
 
-### Push (FCM) received in background 
+## Push (FCM) received in background 
 
 In order to enable Push, Element must first get a push token from the firebase SDK, then register a pusher with this token on the homeserver.
 
@@ -230,10 +225,10 @@ Upon reception of the FCM push, Element will perform a sync call to the homeserv
 
 Element implements several strategies in these cases (TODO document)
 
-### FCM Fallback mode
+## FCM Fallback mode
 
 It is possible that Element is not able to get a FCM push token.
-Common errors (among several others) that can cause that:
+Common errors (amoung several others) that can cause that:
 * Google Play Services is outdated
 * Google Play Service fails in someways with FCM servers (infamous `SERVICE_NOT_AVAILABLE`)
 
@@ -251,7 +246,7 @@ Usually in this mode, what happen is when you take back your phone in your hand,
 
 The fallback mode is supposed to be a temporary state waiting for the user to fix issues for FCM, or for App Developers that has done a fork to correctly configure their FCM settings.
 
-### F-Droid background Mode
+## F-Droid background Mode
 
 The F-Droid Element flavor has no dependencies to FCM, therefore cannot relies on Push.
 
@@ -261,7 +256,7 @@ Only solution left is to use `AlarmManager`, that offers new API to allow launch
 
 Notice that these alarms, due to their potential impact on battery life, can still be restricted by the system. Documentation says that they will not be triggered more than every minutes under normal system operation, and when in low power mode about every 15 mn.
 
-These restrictions can be relaxed by requiring the app to be white listed from battery optimization.
+These restrictions can be relaxed by requirering the app to be white listed from battery optimization.
 
 F-Droid version will schedule alarms that will then trigger a Broadcast Receiver, that in turn will launch a Service (in the classic android way), and the reschedule an alarm for next time.
 
@@ -271,7 +266,9 @@ That is why on Element F-Droid, the broadcast receiver will acquire a temporary
 
 Note that foreground services require to put a notification informing the user that the app is doing something even if not launched).
 
-## Application Settings
+
+
+# Application Settings
 
 **Notifications > Enable notifications for this account**
 

docs/pull_request.md

@@ -1,43 +1,5 @@
 # Pull requests
 
-<!--- TOC -->
-
-* [Introduction](#introduction)
-* [Who should read this document?](#who-should-read-this-document?)
-* [Submitting PR](#submitting-pr)
-  * [Who can submit pull requests?](#who-can-submit-pull-requests?)
-    * [Humans](#humans)
-      * [Draft PR?](#draft-pr?)
-      * [Base branch](#base-branch)
-      * [PR Review Assignment](#pr-review-assignment)
-      * [PR review time](#pr-review-time)
-      * [Re-request PR review](#re-request-pr-review)
-      * [When create split PR?](#when-create-split-pr?)
-      * [Avoid fixing other unrelated issue in a big PR](#avoid-fixing-other-unrelated-issue-in-a-big-pr)
-    * [Bots](#bots)
-      * [Dependabot](#dependabot)
-      * [Gradle wrapper](#gradle-wrapper)
-      * [Sync analytics plan](#sync-analytics-plan)
-* [Reviewing PR](#reviewing-pr)
-  * [Who can review pull requests?](#who-can-review-pull-requests?)
-  * [What to have in mind when reviewing a PR](#what-to-have-in-mind-when-reviewing-a-pr)
-  * [Rules](#rules)
-    * [Check the form](#check-the-form)
-      * [PR title](#pr-title)
-      * [PR description](#pr-description)
-      * [File change](#file-change)
-      * [Check the commit](#check-the-commit)
-      * [Check the substance](#check-the-substance)
-      * [Make a dedicated meeting to review the PR](#make-a-dedicated-meeting-to-review-the-pr)
-  * [What happen to the issue(s)?](#what-happen-to-the-issues?)
-  * [Merge conflict](#merge-conflict)
-  * [When and who can merge PR](#when-and-who-can-merge-pr)
-    * [Merge type](#merge-type)
-  * [Resolve conversation](#resolve-conversation)
-* [Responsibility](#responsibility)
-
-<!--- END -->
-
 ## Introduction
 
 This document gives some clue about how to efficiently manage Pull Requests (PR). This document is a first draft and may be improved later.
@@ -83,16 +45,15 @@ Exceptions can occur:
 
 ##### PR Review Assignment
 
-We use automatic assignment for PR reviews. **A PR is automatically routed by GitHub to one team member** using the round robin algorithm. Additional reviewers can be used for complex changes or when the first reviewer is not confident enough on the changes.
-The process is the following:
+We use automatic assignment for PR reviews. A PR is automatically routed by GitHub to 2 team members using the round robin algorithm. The process is the following:
 
-- The PR creator selects the [element-android-reviewers](https://github.com/orgs/vector-im/teams/element-android-reviewers) team as a reviewer.
-- GitHub automatically assign the reviewer. If the reviewer is not available (holiday, etc.), remove them and set again the team, GitHub will select another reviewer.
-- Alternatively, the PR creator can directly assign specific people if they have another Android developer in their team or they think a specific reviewer should take a look at their PR.
+- The PR creator can assign specific people if they have another Android developer in their team or they think a specific reviewer should take a look at the PR.
+- If there are missing reviewers, the PR creator assigns the [element-android-reviewers](https://github.com/orgs/vector-im/teams/element-android-reviewers) team as a reviewer.
+- GitHub automatically assigns other reviewers. If one of the chosen reviewers is not available (holiday, etc.), remove them and set again the team, GitHub will select another reviewer.
 - Reviewers get a notification to make the review: they review the code following the good practice (see the rest of this document).
 - After making their own review, if they feel not confident enough, they can ask another person for a full review, or they can tag someone within a PR comment to check specific lines.
 
-For PRs coming from the community, the issue wrangler can assign either the team [element-android-reviewers](https://github.com/orgs/vector-im/teams/element-android-reviewers) or any member directly.
+For PRs coming from the community, the issue wrangler can assign either the team [element-android-reviewers](https://github.com/orgs/vector-im/teams/element-android-reviewers) or any members directly.
 
 ##### PR review time
 
@@ -103,7 +64,6 @@ Some tips to achieve it:
 - Set up your GH notifications correctly
 - Check your pulls page: [https://github.com/pulls](https://github.com/pulls)
 - Check your pending assigned PRs before starting or resuming your day to day tasks
-- If you are busy with high priority tasks, inform the author. They will find another developer
 
 It is hard to define a deadline for a review. It depends on the PR size and the complexity. Let's start with a goal of 24h (working day!) for a PR smaller than 500 lines. If bigger, the submitter and the reviewer should discuss.
 
@@ -191,7 +151,7 @@ Examples of prefixes:
 - `[Bugfix]`
 - etc.
 
-Also, it's still possible to add labels to the PRs, such as `A-` or `T-` labels, even if this is not a strong requirement. We prefer to spend time to add labels on issues.
+Also, it's still possible to add labels to the PRs, such as `A-` or `T-` labels, even if this is not a string requirement. We prefer to spend time to add labels on issues.
 
 ##### PR description
 

docs/screenshot_testing.md

@@ -1,72 +0,0 @@
-# Screenshot testing
-
-<!--- TOC -->
-
-* [Overview](#overview)
-* [Setup](#setup)
-* [Recording](#recording)
-* [Verifying](#verifying)
-* [Contributing](#contributing)
-* [Example](#example)
-
-<!--- END -->
-
-## Overview
-
-- Screenshot tests are tests which record the content of a rendered screen and verify subsequent runs to check if the screen renders differently.
-- Element uses [Paparazzi](https://github.com/cashapp/paparazzi) to render, record and verify android layouts. 
-- The screenshot verification occurs on every pull request as part of the `tests.yml` workflow.
-
-## Setup
-
-- Install Git LFS through your package manager of choice (`brew install git-lfs` | `yay -S git-lfs`).
-- Install the Git LFS hooks into the project.
-
-```bash
-# with element-android as the current working directory
-git lfs install --local
-```
-
-- If installed correctly, `git push` and `git pull` will now include LFS content.
-
-## Recording
-
-- `./gradlew recordScreenshots`
-- Paparazzi will generate images in `${module}/src/test/snapshots`, which will need to be committed to the repository using Git LFS.
-
-## Verifying
-
-- `./gradlew verifyScreenshots`
-- In the case of failure, Paparazzi will generate images in `${module}/out/failure`. The images will show the expected and actual screenshots along with a delta of the two images.
-
-## Contributing
-
-- When creating a test, the file (and class) name names must include `ScreenshotTest`, eg `ItemScreenshotTest`.
-- After creating the new test, record and commit the newly rendered screens.
-- `./tools/validate_lfs` can be ran to ensure everything is working correctly with Git LFS, the CI also runs this check.
-
-## Example
-
-```kotlin
-class PaparazziExampleScreenshotTest {
-
-    @get:Rule
-    val paparazzi = Paparazzi(
-            deviceConfig = PIXEL_3,
-            theme = "Theme.Vector.Light",
-    )
-
-    @Test
-    fun `example paparazzi test`() {
-        // Inflate the layout
-        val view = paparazzi.inflate<ConstraintLayout>(R.layout.item_radio)
-
-        // Bind data to the view
-        view.findViewById<TextView>(R.id.actionTitle).text = paparazzi.resources.getString(R.string.room_settings_all_messages)
-        view.findViewById<ImageView>(R.id.radioIcon).setImageResource(R.drawable.ic_radio_on)
-
-        // Record the bound view
-        paparazzi.snapshot(view)
-    }
-}
-```

docs/signin.md

@@ -2,27 +2,6 @@
 
 This document describes the flow of signin to a homeserver, and also the flow when user want to reset his password. Examples come from the `matrix.org` homeserver.
 
-<!--- TOC -->
-
-* [Sign in flows](#sign-in-flows)
-  * [Get the flow](#get-the-flow)
-  * [Login with username](#login-with-username)
-    * [Incorrect password](#incorrect-password)
-    * [Correct password:](#correct-password:)
-  * [Login with email](#login-with-email)
-    * [Unknown email](#unknown-email)
-    * [Known email, wrong password](#known-email-wrong-password)
-      * [Known email, correct password](#known-email-correct-password)
-  * [Login with Msisdn](#login-with-msisdn)
-  * [Login with SSO](#login-with-sso)
-* [Reset password](#reset-password)
-  * [Send email](#send-email)
-    * [When the email is not known](#when-the-email-is-not-known)
-    * [When the email is known](#when-the-email-is-known)
-  * [User clicks on the link](#user-clicks-on-the-link)
-
-<!--- END -->
-
 ## Sign in flows
 
 ### Get the flow
@@ -343,4 +322,4 @@ curl -X POST --data $'{"auth":{"type":"m.login.email.identity","threepid_creds":
 {}
 ```
 
-The password has been changed, and all the existing token are invalidated. User can now login with the new password.
+The password has been changed, and all the existing token are invalidated. User can now login with the new password.

docs/signup.md

@@ -4,20 +4,6 @@ This document describes the flow of registration to a homeserver. Examples come
 
 *Ref*: https://matrix.org/docs/spec/client_server/latest#account-registration-and-management
 
-<!--- TOC -->
-
-* [Sign up flows](#sign-up-flows)
-  * [First step](#first-step)
-  * [Step 1: entering user name and password](#step-1:-entering-user-name-and-password)
-    * [If username already exists](#if-username-already-exists)
-  * [Step 2: entering email](#step-2:-entering-email)
-  * [Step 2 bis: user enters an email](#step-2-bis:-user-enters-an-email)
-  * [Step 3: Accepting T&C](#step-3:-accepting-t&c)
-  * [Step 4: Captcha](#step-4:-captcha)
-  * [Step 5: MSISDN](#step-5:-msisdn)
-
-<!--- END -->
-
 ## Sign up flows
 
 ### First step

docs/ui-tests.md

@@ -10,20 +10,6 @@ Currently the test are covering a small set of application flows:
 	- Self verification via emoji
 	- Self verification via passphrase
 
-<!--- TOC -->
-
-* [Prerequisites:](#prerequisites:)
-* [Run the tests](#run-the-tests)
-  * [From the source code](#from-the-source-code)
-  * [From command line](#from-command-line)
-* [Recipes](#recipes)
-  * [Wait for initial sync](#wait-for-initial-sync)
-  * [Accessing current activity](#accessing-current-activity)
-  * [Interact with other session](#interact-with-other-session)
-  * [Contributing to the UiAllScreensSanityTest](#contributing-to-the-uiallscreenssanitytest)
-
-<!--- END -->
-
 ## Prerequisites:
 
 Out of the box, the tests use one of the homeservers (located at http://localhost:8080) of the "Demo Federation of Homeservers" (https://github.com/matrix-org/synapse#running-a-demo-federation-of-synapses).

docs/unifiedpush.md

@@ -1,58 +0,0 @@
-# UnifiedPush
-
-<!--- TOC -->
-
-* [Introduction](#introduction)
-* [Configuration in Element-Android and their forks](#configuration-in-element-android-and-their-forks)
-  * [Enabling and disabling the feature](#enabling-and-disabling-the-feature)
-    * [Override the configuration at runtime](#override-the-configuration-at-runtime)
-    * [Enabling the feature](#enabling-the-feature)
-    * [Disabling the feature](#disabling-the-feature)
-  * [Useful links](#useful-links)
-
-<!--- END -->
-
-## Introduction
-
-The recently started UnifiedPush project is an Android protocol and library for apps to be able to receive distributor-agnostic push notifications.
-
-The *F-Droid* and *Gplay* flavors of Element Android support UnifiedPush, so the user can use any distributor installed on their devices. This would make it possible to have push notifications without depending on Google services or libraries. Currently, the main distributors are [ntfy](https://ntfy.sh) which does not require any setup (like manual registration) to use the public server and [NextPush](https://github.com/UP-NextPush/android), available as a nextcloud application.
-
-The *Gplay* variant uses a UnifiedPush library which basically embed a FCM distributor built into the application (so a user doesn't need to do anything other than install the app to get FCM notifications). This variant uses Google Services to receive notifications if the user has not installed any distributor. A [FCM Rewrite Proxy](https://unifiedpush.org/developers/embedded_fcm/#fcm-rewrite-proxy) is not required for Element Android's implementation of the FCM distributor - it will work with an existing Matrix push provider, such as [Sygnal](https://github.com/matrix-org/sygnal).
-
-The *F-Droid* variant does not use this library to avoid any proprietary blob. It will use a polling service if the user has not installed any distributor.
-
-In all cases, if there are other distributors available, the user will have to opt-in to one of them in the preferences.
-
-## Configuration in Element-Android and their forks
-
-### Enabling and disabling the feature
-
-Allowing the user to use an alternative distributor can be changed in [Config](../vector-config/src/main/java/im/vector/app/config/Config.kt). The flag is named `ALLOW_EXTERNAL_UNIFIED_PUSH_DISTRIBUTORS`. Default value is `true`.
-
-#### Override the configuration at runtime
-
-On debug version, it is possible to override this configuration at runtime, using the `Feature` screen. The Feature is named `Allow external UnifiedPush distributors`.
-
-#### Enabling the feature
-
-This is the default behavior of Element Android.
-
-If `ALLOW_EXTERNAL_UNIFIED_PUSH_DISTRIBUTORS` is set to true, it allows any available external UnifiedPush distributor to be chosen by the user.
-- For Gplay variant it means that FCM will be used by default, but user can choose another UnifiedPush distributor;
-- For F-Droid variant, it means that background polling will be used by default, but user can choose another UnifiedPush distributor.
-- On the UI, the setting to choose an alternative distributor will be visible to the user, and some tests in the notification troubleshoot screen will shown.
-- For F-Droid, if the user has chosen a distributor, the settings to configure the background polling will be hidden.
-
-#### Disabling the feature
-
-If `ALLOW_EXTERNAL_UNIFIED_PUSH_DISTRIBUTORS` is set to false, it prevents the usage of external UnifiedPush distributors.
-- For Gplay variant it means that only FCM will be used;
-- For F-Droid variant, it means that only background polling will be used.
-- On the UI, the setting to choose an alternative distributor will be hidden to the user, and some tests in the notification troubleshoot screen will be hidden.
-
-### Useful links
-
-- UnifiedPush official website: [https://unifiedpush.org/](https://unifiedpush.org/)
-- List of available distributors can be retrieved here: [https://unifiedpush.org/users/distributors/](https://unifiedpush.org/users/distributors/)
-- UnifiedPush project discussion can occurs here: [#unifiedpush:matrix.org](https://matrix.to/#/#unifiedpush:matrix.org)

fastlane/metadata/android/ar/short_description.txt

@@ -1 +1 @@
-برنامج المراسلة الجماعية - الرسائل المشفرة والدردشة الجماعية ومكالمات الفيديو
+مُحادثة آمنة لا مركزية و VoIP. حافظ على بياناتك آمنة من الأطراف الثالثة.

fastlane/metadata/android/ar/title.txt

@@ -1 +1 @@
-إيليمنت - تطبيق محادثات أمن
+‏Element (‏Riot.im سابقًا)

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

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Zlepšení správy ignorovaných uživatelů. Opravy různých chyb a vylepšení stability.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

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

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Vylepšena správa šifrovaných zpráv. Opravy různých chyb a vylepšení stability.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Podpora UnifiedPush a možnost používat push bez FCM.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

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

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

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

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

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

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Umožňuje vylepšené přihlašování a registraci.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

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

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Umožňuje vylepšené přihlašování a registraci.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

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

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

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

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

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

@@ -1,2 +0,0 @@
-Die wichtigsten Änderungen in dieser Version: Verbesserte Verwaltung der ignorierten Benutzer:innen. Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
-Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases

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

@@ -1,2 +0,0 @@
-Die wichtigsten Änderungen in dieser Version: Bessere Verwaltung von verschlüsselten Nachrichten. Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
-Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases

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

@@ -1,2 +0,0 @@
-Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
-Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases

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

@@ -1,2 +0,0 @@
-Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
-Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases

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

@@ -1,2 +0,0 @@
-Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
-Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases