Merge branch 'release/0.1.4' into main

Author: bmarty

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -0,0 +1,61 @@
+<!-- Please read [CONTRIBUTING.md](https://github.com/vector-im/element-x-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
+ 
+## Type of change
+
+- [ ] Feature
+- [ ] Bugfix
+- [ ] Technical
+- [ ] Other :
+
+## Content
+
+<!-- Describe shortly what has been changed -->
+
+## Motivation and context
+
+<!-- Provide link to the corresponding issue if applicable or explain the context -->
+
+## Screenshots / GIFs
+
+<!--
+We have screenshot tests in the project, so attaching screenshots to a PR is not mandatory, as far as there
+is a Composable Preview covering the changes. In this case, the change will appear in the file diff.
+Note that all the UI composables should be covered by a Composable Preview.
+
+Providing a video of the change is still very useful for the reviewer and for the history of the project.
+
+You can use a table like this to show screenshots comparison.
+Uncomment this markdown table below and edit the last line `|||`:
+|copy screenshot of before here|copy screenshot of after here|
+
+|Before|After|
+|-|-|
+|||
+ -->
+
+## Tests
+
+<!-- Explain how you tested your development -->
+
+- Step 1
+- Step 2
+- Step ...
+
+## Tested devices
+
+- [ ] Physical
+- [ ] Emulator
+- OS version(s):
+
+## Checklist
+
+<!-- Depending on the Pull Request content, it can be acceptable if some of the following checkboxes stay unchecked. -->
+
+- [ ] Changes have been tested on an Android device or Android emulator with API 23
+- [ ] UI change has been tested on both light and dark themes
+- [ ] Accessibility has been taken into account. See https://github.com/vector-im/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
+- [ ] Pull request is based on the develop branch
+- [ ] Pull request includes a new file under ./changelog.d. See https://github.com/vector-im/element-x-android/blob/develop/CONTRIBUTING.md#changelog
+- [ ] Pull request includes screenshots or videos if containing UI changes
+- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)
+- [ ] You've made a self review of your PR

.github/pull_request_template.md

@@ -16,8 +16,8 @@ jobs:
   debug:
     name: Build APKs
     runs-on: ubuntu-latest
-    # Skip for `main` and the merge queue if the branch is up to date with `develop`
-    if: github.ref != 'refs/heads/main' && github.event.merge_group.base_ref != 'refs/heads/develop'
+    # Skip for `main`
+    if: github.ref != 'refs/heads/main'
     strategy:
       matrix:
         variant: [debug, release, nightly, samples]
@@ -38,7 +38,7 @@ jobs:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/[email protected].0
+        uses: gradle/[email protected].1
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Assemble debug APK

.github/workflows/build.yml

@@ -5,8 +5,6 @@ on: [pull_request, merge_group]
 jobs:
   build:
     runs-on: ubuntu-latest
-    # Don't run in the merge queue again if the branch is up to date with `develop`
-    if: github.event.merge_group.base_ref != 'refs/heads/develop'
     name: Danger main check
     steps:
       - uses: actions/checkout@v3

.github/workflows/danger.yml

@@ -8,8 +8,6 @@ on:
 jobs:
   validation:
     name: "Validation"
-    # Don't run in the merge queue again if the branch is up to date with `develop`
-    if: github.event.merge_group.base_ref != 'refs/heads/develop'
     runs-on: ubuntu-latest
     # No concurrency required, this is a prerequisite to other actions and should run every time.
     steps:

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

@@ -18,7 +18,7 @@ jobs:
     if: ${{ github.repository == 'vector-im/element-x-android' }}
     steps:
       - name: ⏬ Checkout with LFS
-        uses: nschloe/[email protected].1
+        uses: nschloe/[email protected].2
 
       - name: Use JDK 17
         uses: actions/setup-java@v3
@@ -62,7 +62,7 @@ jobs:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/[email protected].0
+        uses: gradle/[email protected].1
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Dependency analysis

.github/workflows/nightlyReports.yml

@@ -16,8 +16,6 @@ jobs:
   checkScript:
     name: Search for forbidden patterns
     runs-on: ubuntu-latest
-    # Don't run in the merge queue again if the branch is up to date with `develop`
-    if: github.event.merge_group.base_ref != 'refs/heads/develop'
     steps:
       - uses: actions/checkout@v3
       - name: Run code quality check suite
@@ -26,8 +24,6 @@ jobs:
   check:
     name: Project Check Suite
     runs-on: ubuntu-latest
-    # Don't run in the merge queue again if the branch is up to date with `develop`
-    if: github.event.merge_group.base_ref != 'refs/heads/develop'
     # Allow all jobs on main and develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/main' && format('check-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-develop-{0}', github.sha) || format('check-{0}', github.ref) }}
@@ -44,7 +40,7 @@ jobs:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/[email protected].0
+        uses: gradle/[email protected].1
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Run code quality check suite

.github/workflows/quality.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: ⏬ Checkout with LFS
-        uses: nschloe/[email protected].1
+        uses: nschloe/[email protected].2
         with:
           persist-credentials: false
       - name: ☕️ Use JDK 17
@@ -24,7 +24,7 @@ jobs:
           java-version: '17'
       # Add gradle cache, this should speed up the process
       - name: Configure gradle
-        uses: gradle/[email protected].0
+        uses: gradle/[email protected].1
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Record screenshots

.github/workflows/recordScreenshots.yml

@@ -25,7 +25,7 @@ jobs:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/[email protected].0
+        uses: gradle/[email protected].1
       - name: Create app bundle
         env:
           ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}

.github/workflows/release.yml

@@ -16,8 +16,6 @@ jobs:
   sonar:
     name: Project Check Suite
     runs-on: ubuntu-latest
-    # Don't run in the merge queue again if the branch is up to date with `develop`
-    if: github.event.merge_group.base_ref != 'refs/heads/develop'
     # Allow all jobs on main and develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/main' && format('sonar-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('sonar-develop-{0}', github.sha) || format('sonar-{0}', github.ref) }}
@@ -34,7 +32,7 @@ jobs:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/[email protected].0
+        uses: gradle/[email protected].1
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: 🔊 Publish results to Sonar

.github/workflows/sonar.yml

@@ -16,16 +16,14 @@ jobs:
   tests:
     name: Runs unit tests
     runs-on: ubuntu-latest
-    # Don't run in the merge queue again if the branch is up to date with `develop`
-    if: github.event.merge_group.base_ref != 'refs/heads/develop'
 
     # 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:
       - name: ⏬ Checkout with LFS
-        uses: nschloe/[email protected].1
+        uses: nschloe/[email protected].2
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -36,7 +34,7 @@ jobs:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/[email protected].0
+        uses: gradle/[email protected].1
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
 
@@ -57,22 +55,6 @@ jobs:
           path: |
             **/kover/merged/verification/errors.txt
 
-      - name: 📸 Upload Screenshot test report
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: reports
-          path: tests/uitests/build/reports/tests/testDebugUnitTest/
-          retention-days: 5
-
-      - name: 🚫 Upload Screenshot failure differences on error
-        uses: actions/upload-artifact@v3
-        if: failure()
-        with:
-          name: failures
-          path: tests/uitests/out/failures/
-          retention-days: 5
-
       - name: ✅ Upload kover report (disabled)
         if: always()
         run: echo "This is now done only once a day, see nightlyReports.yml"
@@ -83,7 +65,7 @@ jobs:
         with:
           name: tests-and-screenshot-tests-results
           path: |
-            **/out/failures/
+            **/build/paparazzi/failures/
             **/build/reports/tests/*UnitTest/
 
       # https://github.com/codecov/codecov-action

.github/workflows/tests.yml

@@ -5,11 +5,9 @@ on: [pull_request, merge_group]
 jobs:
   build:
     runs-on: ubuntu-latest
-    # Don't run in the merge queue again if the branch is up to date with `develop`
-    if: github.event.merge_group.base_ref != 'refs/heads/develop'
     name: Validate
     steps:
-      - uses: nschloe/[email protected].1
+      - uses: nschloe/[email protected].2
 
       - run: |
           ./tools/git/validate_lfs.sh

.github/workflows/validate-lfs.yml

@@ -1,5 +1,7 @@
 appId: ${APP_ID}
 ---
+## Check that all env variables required in the whole test suite are declared (to fail faster)
+- runScript: ./scripts/checkEnv.js
 - runFlow: tests/init.yaml
 - runFlow: tests/account/login.yaml
 - runFlow: tests/settings/settings.yaml

.idea/kotlinc.xml

@@ -0,0 +1,9 @@
+// This array contains all the required environment variable. When adding a variable, add it here also.
+// If a variable is missing, an error will occur.
+
+if (APP_ID == null) throw "Fatal: missing env variable APP_ID"
+if (USERNAME == null) throw "Fatal: missing env variable USERNAME"
+if (PASSWORD == null) throw "Fatal: missing env variable PASSWORD"
+if (ROOM_NAME == null) throw "Fatal: missing env variable ROOM_NAME"
+if (INVITEE1_MXID == null) throw "Fatal: missing env variable INVITEE1_MXID"
+if (INVITEE2_MXID == null) throw "Fatal: missing env variable INVITEE2_MXID"

.maestro/allTests.yaml

@@ -9,9 +9,13 @@ appId: ${APP_ID}
 - tapOn: "Other"
 - tapOn:
     id: "change_server-server"
-- inputText: "element"
+# Test server that does not support sliding sync.
+- inputText: "gnuradio"
 - hideKeyboard
-- tapOn: "element.io"
+- tapOn: "gnuradio.org"
+- extendedWaitUntil:
+    visible: "This server currently doesn’t support sliding sync."
+    timeout: 10_000
 - tapOn: "Cancel"
 - back
 - back

.maestro/scripts/checkEnv.js

@@ -17,7 +17,7 @@ appId: ${APP_ID}
 - takeScreenshot: build/maestro/320-createAndDeleteRoom
 - tapOn: "aRoomName"
 - tapOn: "Invite people"
-# assert there's 1 memeber and 1 invitee
+# assert there's 1 member and 1 invitee
 - tapOn: "Search for someone"
 - inputText: ${INVITEE2_MXID}
 - tapOn:
@@ -27,7 +27,7 @@ appId: ${APP_ID}
 - tapOn: "Back"
 - tapOn: "aRoomName"
 - tapOn: "People"
-# assert there's 1 memeber and 2 invitees
+# assert there's 1 member and 2 invitees
 - tapOn: "Back"
 - tapOn: "Leave room"
 - tapOn: "Leave"

.maestro/tests/account/changeServer.yaml

@@ -7,6 +7,7 @@ appId: ${APP_ID}
 - tapOn: ${ROOM_NAME}
 # Back from timeline
 - back
+- assertVisible: "MyR"
 # Close keyboard
 - hideKeyboard
 # Back from search