Merge remote-tracking branch 'origin/develop' into dependency-cleanup

# Conflicts: # build.gradle # dependencies.gradle
2024-11-22 09:25:33 +03:00 · 2022-05-18 11:47:21 +02:00 · 2022-05-18 11:47:21 +02:00 · 2dcc120cf7
commit 2dcc120cf7
parent 2bbecd4cc5 f7303789a0
1749 changed files with 21552 additions and 12432 deletions
--- a/.editorconfig
+++ b/.editorconfig
--- a/.github/ISSUE_TEMPLATE/release.yml
+++ b/.github/ISSUE_TEMPLATE/release.yml
@ -23,7 +23,8 @@ body:

        ### Do the release

-        - [ ] Create release with gitflow, branch name `release/1.2.3`
+        - [ ] Make sure `develop` and `main` are up to date (git pull)
+        - [ ] Checkout develop and create a release with gitflow, branch name `release/1.2.3`
        - [ ] Check the crashes from the PlayStore
        - [ ] 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()`
@ -106,7 +107,7 @@ body:

        https://github.com/matrix-org/matrix-android-sdk2-sample

-        - [ ] Update the dependency to the new version of the SDK2. It can take some time for MavenCentral to make the librarie available. You can check status on https://repo1.maven.org/maven2/org/matrix/android/matrix-android-sdk2/
+        - [ ] Update the dependency to the new version of the SDK2. It can take a few minutes for MavenCentral to make the library available. You can check status on https://repo1.maven.org/maven2/org/matrix/android/matrix-android-sdk2/
        - [ ] Build and run the sample, you may have to fix some API break
        - [ ] Commit and push directly on `main`
    validations:
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -10,6 +10,8 @@ updates:
    directory: "/"
    schedule:
      interval: "weekly"
+    reviewers:
+      - "vector-im/element-android-reviewers"
    ignore:
      - dependency-name: "*github-script*"
  # Updates for Gradle dependencies used in the app
@ -19,6 +21,6 @@ updates:
      interval: "daily"
    open-pull-requests-limit: 200
    reviewers:
-      - "bmarty"
+      - "vector-im/element-android-reviewers"
    ignore:
      - dependency-name: com.google.zxing:core
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -67,4 +67,4 @@ jobs:
          path: |
            vector/build/outputs/apk/*/release/*.apk

-# TODO: add exodus checks
+# TODO add exodus checks
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@ -0,0 +1,22 @@
+name: Documentation
+
+on:
+  push:
+    branches: [ develop ]
+
+jobs:
+  docs:
+    name: Generate and publish Android Matrix SDK documentation
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Build docs
+        run: ./gradlew dokkaHtml
+
+      - name: Deploy docs
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./matrix-sdk-android/build/dokka/html
--- a/.github/workflows/post-pr.yml
+++ b/.github/workflows/post-pr.yml
@ -1,28 +1,43 @@
-name: Nightly Tests
+name: Integration Tests
+
+# This runs for all closed pull requests against main, including those closed without merge.
+# Further filtering occurs in 'should-i-run'

 on:
-  push:
-    branches: [ release/* ]
-  schedule:
-    # At 20:00 every day UTC
-    - cron: '0 20 * * *'
-  workflow_dispatch:
+  pull_request:
+    types: [closed]
+    branches: [develop]

 # Enrich gradle.properties for CI/CD
 env:
  CI_GRADLE_ARG_PROPERTIES: >
    -Porg.gradle.jvmargs=-Xmx4g
    -Porg.gradle.parallel=false
+
 jobs:
+
+  # More info on should-i-run:
+  # If this fails to run (the IF doesn't complete) then the needs will not be satisfied for any of the 
+  # other jobs below, so none will run.
+  # except for the notification job at the bottom which will run all the time, unless should-i-run isn't
+  # successful, or all the other jobs have succeeded
+
+  should-i-run:
+    name: Check if PR is suitable for analysis
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged # Additionally require PR to have been completely merged.
+    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 ]
-    # No concurrency required, runs every time on a schedule.
    steps:
      - uses: actions/checkout@v3
      - uses: gradle/wrapper-validation-action@v1
@ -43,11 +58,12 @@ jobs:
          restore-keys: |
            ${{ runner.os }}-gradle-
      - name: Start synapse server
-        uses: michaelkaye/setup-matrix-synapse@v1.0.1
+        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
@ -209,6 +225,7 @@ jobs:

  ui-tests:
    name: UI Tests (Synapse)
+    needs: should-i-run
    runs-on: macos-latest
    strategy:
      fail-fast: false
@ -230,11 +247,12 @@ jobs:
          restore-keys: |
            ${{ runner.os }}-gradle-
      - name: Start synapse server
-        uses: michaelkaye/setup-matrix-synapse@v1.0.1
+        uses: michaelkaye/setup-matrix-synapse@v1.0.3
        with:
          uploadLogs: true
          httpPort: 8080
          disableRateLimiting: true
+          public_baseurl: "http://10.0.2.2:8080/"
      - uses: actions/setup-java@v3
        with:
          distribution: 'adopt'
@ -266,7 +284,8 @@ jobs:

  codecov-units:
    name: Unit tests with code coverage
-    runs-on: macos-latest
+    needs: should-i-run
+    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-java@v3
@ -290,50 +309,21 @@ jobs:
          path: |
            build/reports/jacoco/allCodeCoverageReport/allCodeCoverageReport.xml

-  sonarqube:
-    name: Sonarqube upload
-    runs-on: macos-latest
-    if: always() && github.event_name == 'schedule'
-    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 scheduled runs, or pushes to the release branches, do not notify for manually triggered runs
+# Notify the channel about delayed failures
  notify:
    name: Notify matrix
    runs-on: ubuntu-latest
    needs:
+      - should-i-run
      - integration-tests
      - ui-tests
-      - sonarqube
-    if: always() && github.event_name != 'workflow_dispatch'
+      - 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:
-      - uses: michaelkaye/matrix-hookshot-action@v0.3.0
+      - uses: michaelkaye/matrix-hookshot-action@v1.0.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: "{{#if '${{ github.event_name }}' == 'schedule' }}Nightly test run{{else}}Test run (on ${{ github.ref }}){{/if }}: {{#each job_statuses }}{{#with this }}{{#if completed }}  {{name}} {{conclusion}} at {{completed_at}}, {{/if}}{{/with}}{{/each}}"
-          html_template: "{{#if '${{ github.event_name }}' == 'schedule' }}Nightly test run{{else}}Test run (on ${{ github.ref }}){{/if }}: {{#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}}"
+          hookshot_url: ${{ secrets.ELEMENT_ANDROID_HOOKSHOT_URL }}
+          text_template: "Post-merge validation of ${{ github.head_ref }} into ${{ github.base_ref }} by ${{ github.event.pull_request.merged_by }} failed: {{#each job_statuses }}{{#with this }}{{#if completed }}  {{name}} {{conclusion}} at {{completed_at}}, {{/if}}{{/with}}{{/each}}"
+          html_template: "Post-merge validation of ${{ github.head_ref }} into ${{ github.base_ref }} by ${{ github.event.pull_request.merged_by }} failed: {{#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}}"
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@ -14,6 +14,16 @@ 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:
+    name: Knit
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run knit
+        run: |
+          ./gradlew knit
+
 # ktlint for all the modules
  ktlint:
    name: Kotlin Linter
@ -147,3 +157,23 @@ jobs:
          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
--- a/.github/workflows/sonarqube.yml
+++ b/.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}}"
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@ -11,7 +11,6 @@ jobs:
    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-Threads') ||
        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') ||
@ -252,3 +251,30 @@ jobs:
        env:
          PROJECT_ID: "PN_kwDOAM0swc4AArk0"
          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  move_element_x_issues:
+    name: ElementX issues to ElementX project board
+    runs-on: ubuntu-latest
+    # Skip in forks
+    if: >
+      github.repository == 'vector-im/element-android' &&
+      (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:
+          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_kwDOAM0swc4ABTXY"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
--- a/.github/workflows/triage-move-review-requests.yml
+++ b/.github/workflows/triage-move-review-requests.yml
@ -7,6 +7,8 @@ jobs:
  add_design_pr_to_project:
    name: Move PRs asking for design review to the design board
    runs-on: ubuntu-latest
+    # Skip in forks
+    if: github.repository == 'vector-im/element-android'
    steps:
      - uses: octokit/graphql-action@v2.x
        id: find_team_members
@ -74,6 +76,8 @@ jobs:
  add_product_pr_to_project:
    name: Move PRs asking for product review to the product board
    runs-on: ubuntu-latest
+    # Skip in forks
+    if: github.repository == 'vector-im/element-android'
    steps:
      - uses: octokit/graphql-action@v2.x
        id: find_team_members
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@ -13,6 +13,8 @@ jobs:

      - name: Update Gradle Wrapper
        uses: gradle-update/update-gradle-wrapper-action@v1
+        # Skip in forks
+        if: github.repository == 'vector-im/element-android'
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          target-branch: develop
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,3 +1,169 @@
+Changes in Element v1.4.16 (2022-05-17)
+=======================================
+
+Features ✨
+----------
+ - Use key backup before requesting keys + refactor & improvement of key request/forward ([#5494](https://github.com/vector-im/element-android/issues/5494))
+ - Screen sharing over WebRTC ([#5911](https://github.com/vector-im/element-android/issues/5911))
+ - Allow using the latest user Avatar and name for all messages in the timeline ([#5932](https://github.com/vector-im/element-android/issues/5932))
+ - Added themed launch icons for Android 13 ([#5936](https://github.com/vector-im/element-android/issues/5936))
+ - Add presence indicator busy and away. ([#6047](https://github.com/vector-im/element-android/issues/6047))
+
+Bugfixes 🐛
+----------
+ - Changed copy and list order in member profile screen. ([#5825](https://github.com/vector-im/element-android/issues/5825))
+ - Fix for audio only being received in one direction after an un-hold during a sip call. ([#5865](https://github.com/vector-im/element-android/issues/5865))
+ - Desynchronized 4S | Megolm backup causing Unusable backup ([#5906](https://github.com/vector-im/element-android/issues/5906))
+ - If animations are disable on the System, chat effects and confetti will be disabled too ([#5941](https://github.com/vector-im/element-android/issues/5941))
+ - Multiple threads improvement (mainly UI) ([#5959](https://github.com/vector-im/element-android/issues/5959))
+
+Improved Documentation 📚
+------------------------
+ - Note public_baseurl requirement in integration tests documentation. ([#5973](https://github.com/vector-im/element-android/issues/5973))
+
+SDK API changes ⚠️
+------------------
+ - - New API to enable/disable key forwarding CryptoService#enableKeyGossiping()
+  - New API to limit room key request only to own devices MXCryptoConfig#limitRoomKeyRequestsToMyDevices
+  - Event Trail API has changed, now using AuditTrail events
+  - New API to manually accept an incoming key request CryptoService#manuallyAcceptRoomKeyRequest() ([#5559](https://github.com/vector-im/element-android/issues/5559))
+ - Small change in the Matrix class: deprecated methods have been removed and the constructor is now public. Also the fun `workerFactory()` has been renamed to `getWorkerFactory()` ([#5887](https://github.com/vector-im/element-android/issues/5887))
+ - Including SSL/TLS error handing when doing WellKnown lookups without a custom HomeServerConnectionConfig ([#5965](https://github.com/vector-im/element-android/issues/5965))
+
+Other changes
+-------------
+ - Improve threads rendering in the main timeline ([#5151](https://github.com/vector-im/element-android/issues/5151))
+ - Reformatted project code ([#5953](https://github.com/vector-im/element-android/issues/5953))
+ - Update check for server-side threads support to match spec. ([#5997](https://github.com/vector-im/element-android/issues/5997))
+ - Setup detekt ([#6038](https://github.com/vector-im/element-android/issues/6038))
+ - Notify the user for each new message ([#46312](https://github.com/vector-im/element-android/issues/46312))
+
+
+Changes in Element v1.4.14 (2022-05-05)
+=======================================
+
+Features ✨
+----------
+ - Improve management of ignored users ([#5772](https://github.com/vector-im/element-android/issues/5772))
+ - VoIP Screen Sharing Permission ([#5811](https://github.com/vector-im/element-android/issues/5811))
+ - Live location sharing: updating beacon state event content structure ([#5814](https://github.com/vector-im/element-android/issues/5814))
+
+Bugfixes 🐛
+----------
+ - Fixes crash when accepting or receiving VOIP calls ([#5421](https://github.com/vector-im/element-android/issues/5421))
+ - Improve/fix crashes on messages decryption ([#5592](https://github.com/vector-im/element-android/issues/5592))
+ - Tentative fix of images crashing when being sent or shared from gallery ([#5652](https://github.com/vector-im/element-android/issues/5652))
+ - Improving deactivation experience along with a crash fix ([#5721](https://github.com/vector-im/element-android/issues/5721))
+ - Adds missing suggested tag for rooms in Explore Space ([#5826](https://github.com/vector-im/element-android/issues/5826))
+ - Fixes missing call icons when threads are enabled ([#5847](https://github.com/vector-im/element-android/issues/5847))
+ - Fix UX freezing when creating secure backup ([#5871](https://github.com/vector-im/element-android/issues/5871))
+ - Fixes sign in via other requiring homeserver registration to be enabled ([#5874](https://github.com/vector-im/element-android/issues/5874))
+ - Don't pause timer when call is held. ([#5885](https://github.com/vector-im/element-android/issues/5885))
+ - Fix UISIDetector grace period bug ([#5886](https://github.com/vector-im/element-android/issues/5886))
+ - Fix a crash with space invitations in the space list, and do not display space invitation twice. ([#5924](https://github.com/vector-im/element-android/issues/5924))
+ - Fixes crash on android api 21/22 devices when opening messages due to Konfetti library ([#5925](https://github.com/vector-im/element-android/issues/5925))
+
+In development 🚧
+----------------
+ - Reorders the registration steps to prioritise email, then terms for the FTUE onboarding ([#5783](https://github.com/vector-im/element-android/issues/5783))
+ - [Live location sharing] Improve aggregation process of events ([#5862](https://github.com/vector-im/element-android/issues/5862))
+
+Improved Documentation 📚
+------------------------
+ - Update the PR process doc with 2 reviewers and a new reviewer team. ([#5836](https://github.com/vector-im/element-android/issues/5836))
+ - Improve documentation of the project and of the SDK ([#5854](https://github.com/vector-im/element-android/issues/5854))
+
+SDK API changes ⚠️
+------------------
+ - Added registrationCustom into RegistrationWizard to send custom auth params for sign up
+ - Moved terms converter into api package to make it accessible in sdk ([#5575](https://github.com/vector-im/element-android/issues/5575))
+ - Move package `org.matrix.android.sdk.api.pushrules` to `org.matrix.android.sdk.api.session.pushrules` ([#5812](https://github.com/vector-im/element-android/issues/5812))
+ - Some `Session` apis are now available by requesting the service first. For instance `Session.updateAvatar(...)` is now `Session.profileService().updateAvatar(...)`
+ - The shortcut `Room.search()` has been removed, you have to use `Session.searchService().search()` ([#5816](https://github.com/vector-im/element-android/issues/5816))
+ - Add return type to RoomApi.sendStateEvent() to retrieve the created event id ([#5855](https://github.com/vector-im/element-android/issues/5855))
+ - `Room` apis are now available by requesting the service first. For instance `Room.updateAvatar(...)` is now `Room.stateService().updateAvatar(...)` ([#5858](https://github.com/vector-im/element-android/issues/5858))
+ - Remove unecessary field `eventId` from `EventAnnotationsSummary` and `ReferencesAggregatedSummary` ([#5890](https://github.com/vector-im/element-android/issues/5890))
+ - Replace usage of `System.currentTimeMillis()` by a `Clock` interface ([#5907](https://github.com/vector-im/element-android/issues/5907))
+
+Other changes
+-------------
+ - Move "Ignored users" setting section into "Security & Privacy" ([#5773](https://github.com/vector-im/element-android/issues/5773))
+ - Add a picto for ignored users in the room member list screen ([#5774](https://github.com/vector-im/element-android/issues/5774))
+ - Autoformats entire project ([#5805](https://github.com/vector-im/element-android/issues/5805))
+ - Add a GH workflow to push ElementX issues to the global board. ([#5832](https://github.com/vector-im/element-android/issues/5832))
+ - Faster Olm decrypt when there is a lot of existing sessions ([#5872](https://github.com/vector-im/element-android/issues/5872))
+
+
+Changes in Element 1.4.13 (2022-04-26)
+======================================
+
+Bugfixes 🐛
+----------
+ - Fix UI freeze observed after each incremental sync ([#5835](https://github.com/vector-im/element-android/issues/5835))
+
+
+Changes in Element v1.4.12 (2022-04-20)
+=======================================
+
+Features ✨
+----------
+ - Add a setting to be able to always appear offline ([#5582](https://github.com/vector-im/element-android/issues/5582))
+ - Adds the ability for audio attachments to be played in the timeline ([#5586](https://github.com/vector-im/element-android/issues/5586))
+ - Do not cancel the current incremental sync request and treatment when the app goes to background ([#5719](https://github.com/vector-im/element-android/issues/5719))
+ - Improve user experience when home servers do not yet support threads ([#5761](https://github.com/vector-im/element-android/issues/5761))
+
+Bugfixes 🐛
+----------
+ - Added text next to spinner when loading information after user is clicked on space members screen ([#4305](https://github.com/vector-im/element-android/issues/4305))
+ - The string `ftue_auth_carousel_workplace_body` was declared not translatable by mistake ([#5262](https://github.com/vector-im/element-android/issues/5262))
+ - Fix some cases where the read marker line would not show up ([#5475](https://github.com/vector-im/element-android/issues/5475))
+ - Fix sometimes read marker not properly updating ([#5481](https://github.com/vector-im/element-android/issues/5481))
+ - Fix sometimes endless loading timeline ([#5554](https://github.com/vector-im/element-android/issues/5554))
+ - Use member name instead of room name in DM creation item ([#5570](https://github.com/vector-im/element-android/issues/5570))
+ - Align auto-reporting of decryption errors implementation with web client. ([#5596](https://github.com/vector-im/element-android/issues/5596))
+ - Choosing "leave all rooms and spaces" while leaving Space won't cause leaving DMs in this Space anymore ([#5609](https://github.com/vector-im/element-android/issues/5609))
+ - Fixes display name being changed when using /myroomnick ([#5618](https://github.com/vector-im/element-android/issues/5618))
+ - Fix endless loading if the event from a permalink is not found ([#5659](https://github.com/vector-im/element-android/issues/5659))
+ - Redacted events are no longer visible. ([#5707](https://github.com/vector-im/element-android/issues/5707))
+ - Don't wrongly show non-space invites in the space panel. ([#5731](https://github.com/vector-im/element-android/issues/5731))
+ - Fixes the onboarding confetti rendering behind the content instead of in-front ([#5735](https://github.com/vector-im/element-android/issues/5735))
+ - Fixes crash when navigating the app whilst processing new room keys ([#5746](https://github.com/vector-im/element-android/issues/5746))
+ - Fix sorting of uploads in encrypted rooms ([#5757](https://github.com/vector-im/element-android/issues/5757))
+ - Fixing setting transfer title in call transfer. ([#5765](https://github.com/vector-im/element-android/issues/5765))
+ - Changes destination after joining a space to Explore Space Rooms screen ([#5766](https://github.com/vector-im/element-android/issues/5766))
+ - Unignoring a user will perform an initial sync ([#5767](https://github.com/vector-im/element-android/issues/5767))
+ - Open a room by link: use the actual roomId instead of the alias ([#5786](https://github.com/vector-im/element-android/issues/5786))
+
+In development 🚧
+----------------
+ - FTUE - Adds a new homeserver selection screen when creating an account ([#2396](https://github.com/vector-im/element-android/issues/2396))
+ - FTUE - Updates the Captcha and T&Cs registration screens UI style ([#5279](https://github.com/vector-im/element-android/issues/5279))
+ - FTUE - Adds error handling within the server selection screen ([#5749](https://github.com/vector-im/element-android/issues/5749))
+ - Live Location Sharing - Send location data ([#5697](https://github.com/vector-im/element-android/issues/5697))
+ - Live Location Sharing - Show message on start of a live ([#5710](https://github.com/vector-im/element-android/issues/5710))
+ - Live Location Sharing - Attach location data to beacon info state event ([#5711](https://github.com/vector-im/element-android/issues/5711))
+ - Live Location Sharing - Update beacon info state event when sharing is ended ([#5758](https://github.com/vector-im/element-android/issues/5758))
+
+
+SDK API changes ⚠️
+------------------
+ - Include original event in live decryption listeners and update sync status naming to InitialSyncProgressing for clarity. ([#5639](https://github.com/vector-im/element-android/issues/5639))
+ - KeysBackupService.getCurrentVersion takes a new type `KeysBackupLastVersionResult` in the callback. ([#5703](https://github.com/vector-im/element-android/issues/5703))
+ - A lot of classes which were exposed to the clients and were located in the package `org.matrix.android.sdk.internal` have been moved to the package `org.matrix.android.sdk.api`.
+  All the classes which are in the package `org.matrix.android.sdk.internal` should now be declared `internal`.
+  Some unused code and classes have been removed. ([#5744](https://github.com/vector-im/element-android/issues/5744))
+ - Some data classes are now immutable, using `val` instead of `var` ([#5762](https://github.com/vector-im/element-android/issues/5762))
+
+Other changes
+-------------
+ - Upgrade konfetti lib from 1.3.2 to 2.0.2 ([#5079](https://github.com/vector-im/element-android/issues/5079))
+ - Spaces feedback section is removed from left panel ([#5486](https://github.com/vector-im/element-android/issues/5486))
+ - Reduce error logs ([#5703](https://github.com/vector-im/element-android/issues/5703))
+ - Adds a complete editor config file for our current code style ([#5727](https://github.com/vector-im/element-android/issues/5727))
+ - Updates the posthog dev environment url and api key ([#5732](https://github.com/vector-im/element-android/issues/5732))
+ - Setup Dokka to be able to generate documentation of the SDK module. Run `./gradlew matrix-sdk-android:dokkaHtml` to do it. ([#5744](https://github.com/vector-im/element-android/issues/5744))
+
+
 Changes in Element v1.4.11 (2022-04-07)
 =======================================

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -124,7 +124,9 @@ As a general rule, please never edit or add or remove translations to the projec

 #### Adding new string

-When adding new string resources, please only add new entries in file `value/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 `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 `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.

--- a/README.md
+++ b/README.md
@ -14,7 +14,7 @@ It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-androi
 [<img src="resources/img/google-play-badge.png" alt="Get it on Google Play" height="60">](https://play.google.com/store/apps/details?id=im.vector.app)
 [<img src="resources/img/f-droid-badge.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/app/im.vector.app)

-Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop) Nighly test status: [![allScreensTest](https://github.com/vector-im/element-android/actions/workflows/nightly.yml/badge.svg)](https://github.com/vector-im/element-android/actions/workflows/nightly.yml)
+Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop) Nightly test status: [![allScreensTest](https://github.com/vector-im/element-android/actions/workflows/nightly.yml/badge.svg)](https://github.com/vector-im/element-android/actions/workflows/nightly.yml)


 # New Android SDK
@ -53,3 +53,4 @@ Come chat with the community in the dedicated Matrix [room](https://matrix.to/#/
 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).

 We use [issue labels](https://github.com/vector-im/element-meta/wiki/Issue-labelling) to sort all incoming issues.
+
--- a/build.gradle
+++ b/build.gradle
@ -5,10 +5,17 @@ buildscript {
    apply from: 'dependencies_groups.gradle'

    repositories {
-        google()
+        // Do not use `google()`, it prevents Dependabot from working properly
+        maven {
+            url 'https://maven.google.com'
+        }
        maven {
            url "https://plugins.gradle.org/m2/"
        }
+        // Do not use `mavenCentral()`, it prevents Dependabot from working properly
+        maven {
+            url 'https://repo1.maven.org/maven2'
+        }
    }

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

-// ktlint Plugin
 plugins {
-    id "org.jlleitschuh.gradle.ktlint" version "10.2.1"
+    // ktlint Plugin
+    id "org.jlleitschuh.gradle.ktlint" version "10.3.0"
+    // Detekt
+    id "io.gitlab.arturbosch.detekt" version "1.20.0"
    id 'com.autonomousapps.dependency-analysis' version "1.0.0"
 }

@ -46,9 +56,12 @@ dependencyCheck {

 allprojects {
    apply plugin: "org.jlleitschuh.gradle.ktlint"
+    apply plugin: "io.gitlab.arturbosch.detekt"

    repositories {
-        mavenCentral {
+        // Do not use `mavenCentral()`, it prevents Dependabot from working properly
+        maven {
+            url 'https://repo1.maven.org/maven2'
            content {
                groups.mavenCentral.regex.each { includeGroupByRegex it }
                groups.mavenCentral.group.each { includeGroup it }
@ -71,14 +84,18 @@ allprojects {
                groups.jitsi.group.each { includeGroup it }
            }
        }
-        google {
+        // Do not use `google()`, it prevents Dependabot from working properly
+        maven {
+            url 'https://maven.google.com'
            content {
                groups.google.regex.each { includeGroupByRegex it }
                groups.google.group.each { includeGroup it }
            }
        }
        //noinspection JcenterRepositoryObsolete
-        jcenter {
+        // Do not use `jcenter`, it prevents Dependabot from working properly
+        maven {
+            url 'https://jcenter.bintray.com'
            content {
                groups.jcenter.regex.each { includeGroupByRegex it }
                groups.jcenter.group.each { includeGroup it }
@ -107,7 +124,7 @@ allprojects {
        // display the corresponding rule
        verbose = true
        disabledRules = [
-                // TODO: Re-enable these 4 rules after reformatting project
+                // TODO Re-enable these 4 rules after reformatting project
                "indent",
                "experimental:argument-list-wrapping",
                "max-line-length",
@ -128,6 +145,15 @@ allprojects {
                "experimental:kdoc-wrapping",
        ]
    }
+
+    detekt {
+        // preconfigure defaults
+        buildUponDefaultConfig = true
+        // activate all available (even unstable) rules.
+        allRules = true
+        // point to your custom config defining rules to run, overwriting default behavior
+        config = files("$rootDir/tools/detekt/detekt.yml")
+    }
 }

 task clean(type: Delete) {
--- a/changelog.d/2396.wip
+++ b/changelog.d/2396.wip
@ -1 +0,0 @@
-Adds a new homeserver selection screen when creating an account
--- a/changelog.d/4305.bugfix
+++ b/changelog.d/4305.bugfix
@ -1 +0,0 @@
-Added text next to spinner when loading information after user is clicked on space members screen
--- a/changelog.d/5079.misc
+++ b/changelog.d/5079.misc
@ -1 +0,0 @@
-Upgrade konfetti lib from 1.3.2 to 2.0.2
--- a/changelog.d/5262.bugfix
+++ b/changelog.d/5262.bugfix
@ -1 +0,0 @@
-The string `ftue_auth_carousel_workplace_body` was declared not translatable by mistake
--- a/changelog.d/5279.wip
+++ b/changelog.d/5279.wip
@ -1 +0,0 @@
-Updates the Captcha and T&Cs registration screens in the FTUE flow to match the updated UI style
--- a/changelog.d/5475.bugfix
+++ b/changelog.d/5475.bugfix
@ -1 +0,0 @@
-Fix some cases where the read marker line would not show up
--- a/changelog.d/5481.bugfix
+++ b/changelog.d/5481.bugfix
@ -1 +0,0 @@
-Fix sometimes read marker not properly updating
--- a/changelog.d/5554.bugfix
+++ b/changelog.d/5554.bugfix
@ -1 +0,0 @@
-Fix sometimes endless loading timeline
--- a/changelog.d/5570.bugfix
+++ b/changelog.d/5570.bugfix
@ -1 +0,0 @@
-Use member name instead of room name in DM creation item
--- a/changelog.d/5582.feature
+++ b/changelog.d/5582.feature
@ -1 +0,0 @@
-Add a setting to be able to always appear offline
--- a/changelog.d/5586.feature
+++ b/changelog.d/5586.feature
@ -1 +0,0 @@
-Adds the ability for audio attachments to be played in the timeline
--- a/changelog.d/5596.bugfix
+++ b/changelog.d/5596.bugfix
@ -1 +0,0 @@
-Align auto-reporting of decryption errors implementation with web client.
--- a/changelog.d/5609.bugfix
+++ b/changelog.d/5609.bugfix
@ -1 +0,0 @@
-Choosing "leave all rooms and spaces" while leaving Space won't cause leaving DMs in this Space anymore
--- a/changelog.d/5618.bugfix
+++ b/changelog.d/5618.bugfix
@ -1 +0,0 @@
-Fixes display name being changed when using /myroomnick
--- a/changelog.d/5639.sdk
+++ b/changelog.d/5639.sdk
@ -1 +0,0 @@
-Include original event in live decryption listeners and update sync status naming to InitialSyncProgressing for clarity.
--- a/changelog.d/5659.bugfix
+++ b/changelog.d/5659.bugfix
@ -1 +0,0 @@
-Fix endless loading if the event from a permalink is not found
--- a/changelog.d/5697.feature
+++ b/changelog.d/5697.feature
@ -1 +0,0 @@
-Live Location Sharing - Send location data
--- a/changelog.d/5703.misc
+++ b/changelog.d/5703.misc
@ -1 +0,0 @@
-Reduce error logs
--- a/changelog.d/5703.sdk
+++ b/changelog.d/5703.sdk
@ -1 +0,0 @@
-KeysBackupService.getCurrentVersion takes a new type `KeysBackupLastVersionResult` in the callback.
--- a/changelog.d/5707.bugfix
+++ b/changelog.d/5707.bugfix
@ -1 +0,0 @@
-Redacted events are no longer visible.
--- a/changelog.d/5710.feature
+++ b/changelog.d/5710.feature
@ -1 +0,0 @@
-Live Location Sharing - Show message on start of a live
--- a/changelog.d/5711.feature
+++ b/changelog.d/5711.feature
@ -1 +0,0 @@
-Live Location Sharing - Attach location data to beacon info state event
--- a/changelog.d/5719.feature
+++ b/changelog.d/5719.feature
@ -1 +0,0 @@
-Do not cancel the current incremental sync request and treatment when the app goes to background
--- a/changelog.d/5727.misc
+++ b/changelog.d/5727.misc
@ -1 +0,0 @@
-Adds a complete editor config file for our current code style
--- a/changelog.d/5731.bugfix
+++ b/changelog.d/5731.bugfix
@ -1 +0,0 @@
-Don't wrongly show non-space invites in the space panel.
--- a/changelog.d/5732.misc
+++ b/changelog.d/5732.misc
@ -1 +0,0 @@
-Updates the posthog dev environment url and api key
--- a/changelog.d/5735.bugfix
+++ b/changelog.d/5735.bugfix
@ -1 +0,0 @@
-Fixes the onboarding confetti rendering behind the content instead of in-front
--- a/changelog.d/5744.misc
+++ b/changelog.d/5744.misc
@ -1 +0,0 @@
-Setup Dokka to be able to generate documentation of the SDK module. Run `./gradlew matrix-sdk-android:dokkaHtml` to do it.
--- a/changelog.d/5744.sdk
+++ b/changelog.d/5744.sdk
@ -1,3 +0,0 @@
-A lot of classes which were exposed to the clients and were located in the package `org.matrix.android.sdk.internal` have been moved to the package `org.matrix.android.sdk.api`.
-All the classes which are in the package `org.matrix.android.sdk.internal` should now be declared `internal`.
-Some unused code and classes have been removed.
--- a/changelog.d/5746.bugfix
+++ b/changelog.d/5746.bugfix
@ -1 +0,0 @@
-Fixes crash when navigating the app whilst processing new room keys
--- a/changelog.d/5749.wip
+++ b/changelog.d/5749.wip
@ -1 +0,0 @@
-Adds error handling within the new FTUE server selection screen
--- a/changelog.d/5757.bugfix
+++ b/changelog.d/5757.bugfix
@ -1 +0,0 @@
-Fix sorting of uploads in encrypted rooms
--- a/changelog.d/5758.feature
+++ b/changelog.d/5758.feature
@ -1 +0,0 @@
-Live Location Sharing - Update beacon info state event when sharing is ended
--- a/changelog.d/5762.sdk
+++ b/changelog.d/5762.sdk
@ -1 +0,0 @@
-Some data classes are now immutable, using `val` instead of `var`
--- a/changelog.d/5765.bugfix
+++ b/changelog.d/5765.bugfix
@ -1 +0,0 @@
-Fixing setting transfer title in call transfer.
--- a/changelog.d/5766.bugfix
+++ b/changelog.d/5766.bugfix
@ -1 +0,0 @@
-Changes destination after joining a space to Explore Space Rooms screen
--- a/changelog.d/5767.bugfix
+++ b/changelog.d/5767.bugfix
@ -1 +0,0 @@
-Unignoring a user will perform an initial sync
--- a/changelog.d/6025.misc
+++ b/changelog.d/6025.misc
@ -0,0 +1 @@
+@Ignore a number of tests that are currently failing in CI.
--- a/dependencies.gradle
+++ b/dependencies.gradle
@ -7,26 +7,26 @@ ext.versions = [
        'targetCompat'      : JavaVersion.VERSION_11,
 ]

-def gradle = "7.0.4"
+def gradle = "7.2.0"
 // Ref: https://kotlinlang.org/releases.html
-def kotlin = "1.6.0"
-def kotlinCoroutines = "1.6.0"
-def dagger = "2.40.5"
+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.4.0"
+def lifecycle = "2.4.1"
 def flowBinding = "1.2.0"
 def epoxy = "4.6.2"
-def mavericks = "2.5.0"
-def glide = "4.12.0"
+def mavericks = "2.6.1"
+def glide = "4.13.2"
 def bigImageViewer = "1.8.1"
-def jjwt = "0.11.2"
-def vanniktechEmoji = "0.8.0"
+def jjwt = "0.11.5"
+def vanniktechEmoji = "0.9.0"

 // Testing
-def mockk = "1.12.1"
+def mockk = "1.12.4"
 def espresso = "3.4.0"
 def androidxTest = "1.4.0"
 def androidxOrchestrator = "1.4.1"
@ -46,15 +46,15 @@ ext.libs = [
        ],
        androidx    : [
                'activity'                : "androidx.activity:activity:1.2.4",
-                'appCompat'               : "androidx.appcompat:appcompat:1.4.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:1.4.0",
-                'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.2",
+                'fragmentKtx'             : "androidx.fragment:fragment-ktx:1.4.1",
+                'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.3",
                'work'                    : "androidx.work:work-runtime-ktx:2.7.1",
                'autoFill'                : "androidx.autofill:autofill:1.1.0",
-                'preferenceKtx'           : "androidx.preference:preference-ktx:1.1.1",
+                'preferenceKtx'           : "androidx.preference:preference-ktx:1.2.0",
                'junit'                   : "androidx.test.ext:junit:1.1.3",
                'lifecycleCommon'         : "androidx.lifecycle:lifecycle-common:$lifecycle",
                'lifecycleLivedata'       : "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle",
@ -75,7 +75,7 @@ ext.libs = [
                'transition'              : "androidx.transition:transition:1.2.0",
        ],
        google      : [
-                'material'                : "com.google.android.material:material:1.5.0"
+                'material'                : "com.google.android.material:material:1.6.0"
        ],
        dagger      : [
                'dagger'                  : "com.google.dagger:dagger:$dagger",
--- a/dependencies_groups.gradle
+++ b/dependencies_groups.gradle
@ -123,6 +123,7 @@ ext.groups = [
                        'io.github.detekt.sarif4k',
                        'io.github.microutils',
                        'io.github.reactivecircus.flowbinding',
+                        'io.gitlab.arturbosch.detekt',
                        'io.grpc',
                        'io.jsonwebtoken',
                        'io.kindedj',
@ -164,6 +165,7 @@ ext.groups = [
                        'org.codehaus.woodstox',
                        'org.eclipse.ee4j',
                        'org.ec4j.core',
+                        'org.freemarker',
                        'org.glassfish.jaxb',
                        'org.hamcrest',
                        'org.jacoco',
@ -194,6 +196,7 @@ ext.groups = [
                        'org.testng',
                        'org.threeten',
                        'org.webjars',
+                        'org.yaml',
                        'ru.noties',
                        'xerces',
                        'xml-apis',
--- a/docs/add_threePids.md
+++ b/docs/add_threePids.md
@ -37,9 +37,9 @@ Wording: "We've sent you an email to verify your address. Please follow the inst
 }
 ```

-## User receive an e-mail
+## User receives an e-mail

-> [homeserver.org] Validate your email
+> `homeserver.org` Validate your email
 >
 > A request to add an email address to your Matrix account has been received. If this was you, please click the link below to confirm adding this email:
  https://homeserver.org/_matrix/client/unstable/add_threepid/email/submit_token?token=WUnEhQAmJrXupdEbXgdWvnVIKaGYZFsU&client_secret=TixzvOnw7nLEUdiQEmkHzkXKrY4HhiGh&sid=bxyDHuJKsdkjMlTJ
--- a/docs/integration_tests.md
+++ b/docs/integration_tests.md
@ -43,14 +43,17 @@ virtualenv -p python3 env
 source env/bin/activate
 pip install -e .
 demo/start.sh --no-rate-limit
+
 ```

-Alternatively, to install the latest Synapse release package (and not a cloned branch) you can run the following instead of `pip install -e .`:
+Alternatively, to install the latest Synapse release package (and not a cloned branch) you can run the following instead of `git clone` and `pip install -e .`:

 ```bash
 pip install matrix-synapse
 ```

+On your first run, you will want to stop the demo and edit the config to correct the `public_baseurl` to http://10.0.2.2:8080 and restart the server.
+
 You should now have 3 running federated Synapse instances 🎉, at http://127.0.0.1:8080/, http://127.0.0.1:8081/ and  http://127.0.0.1:8082/, which should display a "It Works! Synapse is running" message.

 ## Run the test
@ -87,6 +90,18 @@ You'll need python3 to be able to run synapse

 Try on the Emulator browser to open "http://10.0.2.2:8080". You should see the "Synapse is running" message.

+### Tests partially run but some fail with "Unable to contact localhost:8080"
+
+This is because the `public_baseurl` of synapse is not consistent with the endpoint that the tests are connecting to.
+
+Ensure you have the following configuration in `demo/etc/8080.config`.
+
+```
+public_baseurl: http://10.0.2.2:8080/
+```
+
+After changing this you will need to restart synapse using `demo/stop.sh` and `demo/start.sh` to load the new configuration.
+
 ### virtualenv command fails

 You can try using
--- a/docs/pull_request.md
+++ b/docs/pull_request.md
@ -30,16 +30,30 @@ In any case, it is better to explicitly declare in the description why the PR is

 Also, draft PR should not stay indefinitely in this state. It may be removed if it is the case and the submitter does not update it after a few days.

+##### Base branch
+
+The `develop` branch is generally the base branch for every PRs.
+
+Exceptions can occur:
+
+- if a feature implementation is split into multiple PRs. We can have a chain of PRs in this case. PR can be merged one by one on develop, and GitHub change the target branch to `develop` for the next PR automatically.
+- we want to merge a PR from the community, but there is still work to do, and the PR is not updated by the submitter. First, we can kindly ask the submitter if they will update their PR, by commenting it. If there is no answer after a few days (including a week-end), we can create a new branch, push it, and change the target branch of the PR to this new branch. The PR can then be merged, and we can add more commits to fix the issues. After that a new PR can be created with `develop` as a target branch.
+
+**Important notice 1:** Releases are created from the `develop` branch. So `develop` branch should always contain a "releasable" source code. So when a feature is being implemented with several PRs, it has to be disabled by default (using a feature flag for instance), until the feature is fully implemented. A last PR to enable the feature can then be created.
+
+**Important notice 2:** Database migration: some developers and some people from the community are using the nightly build from `develop`. Multiple database migrations should be properly handled for them. This is OK to have multiple migrations between 2 releases, this is not OK to add steps to the pending database migration on `develop`. So for instance `develop` users will migrate from version 11 to version 12, then 13, then 14, and `main` users will do all those steps after they get the app upgrade.
+
 ##### PR Review Assignment

-We use automatic assignment for PR reviews. A PR is automatically routed by GitHub to a team member using the round robin algorithm. 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 assigns the [element-android](https://github.com/orgs/vector-im/teams/element-android) team as a reviewer. They can skip this process and assign directly a specific member if they think they should take a look at it.
- GitHub automatically assigns one reviewer. If the chosen reviewer is not available (holiday, etc.), remove them and set again the team, GitHub will select another reviewer.
- The reviewer gets a notification to make the review: they review the code following the good practice (see the rest of this document).
+- 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](https://github.com/orgs/vector-im/teams/element-android) 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

@ -102,7 +116,7 @@ Review such PR is the same recipe than for PR from Dependabot
 ##### Sync analytics plan

 This tools imports any update in the analytics plan. See instruction in the PR itself to handle it.
-More info can be found in the file [analytics.md]
+More info can be found in the file [analytics.md](./analytics.md)

 ## Reviewing PR

@ -233,4 +247,4 @@ Also "Resolve conversation" should probably be hit by the creator of the convers

 PR submitter is responsible of the incoming change. PR reviewers who approved the PR take a part of responsibility on the code which will land to develop, and then be used by our users, and the user of our forks.

-That said, bug may still be merged on `develop`, this is still acceptable of course. In this case, please make sure an issue is created and correctly labelled. Ideally, such issues should be fixed before the next release candidate, i.e. with a higher priority. But as we release the application every 10 working days, it can be hard to fix every bugs. That's why PR should be fully tested and reviewed before being merge and we should never comment code review remark with "will be handled later", or similar comments.
+That said, bug may still be merged on `develop`, this is still acceptable of course. In this case, please make sure an issue is created and correctly labelled. Ideally, such issues should be fixed before the next release candidate, i.e. with a higher priority. But as we release the application every 10 working days, it can be hard to fix every bugs. That's why PR should be fully tested and reviewed before being merge and we should never comment code review remark with "will be handled later", or similar comments.
--- a/docs/ui-tests.md
+++ b/docs/ui-tests.md
@ -176,4 +176,4 @@ class SettingsAdvancedRobot {
        clickOn(R.string.settings_developer_mode_summary)
    }
 }
-```
+```
--- a/fastlane/metadata/android/cs-CZ/changelogs/40104060.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104060.txt
@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Časová osa vláken je nyní živá a rychlejší. Opravy různých chyb a vylepšení stability.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases/tag/v1.4.6
--- a/fastlane/metadata/android/cs-CZ/changelogs/40104070.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104070.txt
@ -0,0 +1,2 @@
+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/tag/v1.4.7
--- a/fastlane/metadata/android/cs-CZ/changelogs/40104080.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104080.txt
@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Časová osa vlákna je nyní živá a rychlejší. Opravy různých chyb a vylepšení stability.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/cs-CZ/changelogs/40104100.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104100.txt
@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Posun přehrávání v hlasových zprávách. Opravy různých chyb a vylepšení stability.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/cs-CZ/changelogs/40104110.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104110.txt
@ -0,0 +1,2 @@
+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
--- a/fastlane/metadata/android/cs-CZ/changelogs/40104120.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104120.txt
@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Umožňuje uživatelům zobrazovat se offline a přidává zvukový přehrávač pro zvukové přílohy
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/cs-CZ/changelogs/40104130.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104130.txt
@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Umožňuje uživatelům zobrazovat se offline a přidává zvukový přehrávač pro zvukové přílohy
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/de-DE/changelogs/40104060.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/40104060.txt
@ -0,0 +1,2 @@
+Hauptänderungen: Threads sind jetzt schneller, Fehlerbehebungen.
+Alle Änderungen: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/de-DE/changelogs/40104070.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/40104070.txt
@ -0,0 +1,2 @@
+Änderungen: Fehlerbehebungen
+Alle Änderungen: https://github.com/vector-im/element-android/releases/tag/v1.4.7
--- a/fastlane/metadata/android/de-DE/changelogs/40104080.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/40104080.txt
@ -0,0 +1,2 @@
+Hauptänderungen: Schnellere Threads, Fehlerbehebungen.
+Alle Änderungen: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/de-DE/changelogs/40104100.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/40104100.txt
@ -0,0 +1,2 @@
+Hauptänderungen: Scrollen in Sprachnachrichten, Fehlerbehebungen.
+Alle Änderungen: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/de-DE/changelogs/40104110.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/40104110.txt
@ -0,0 +1,2 @@
+Änderungen: Fehlerbehebungen und Stabilitätsverbesserungen
+Alle Änderungen: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/de-DE/changelogs/40104120.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/40104120.txt
@ -0,0 +1,2 @@
+Hauptänderungen: Nutzer können ihren Status auf „Offline“ setzen, Gesendete Audiodateien können nun in der App abgespielt werden
+Alle Änderungen: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/de-DE/changelogs/40104130.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/40104130.txt
@ -0,0 +1,2 @@
+Hauptänderungen: Nutzer können ihren Status auf „Offline“ setzen, Gesendete Audiodateien können nun in der App abgespielt werden
+Alle Änderungen: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/en-US/changelogs/40104120.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40104120.txt
@ -0,0 +1,2 @@
+Main changes in this version: Allows users to appear offline and adds an audio player for audio attachments
+Full changelog: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/en-US/changelogs/40104130.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40104130.txt
@ -0,0 +1,2 @@
+Main changes in this version: Allows users to appear offline and adds an audio player for audio attachments
+Full changelog: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/en-US/changelogs/40104140.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40104140.txt
@ -0,0 +1,2 @@
+Main changes in this version: Improve management of ignored users. Various bug fixes and stability improvements.
+Full changelog: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/en-US/changelogs/40104160.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40104160.txt
@ -0,0 +1,2 @@
+Main changes in this version: Better management of encrypted messages. Various bug fixes and stability improvements.
+Full changelog: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/es-ES/changelogs/40103030.txt
+++ b/fastlane/metadata/android/es-ES/changelogs/40103030.txt
@ -0,0 +1,2 @@
+Cambios principales en esta versión: Hacer la política de servidores de indentidad visible en los ajusted. Temporalmente quitar soporte para Android Auto.
+Registro de cambios: https://github.com/vector-im/element-android/releases/tag/v1.3.3
--- a/fastlane/metadata/android/es-ES/changelogs/40104110.txt
+++ b/fastlane/metadata/android/es-ES/changelogs/40104110.txt
@ -0,0 +1,2 @@
+Cambios principales en esta versión: Varias correciones de bugs y mejoras en la estabilidad
+Registro de cambios: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/es-ES/full_description.txt
+++ b/fastlane/metadata/android/es-ES/full_description.txt
@ -37,3 +37,6 @@ Mensajería, llamadas de voz y video, uso compartido de archivos, uso compartido

 <b>Continúa donde lo dejaste</b>
 Manténgase en contacto donde quiera que esté con el historial de mensajes totalmente sincronizado en todos sus dispositivos y en la web en https://app.element.io
+
+<b>Código abierto</b>
+Element Android es un proyecto de código abierto, alojado en GitHub. Porfavor, reporta bugs y problemas en esta dirección: https://github.com/vector-im/element-android
--- a/fastlane/metadata/android/et/changelogs/40104060.txt
+++ b/fastlane/metadata/android/et/changelogs/40104060.txt
@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: jutulõngad on nüüd kasutatavad ja toimivad kiiremini, lisaks pisiparandused ja stabiilsust parandavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.4.6
--- a/fastlane/metadata/android/et/changelogs/40104070.txt
+++ b/fastlane/metadata/android/et/changelogs/40104070.txt
@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: pisiparandused ja stabiilsust parandavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.4.7
--- a/fastlane/metadata/android/et/changelogs/40104080.txt
+++ b/fastlane/metadata/android/et/changelogs/40104080.txt
@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: jutulõngad on nüüd kasutatavad ja toimivad kiiremini, lisaks pisiparandused ja stabiilsust parandavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/et/changelogs/40104100.txt
+++ b/fastlane/metadata/android/et/changelogs/40104100.txt
@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: kerimine häälsõnumites ning erinevate vigade parandused ja stabiilsust edendavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/et/changelogs/40104110.txt
+++ b/fastlane/metadata/android/et/changelogs/40104110.txt
@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: erinevate vigade parandused ja stabiilsust edendavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/et/changelogs/40104120.txt
+++ b/fastlane/metadata/android/et/changelogs/40104120.txt
@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: kasutajate võrguolekud ning helisõnumite esitaja.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/et/changelogs/40104130.txt
+++ b/fastlane/metadata/android/et/changelogs/40104130.txt
@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: kasutajate võrguolekud ning helisõnumite esitaja.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/fa/changelogs/40104060.txt
+++ b/fastlane/metadata/android/fa/changelogs/40104060.txt
@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: خط زمانی رشته‌ها اکنون زنده و سریع‌تر است. چندین رفع اشکال و بهبود پایداری.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.4.6
--- a/fastlane/metadata/android/fa/changelogs/40104070.txt
+++ b/fastlane/metadata/android/fa/changelogs/40104070.txt
@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: چندین رفع اشکال و بهبود پایداری.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.4.7
--- a/fastlane/metadata/android/fa/changelogs/40104080.txt
+++ b/fastlane/metadata/android/fa/changelogs/40104080.txt
@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: خط زمانی رشته‌ها اکنون زنده و سریع‌تر است. چندین رفع اشکال و بهبود پایداری.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/fa/changelogs/40104100.txt
+++ b/fastlane/metadata/android/fa/changelogs/40104100.txt
@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: لغزش در پیام‌های صوتی. رفع اشکال‌های مختلف و بهبودهای امنیتی.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/fa/changelogs/40104110.txt
+++ b/fastlane/metadata/android/fa/changelogs/40104110.txt
@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: رفع اشکال‌های مختلف و بهبودهای پایداری.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/fa/changelogs/40104120.txt
+++ b/fastlane/metadata/android/fa/changelogs/40104120.txt
@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: اجازه به کاربران برای برون‌خط ظاهر شدن و افزودن یک پخش‌کنندهٔ صدا برای پیوست‌های صوتی
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/fa/changelogs/40104130.txt
+++ b/fastlane/metadata/android/fa/changelogs/40104130.txt
@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: اجازه به کاربران برای برون‌خط ظاهر شدن و افزودن یک پخش‌کنندهٔ صدا برای پیوست‌های صوتی
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/fr-FR/changelogs/40104040.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104040.txt
@ -0,0 +1,2 @@
+Principaux changements pour cette version : Mise-à-jour de l’interface de notification de rédaction en cours. Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.4.4
--- a/fastlane/metadata/android/fr-FR/changelogs/40104060.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104060.txt
@ -0,0 +1,2 @@
+Principaux changements pour cette version : Les fils de discussion sont officiellement disponibles, et plus rapides. Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.4.6
--- a/fastlane/metadata/android/fr-FR/changelogs/40104070.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104070.txt
@ -0,0 +1,2 @@
+Principaux changements pour cette version : Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.4.7
--- a/fastlane/metadata/android/fr-FR/changelogs/40104080.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104080.txt
@ -0,0 +1,2 @@
+Principaux changements pour cette version : Les fils de discussion sont officiellement disponibles, et plus rapides. Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/hu-HU/changelogs/40104040.txt
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104040.txt
@ -0,0 +1,2 @@
+Fő változás ebben a verzióban: Gépelés visszajelzési frissítések a felületen. További hibajavítások egy stabilitást növelő fejlesztések.
+Teljes változásnapló: https://github.com/vector-im/element-android/releases/tag/v1.4.4
--- a/fastlane/metadata/android/hu-HU/changelogs/40104060.txt
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104060.txt
@ -0,0 +1,2 @@
+Fő változás ebben a verzióban: Megjelentek az üzenetszálak az idővonalon és gyorsak. További hibajavítások és stabilitási fejlesztések.
+Teljes változásnapló: https://github.com/vector-im/element-android/releases/tag/v1.4.6
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				`Adds a new homeserver selection screen when creating an account`
				`@ -1 +0,0 @@`
				`Added text next to spinner when loading information after user is clicked on space members screen`
				`@ -1 +0,0 @@`
				The string `ftue_auth_carousel_workplace_body` was declared not translatable by mistake
				`@ -1 +0,0 @@`
				`Updates the Captcha and T&Cs registration screens in the FTUE flow to match the updated UI style`
				`@ -1 +0,0 @@`
				`Fix some cases where the read marker line would not show up`
				`@ -1 +0,0 @@`
				`Fix sometimes read marker not properly updating`
				`@ -1 +0,0 @@`
				`Use member name instead of room name in DM creation item`
				`@ -1 +0,0 @@`
				`Add a setting to be able to always appear offline`
				`@ -1 +0,0 @@`
				`Adds the ability for audio attachments to be played in the timeline`
				`@ -1 +0,0 @@`
				`Align auto-reporting of decryption errors implementation with web client.`