Merge branch 'release/tchap_v2.5.2' into main

.gitattributes

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

.github/workflows/danger.yml

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

.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/quality.yml

@@ -72,7 +72,7 @@ jobs:
  yarn add danger-plugin-lint-report --dev
  - name: Danger lint
  if: always()
- uses: danger/[email protected].2
+ uses: danger/[email protected].3
  with:
  args: "--dangerfile tools/danger/dangerfile-lint.js"
  env:

.github/workflows/tests.yml

@@ -8,25 +8,46 @@ on:
 # Enrich gradle.properties for CI/CD
 env:
  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
- CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
+ CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 4 --no-daemon
 
 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) }}
  cancel-in-progress: true
  steps:
  - uses: actions/checkout@v3
  with:
+ lfs: true
  fetch-depth: 0
  - uses: actions/setup-java@v3
  with:
  distribution: 'adopt'
  java-version: '11'
  - uses: gradle/gradle-build-action@v2
+ with:
+ cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
+ gradle-home-cache-cleanup: ${{ github.ref == 'refs/heads/develop' }}
+
+ # tchap : remove verifyScreenshots
+ #- name: Run screenshot tests
+ # run: ./gradlew verifyScreenshots $CI_GRADLE_ARG_PROPERTIES
+
+ - name: Archive Screenshot Results on Error
+ if: failure()
+ uses: actions/upload-artifact@v3
+ with:
+ name: screenshot-results
+ path: |
+ **/out/failures/
+ **/build/reports/tests/*UnitTest/
+
  - uses: actions/setup-python@v4
  with:
  python-version: 3.8
@@ -36,45 +57,51 @@ jobs:
  httpPort: 8080
  disableRateLimiting: true
  public_baseurl: "http://10.0.2.2:8080/"
+
  - 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
+ target: playstore
  force-avd-creation: false
  emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
  disable-animations: true
- emulator-build: 7425822
+ # emulator-build: 7425822
  script: |
  # Tchap : comment this task because CI failed
  # ./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.
+ # 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:
- 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: |
- # Tchap : comment this task because CI failed
- # ./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
- # Tchap: Skip in forks
- if: github.repository == 'vector-im/element-android' && always() # we may have failed a previous step and retried, that's OK
+ 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

.github/workflows/validate-lfs.yml

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

.gitignore

@@ -22,3 +22,4 @@
 /package.json
 /yarn.lock
 /node_modules
+**/out/failures

CONTRIBUTING.md

@@ -1,3 +1,28 @@
+# Contributing to Element Android
+
+<!--- TOC -->
+
+* [Android Studio settings](#android-studio-settings)
+ * [Template](#template)
+* [Compilation](#compilation)
+* [I want to submit a PR to fix an issue](#i-want-to-submit-a-pr-to-fix-an-issue)
+ * [Kotlin](#kotlin)
+ * [Tchap changes](#tchap-changes)
+ * [Changelog](#changelog)
+ * [Code quality](#code-quality)
+ * [Internal tool](#internal-tool)
+ * [ktlint](#ktlint)
+ * [lint](#lint)
+ * [Unit tests](#unit-tests)
+ * [Tests](#tests)
+ * [Internationalisation](#internationalisation)
+ * [Accessibility](#accessibility)
+ * [Layout](#layout)
+ * [Authors](#authors)
+* [Thanks](#thanks)
+
+<!--- END -->
+
 ## Android Studio settings
 
 Please set the "hard wrap" setting of Android Studio to 160 chars, this is the setting we use internally to format the source code (Menu `Settings/Editor/Code Style` then `Hard wrap at`).

ELEMENT_CHANGES.md

@@ -1,3 +1,104 @@
+Changes in Element v1.5.2 (2022-10-05)
+======================================
+
+Features ✨
+----------
+ - New App Layout is now enabled by default! Go to the Settings > Labs to toggle this ([#7166](https://github.com/vector-im/element-android/issues/7166))
+ - Render inline images in the timeline ([#351](https://github.com/vector-im/element-android/issues/351))
+ - Add privacy setting to disable personalized learning by the keyboard ([#6633](https://github.com/vector-im/element-android/issues/6633))
+
+Bugfixes 🐛
+----------
+ - Disable emoji keyboard not applies in reply ([#5029](https://github.com/vector-im/element-android/issues/5029))
+ - Fix animated images not autoplaying sometimes if only a thumbnail was fetched from the server ([#6215](https://github.com/vector-im/element-android/issues/6215))
+ - Add Warning shield when a user previously verified rotated their cross signing keys ([#6702](https://github.com/vector-im/element-android/issues/6702))
+ - Can't verify user when option to send keys to verified devices only is selected ([#6723](https://github.com/vector-im/element-android/issues/6723))
+ - Add option to only send to verified devices per room (web parity) ([#6725](https://github.com/vector-im/element-android/issues/6725))
+ - Delete pin code key and the key used for biometrics authentication on logout ([#6906](https://github.com/vector-im/element-android/issues/6906))
+ - Fix crash on previewing images to upload on Android Pie. ([#7184](https://github.com/vector-im/element-android/issues/7184))
+ - Fix app restarts in loop on Android 13 on the first run of the app. ([#7224](https://github.com/vector-im/element-android/issues/7224))
+
+In development 🚧
+----------------
+ - [Device Management] Learn more bottom sheets ([#7100](https://github.com/vector-im/element-android/issues/7100))
+ - [Device management] Verify current session ([#7114](https://github.com/vector-im/element-android/issues/7114))
+ - [Device management] Verify another session ([#7143](https://github.com/vector-im/element-android/issues/7143))
+ - [Device management] Rename a session ([#7158](https://github.com/vector-im/element-android/issues/7158))
+ - [Device Manager] Unverified and inactive sessions list ([#7170](https://github.com/vector-im/element-android/issues/7170))
+ - [Device management] Sign out a session ([#7190](https://github.com/vector-im/element-android/issues/7190))
+ - [Device Manager] Parse user agents ([#7247](https://github.com/vector-im/element-android/issues/7247))
+ - [Voice Broadcast] Add a feature flag with the composer action ([#7258](https://github.com/vector-im/element-android/issues/7258))
+
+Improved Documentation 📚
+------------------------
+ - Draft onboarding documentation of the project at `./docs/_developer_onboarding.md` ([#7126](https://github.com/vector-im/element-android/issues/7126))
+
+SDK API changes ⚠️
+------------------
+ - Allow the sync timeout to be configured (mainly useful for testing) ([#7198](https://github.com/vector-im/element-android/issues/7198))
+ - Ports SDK instrumentation tests to use suspending functions instead of countdown latches ([#7207](https://github.com/vector-im/element-android/issues/7207))
+ - [Device Manager] Extend user agent to include device information ([#7209](https://github.com/vector-im/element-android/issues/7209))
+
+Other changes
+-------------
+ - Add support for `/tableflip` command ([#12](https://github.com/vector-im/element-android/issues/12))
+ - Decreases the size of rounded corners and increases the maximum width of message bubbles to help avoid unnecessary unused space on screen ([#5712](https://github.com/vector-im/element-android/issues/5712))
+ - Adds screenshot testing tooling ([#5798](https://github.com/vector-im/element-android/issues/5798))
+ - [AppLayout]: added tracking of new analytics events ([#6508](https://github.com/vector-im/element-android/issues/6508))
+ - Target API 12 and compile with Android SDK 32. ([#6929](https://github.com/vector-im/element-android/issues/6929))
+ - Add basic integration of Sentry to capture errors and crashes if user has given consent. ([#7076](https://github.com/vector-im/element-android/issues/7076))
+ - Add support to `/devtools` command. ([#7126](https://github.com/vector-im/element-android/issues/7126))
+ - Fix lint warning, and cleanup the code ([#7159](https://github.com/vector-im/element-android/issues/7159))
+ - Mutualize the pending auth handling ([#7193](https://github.com/vector-im/element-android/issues/7193))
+ - CI: Prevent modification of translations by developer. ([#7211](https://github.com/vector-im/element-android/issues/7211))
+ - Fix typo in strings.xml and make sure this is American English. ([#7287](https://github.com/vector-im/element-android/issues/7287))
+
+
+Changes in Element v1.5.1 (2022-09-28)
+======================================
+
+Security ⚠️
+----------
+
+This update provides important security fixes, update now.
+Ref: CVE-2022-39246 CVE-2022-39248
+
+Changes in Element v1.5.0 (2022-09-23)
+======================================
+
+Features ✨
+----------
+ - Deferred DMs - Enable and move the feature to labs settings ([#7180](https://github.com/vector-im/element-android/issues/7180))
+
+Bugfixes 🐛
+----------
+ - Fix text margin in QR code view when no display name is set ([#5424](https://github.com/vector-im/element-android/issues/5424))
+ - [App Layout] Recents carousel now scrolled to first position when new item added to or moved to this position ([#6776](https://github.com/vector-im/element-android/issues/6776))
+ - Fixed problem when room list's scroll did jump after rooms placeholders were replaced with rooms summary items ([#7079](https://github.com/vector-im/element-android/issues/7079))
+ - Fixes crash when quickly double clicking FABs in the new app layout ([#7102](https://github.com/vector-im/element-android/issues/7102))
+ - Fixes space list and new chat bottom sheets showing too small in New App Layout (especially evident in landscape) ([#7103](https://github.com/vector-im/element-android/issues/7103))
+ - [App Layout] Room leaving prompt dialog now waits user to confirm leaving before do so ([#7122](https://github.com/vector-im/element-android/issues/7122))
+ - Fix empty verification bottom sheet. ([#7130](https://github.com/vector-im/element-android/issues/7130))
+ - [New Layout] Fixes new chat dialog not getting dismissed after selecting its actions ([#7132](https://github.com/vector-im/element-android/issues/7132))
+ - Fixes Room List not getting updated when fragment is not in focus ([#7186](https://github.com/vector-im/element-android/issues/7186))
+
+In development 🚧
+----------------
+ - Create DM room only on first message - Add a spinner when sending the first message ([#6970](https://github.com/vector-im/element-android/issues/6970))
+ - [Device Manager] Filter Other Sessions ([#7045](https://github.com/vector-im/element-android/issues/7045))
+ - [Device management] Session details screen ([#7077](https://github.com/vector-im/element-android/issues/7077))
+ - Create DM room only on first message - Fix glitch in the room list ([#7121](https://github.com/vector-im/element-android/issues/7121))
+ - Create DM room only on first message - Handle the local rooms within the new AppLayout ([#7153](https://github.com/vector-im/element-android/issues/7153))
+
+Other changes
+-------------
+ - [Modules] Lifts the application variants to the app module ([#6779](https://github.com/vector-im/element-android/issues/6779))
+ - Ensure that we do not expect all the Event fields when requesting `rooms/{roomId}/hierarchy` endpoint. ([#7035](https://github.com/vector-im/element-android/issues/7035))
+ - Move some GitHub actions to buildjet runners, and remove the second attempt to run integration tests. ([#7108](https://github.com/vector-im/element-android/issues/7108))
+ - Exclude legacy android support annotation library ([#7140](https://github.com/vector-im/element-android/issues/7140))
+ - Pulling no longer hosted im.dlg:android-dialer directly into the repository and removing legacy support library usages ([#7142](https://github.com/vector-im/element-android/issues/7142))
+ - Fixing build cache misses when compiling the vector module ([#7157](https://github.com/vector-im/element-android/issues/7157))
+
 Changes in Element v1.4.36 (2022-09-10)
 =======================================