Fix test RegistrationTest.simpleRegister()

Deferred DMs - Handle the local rooms within the new AppLayout

.github/workflows/post-pr.yml

@@ -31,7 +31,7 @@ jobs:
   ui-tests:
     name: UI Tests (Synapse)
     needs: should-i-run
-    runs-on: macos-latest
+    runs-on: buildjet-4vcpu-ubuntu-2204
     strategy:
       fail-fast: false
       matrix:

.github/workflows/tests.yml

@@ -1,9 +1,9 @@
 name: Test
 
 on:
-  pull_request: {}
+  pull_request: { }
   push:
-    branches: [main, develop]
+    branches: [ main, develop ]
 
 # Enrich gradle.properties for CI/CD
 env:
@@ -13,7 +13,10 @@ env:
 jobs:
   tests:
     name: Runs all tests
-    runs-on: macos-latest # for the emulator
+    runs-on: buildjet-4vcpu-ubuntu-2204
+    strategy:
+      matrix:
+        api-level: [28]
     # 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) }}
@@ -36,46 +39,79 @@ jobs:
           httpPort: 8080
           disableRateLimiting: true
           public_baseurl: "http://10.0.2.2:8080/"
+
+      - name: AVD cache
+        uses: actions/cache@v3
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ matrix.api-level }}
+
+      - name: create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          arch: x86
+          profile: Nexus 5X
+          force-avd-creation: true # Is set to false in the doc https://github.com/ReactiveCircus/android-emulator-runner
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: echo "Generated AVD snapshot for caching."
+
       - name: Run all the codecoverage tests at once
-        id: tests
         uses: reactivecircus/android-emulator-runner@v2
-        continue-on-error: true
+        # continue-on-error: true
         with:
-          api-level: 28
+          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
           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 stes.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
+          # 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
-      - run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
-        if: always() # we may have failed a previous step and retried, that's OK
+      # 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
 
       - name: Format unit test results
         if: always()

.github/workflows/triage-labelled.yml

@@ -142,32 +142,6 @@ 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

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

@@ -27,7 +27,7 @@ jobs:
       - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:
           project: Android App Team
-          column: P1
+          column: Important Issues & Topics (P1)
           repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   P1_issues_to_crypto_team_workboard:

CHANGES.md

@@ -1,3 +1,69 @@
+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)
 =======================================
 

build.gradle

@@ -29,7 +29,7 @@ buildscript {
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513'
         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.1.2'
+        classpath 'org.owasp:dependency-check-gradle:7.2.0'
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10"
         classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
         classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
@@ -45,7 +45,7 @@ plugins {
     id "io.gitlab.arturbosch.detekt" version "1.21.0"
 
     // Dependency Analysis
-    id 'com.autonomousapps.dependency-analysis' version "1.12.0"
+    id 'com.autonomousapps.dependency-analysis' version "1.13.1"
 }
 
 // https://github.com/jeremylong/DependencyCheck

changelog.d/3955.misc

@@ -1 +0,0 @@
-Creates a dedicated strings module

changelog.d/5424.bugfix

@@ -0,0 +1 @@
+Fix text margin in QR code view when no display name is set

changelog.d/5525.wip

@@ -1 +0,0 @@
-Create DM room only on first message - Create the DM and navigate to the new room after sending an event

changelog.d/6407.misc

@@ -1 +0,0 @@
-Converts the vector module to a library with a parent vector-app application module

changelog.d/6565.wip

@@ -1 +0,0 @@
-[App Layout] Bottom navigation tabs are removed for new home screen

changelog.d/6750.wip

@@ -1 +0,0 @@
-[App Layout] fixed space switching dialog measured with wrong height sometimes

changelog.d/6754.bugfix

@@ -1 +0,0 @@
-[App Layout] - space switcher now has empty state

changelog.d/6765.wip

@@ -1 +0,0 @@
-[App Layout] Fabs doesn't go off screen anymore

changelog.d/6776.bugfix

@@ -0,0 +1 @@
+[App Layout] Recents carousel now scrolled to first position when new item added to or moved to this position

changelog.d/6779.misc

@@ -0,0 +1 @@
+[Modules] Lifts the application variants to the app module

changelog.d/6835.feature

@@ -1 +0,0 @@
-[App Layout] New empty states for home screen

changelog.d/6844.bugfix

@@ -1 +0,0 @@
-Fixes /addToSpace and /joinSpace commands showing invalid syntax warnings

changelog.d/6871.feature

@@ -1 +0,0 @@
-Improves Developer Mode Debug Button UX and adds it to New App Layout

changelog.d/6877.wip

@@ -1 +0,0 @@
-[New Layout] Adds back navigation through spaces

changelog.d/6889.wip

@@ -1 +0,0 @@
-[App Layout] new room invites screen

changelog.d/6894.misc

@@ -1 +0,0 @@
-Remove FragmentModule and the Fragment factory. No need to Inject the constructor on your Fragment, just add @AndroidEntryPoint annotation and @Inject class members.

changelog.d/6902.wip

@@ -1 +0,0 @@
-[Device Manager] Current Session Section

changelog.d/6907.wip

@@ -1 +0,0 @@
-[New Layout] Changes space sheet to accordion-style with expandable subspaces

changelog.d/6917.bugfix

@@ -1 +0,0 @@
-Fix long incremental sync.

changelog.d/6924.wip

@@ -1 +0,0 @@
-[New Layout] Adds space invites

changelog.d/6925.misc

@@ -1 +0,0 @@
-Log basic Http information in production.

changelog.d/6926.misc

@@ -1 +0,0 @@
-Focus input field when editing homeserver address to speed up login and registration.

changelog.d/6945.wip

@@ -1 +0,0 @@
-[Device Manager] Other Sessions Section

changelog.d/6947.wip

@@ -1 +0,0 @@
-[App Layout] fixed invites count badge bottom margin on a home screen

changelog.d/6958.feature

@@ -1 +0,0 @@
-[App Layout] New App Layout is enabled by default

changelog.d/6964.wip

@@ -1 +0,0 @@
-[Device Manager] Render Security Recommendations

changelog.d/6967.bugfix

@@ -1 +0,0 @@
-Fix low occurrence crashes.

changelog.d/6969.bugfix

@@ -1 +0,0 @@
-FTUE - Fixes optional email registration step always being mandatory

changelog.d/6970.wip

@@ -0,0 +1 @@
+Create DM room only on first message - Add a spinner when sending the first message

changelog.d/6978.bugfix

@@ -1 +0,0 @@
-Fix crash when opening an unknown room

changelog.d/6979.bugfix

@@ -1 +0,0 @@
-Fix crash on PIN code settings screen.

changelog.d/6982.bugfix

@@ -1,2 +0,0 @@
-Fix autoplayed animated stickers
-Increase sticker size

changelog.d/6989.bugfix

@@ -1 +0,0 @@
-Catch race condition crash in voice recording

changelog.d/7010.feature

@@ -1 +0,0 @@
-Try to detect devices that lack Opus encoder support, use bundled libopus library for those.

changelog.d/7016.wip

@@ -1 +0,0 @@
-[New Layout] Improves talkback accessibility

changelog.d/7035.misc

@@ -0,0 +1 @@
+Ensure that we do not expect all the Event fields when requesting `rooms/{roomId}/hierarchy` endpoint.

changelog.d/7045.wip

@@ -0,0 +1 @@
+[Device Manager] Filter Other Sessions

changelog.d/7077.wip

@@ -0,0 +1 @@
+[Device management] Session details screen

changelog.d/7079.bugfix

@@ -0,0 +1 @@
+Fixed problem when room list's scroll did jump after rooms placeholders were replaced with rooms summary items

changelog.d/7102.bugfix

@@ -0,0 +1 @@
+Fixes crash when quickly double clicking FABs in the new app layout

changelog.d/7103.bugfix

@@ -0,0 +1 @@
+Fixes space list and new chat bottom sheets showing too small in New App Layout (especially evident in landscape)

changelog.d/7108.misc

@@ -0,0 +1 @@
+Move some GitHub actions to buildjet runners, and remove the second attempt to run integration tests.

changelog.d/7121.wip

@@ -0,0 +1 @@
+Create DM room only on first message - Fix glitch in the room list

changelog.d/7122.bugfix

@@ -0,0 +1 @@
+[App Layout] Room leaving prompt dialog now waits user to confirm leaving before do so

changelog.d/7130.bugfix

@@ -0,0 +1 @@
+ Fix empty verification bottom sheet.

changelog.d/7132.bugfix

@@ -0,0 +1 @@
+[New Layout] Fixes new chat dialog not getting dismissed after selecting its actions

changelog.d/7140.misc

@@ -0,0 +1 @@
+Exclude legacy android support annotation library

changelog.d/7142.misc

@@ -0,0 +1 @@
+Pulling no longer hosted im.dlg:android-dialer directly into the repository and removing legacy support library usages

changelog.d/7153.wip

@@ -0,0 +1 @@
+Create DM room only on first message - Handle the local rooms within the new AppLayout

changelog.d/7157.misc

@@ -0,0 +1 @@
+Fixing build cache misses when compiling the vector module

changelog.d/7166.misc

@@ -0,0 +1 @@
+New App Layout is now enabled by default! Go to the Settings > Labs to toggle this

coverage.gradle

@@ -81,11 +81,11 @@ task generateCoverageReport(type: JacocoReport) {
 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 = [':vector:testGplayDebugUnitTest', ':matrix-sdk-android:testDebugUnitTest']
+    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:connectedGplayDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
+    tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
 }

dependencies.gradle

@@ -15,14 +15,14 @@ def gradle = "7.1.3"
 def kotlin = "1.6.21"
 def kotlinCoroutines = "1.6.4"
 def dagger = "2.42"
-def appDistribution = "16.0.0-beta03"
+def appDistribution = "16.0.0-beta04"
 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 flowBinding = "1.2.0"
-def flipper = "0.162.0"
+def flipper = "0.164.0"
 def epoxy = "4.6.2"
 def mavericks = "2.7.0"
 def glide = "4.13.2"
@@ -86,7 +86,7 @@ ext.libs = [
                 '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.54"
+                'phonenumber'             : "com.googlecode.libphonenumber:libphonenumber:8.12.55"
         ],
         dagger      : [
                 'dagger'                  : "com.google.dagger:dagger:$dagger",

dependencies_groups.gradle

@@ -69,8 +69,6 @@ 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',

docs/nightly_build.md

@@ -47,7 +47,7 @@ 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 --version nightly
+yes n | towncrier build --version nightly
 ./gradlew assembleGplayNightly appDistributionUploadGplayNightly $CI_GRADLE_ARG_PROPERTIES
 ```
 

docs/unifiedpush.md

@@ -18,7 +18,7 @@ The recently started UnifiedPush project is an Android protocol and library for
 
 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.
+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.
 

fastlane/metadata/android/cs-CZ/changelogs/40104340.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

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

@@ -0,0 +1,2 @@
+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/en-US/changelogs/40104360.txt

@@ -0,0 +1,3 @@
+New App Layout can be enabled in the Labs settings. Please give it a try!
+Fix issues about missing notification, and long incremental sync.
+Full changelog: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/et/changelogs/40104340.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

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

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

fastlane/metadata/android/fr-FR/changelogs/40104340.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

fastlane/metadata/android/hu-HU/changelogs/40104100.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Görgetés a hangüzenetben. Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104110.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104120.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Lehetővé teszi a felhasználók számára, hogy offline jelenjenek meg, és audio lejátszót ad hozzá a hangmellékletekhez.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104130.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Lehetővé teszi a felhasználók számára, hogy offline jelenjenek meg, és audio lejátszót ad hozzá a hangmellékletekhez.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104140.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: A figyelmen kívül hagyott felhasználók kezelésének javítása. Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104160.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: A titkosított üzenetek jobb kezelése. Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104180.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104190.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104200.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104220.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104230.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104240.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104250.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104260.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: UnifiedPush használata, és lehetővé teszi a felhasználó számára, hogy FCM nélkül tolja.
+Teljes változásnapló: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104270.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104280.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104300.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Lehetővé teszi a továbbfejlesztett bejelentkezési és regisztrációs utakat.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104310.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Lehetővé teszi a továbbfejlesztett bejelentkezési és regisztrációs utakat.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104320.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/hu-HU/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+Főbb változások ebben a verzióban: Különböző hibajavítások és stabilitásjavítások.
+Teljes változásjegyzék: https://github.com/vector-im/element-android/releases

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

@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Banyak perbaikan kutu dan perbaikan stabilitas.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases

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

@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: varie correzioni di errori e miglioramenti della stabilità.
+Cronologia completa: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/pl-PL/changelogs/40104340.txt

@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Rozmaite poprawki błędów i usprawnienia stabilności.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases

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

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

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

@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Rôzne opravy chýb a vylepšenia stability.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases

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

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

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

@@ -0,0 +1,2 @@
+此版本中的主要變動：多個臭蟲修復與穩定性改善。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases

gradle.properties

@@ -12,6 +12,7 @@ org.gradle.jvmargs=-Xmx4g -Xms512M -XX:MaxPermSize=2048m -XX:MaxMetaspaceSize=1g
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=true
+org.gradle.caching=true
 
 # Android Settings
 android.enableJetifier=true

library/jsonviewer/build.gradle

@@ -55,8 +55,9 @@ dependencies {
 
     implementation libs.airbnb.mavericks
     // Span utils
-    implementation 'me.gujun.android:span:1.7'
-
+    implementation('me.gujun.android:span:1.7') {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
 
     implementation libs.jetbrains.coroutinesCore
     implementation libs.jetbrains.coroutinesAndroid

library/ui-strings/build.gradle

@@ -20,3 +20,7 @@ android {
         jvmTarget = "11"
     }
 }
+
+tasks.withType( com.likethesalad.android.templates.common.tasks.BaseTask) {
+    it.outputs.cacheIf { true }
+}

library/ui-strings/src/main/res/values-ar/strings.xml

@@ -320,7 +320,7 @@
     <string name="settings_theme">السمة</string>
     <string name="encryption_information_decryption_error">خطأ في فكّ التعمية</string>
     <string name="encryption_information_device_name">اسم الجهاز</string>
-    <string name="encryption_information_device_id">معرّف الجهاز</string>
+    <string name="device_manager_session_details_session_id">معرّف الجهاز</string>
     <string name="encryption_information_device_key">مفتاح الجهاز</string>
     <string name="encryption_export_room_keys">صدّر مفاتيح الغرفة</string>
     <string name="encryption_export_room_keys_summary">صدّر المفاتيح إلى ملف محلي</string>

library/ui-strings/src/main/res/values-bg/strings.xml

@@ -396,7 +396,7 @@
     <string name="settings_theme">Тема</string>
     <string name="encryption_information_decryption_error">Грешка при разшифроване</string>
     <string name="encryption_information_device_name">Публично име</string>
-    <string name="encryption_information_device_id">Сесийно ID</string>
+    <string name="device_manager_session_details_session_id">Сесийно ID</string>
     <string name="encryption_information_device_key">Ключ на устройство</string>
     <string name="encryption_export_e2e_room_keys">Експортирай E2E ключове за стая</string>
     <string name="encryption_export_room_keys">Експортиране на ключове за стая</string>