Merge branch 'release/1.3.13' into main

element-hq · Jan 11, 2022 · 7414003 · 7414003
2 parents 973b42b + 8db8f5b
commit 7414003
Show file tree

Hide file tree

Showing 606 changed files with 15,972 additions and 7,032 deletions.
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -14,6 +14,7 @@ jobs:
       - name: Run code quality check suite
         run: ./tools/check/check_code_quality.sh
 
+# ktlint for all the modules
   ktlint:
     name: Kotlin Linter
     runs-on: ubuntu-latest
@@ -23,12 +24,66 @@ jobs:
         run: |
           ./gradlew ktlintCheck --continue
       - name: Upload reports
+        if: always()
         uses: actions/upload-artifact@v2
         with:
           name: ktlinting-report
-          path: vector/build/reports/ktlint/*.*
+          path: |
+            */build/reports/ktlint/ktlint*/ktlint*.txt
+      - name: Handle Results
+        if: always()
+        id: ktlint-results
+        run: |
+          results="$(cat */*/build/reports/ktlint/ktlint*/ktlint*.txt */build/reports/ktlint/ktlint*/ktlint*.txt | sed -r "s/\x1B\[([0-9]{1,3}(;[0-9]{1,2})?)?[mGK]//g")"
+          if [ -z  "$results" ]; then
+            echo "::set-output name=add_comment::false"
+          else
+            body="👎\`Failed${results}\`"
+            body="${body//'%'/'%25'}"
+            body="${body//$'\n'/'%0A'}"
+            body="${body//$'\r'/'%0D'}"
+            body="$( echo $body | sed 's/\/home\/runner\/work\/element-android\/element-android\//\`<br\/>\`/g')"
+            body="$( echo $body | sed 's/\/src\/main\/java\// 🔸 /g')"
+            body="$( echo $body | sed 's/im\/vector\/app\///g')"
+            body="$( echo $body | sed 's/im\/vector\/lib\/attachmentviewer\///g')"
+            body="$( echo $body | sed 's/im\/vector\/lib\/multipicker\///g')"
+            body="$( echo $body | sed 's/im\/vector\/lib\///g')"
+            body="$( echo $body | sed 's/org\/matrix\/android\/sdk\///g')"
+            body="$( echo $body | sed 's/\/src\/androidTest\/java\// 🔸 /g')"
+            echo "::set-output name=add_comment::true"
+            echo "::set-output name=body::$body"
+          fi
+      - name: Find Comment
+        if: always()
+        uses: peter-evans/find-comment@v1
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: Ktlint Results
+      - name: Add comment if needed
+        if: always() && steps.ktlint-results.outputs.add_comment == 'true'
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            ### Ktlint Results
+
+            ${{ steps.ktlint-results.outputs.body }}
+          edit-mode: replace
+      - name: Delete comment if needed
+        if: always() && steps.fc.outputs.comment-id != '' && steps.ktlint-results.outputs.add_comment == 'false'
+        uses: actions/github-script@v3
+        with:
+          script: |
+            github.issues.deleteComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: ${{ steps.fc.outputs.comment-id }}
+            })
 
-# Lint for main module and all the other modules
+# Lint for main module
   android-lint:
     name: Android Linter
     runs-on: ubuntu-latest
@@ -45,6 +100,7 @@ jobs:
       - name: Lint analysis
         run: ./gradlew clean :vector:lint --stacktrace
       - name: Upload reports
+        if: always()
         uses: actions/upload-artifact@v2
         with:
           name: lint-report
@@ -73,8 +129,8 @@ jobs:
       - name: Lint ${{ matrix.target }} release
         run: ./gradlew clean lint${{ matrix.target }}Release --stacktrace
       - name: Upload ${{ matrix.target }} linting report
-        uses: actions/upload-artifact@v2
         if: always()
+        uses: actions/upload-artifact@v2
         with:
           name: release-lint-report-${{ matrix.target }}
           path: |

diff --git a/.github/workflows/triage-incoming.yml b/.github/workflows/triage-incoming.yml
@@ -7,6 +7,8 @@ on:
 jobs:
   automate-project-columns:
     runs-on: ubuntu-latest
+    # Skip in forks
+    if: github.repository == 'vector-im/element-android'
     steps:
       - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:

diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
@@ -3,11 +3,13 @@ name: Move labelled issues to correct boards and columns
 on:
   issues:
     types: [labeled]
-    
+
 jobs:
   move_needs_info_issues:
     name: X-Needs-Info issues to Need info column on triage board
     runs-on: ubuntu-latest
+    # Skip in forks
+    if: github.repository == 'vector-im/element-android'
     steps:
       - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
         with:
@@ -19,15 +21,17 @@ jobs:
   add_priority_design_issues_to_project:
     name: P1 X-Needs-Design to Design project board
     runs-on: ubuntu-latest
+    # Skip in forks
     if: >
-        contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
-        (contains(github.event.issue.labels.*.name, 'S-Critical') &&
-         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+      github.repository == 'vector-im/element-android' &&
+      contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
+      (contains(github.event.issue.labels.*.name, 'S-Critical') &&
+        (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
           contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
-         contains(github.event.issue.labels.*.name, 'S-Major') &&
-         contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-         contains(github.event.issue.labels.*.name, 'A11y') &&
-         contains(github.event.issue.labels.*.name, 'O-Frequent'))
+        contains(github.event.issue.labels.*.name, 'S-Major') &&
+        contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+        contains(github.event.issue.labels.*.name, 'A11y') &&
+        contains(github.event.issue.labels.*.name, 'O-Frequent'))
     steps:
       - uses: octokit/graphql-action@v2.x
         id: add_to_project
@@ -47,36 +51,40 @@ jobs:
           PROJECT_ID: "PN_kwDOAM0swc0sUA"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
-#  delight_issues_to_board:
-#    name: Spaces issues to new Delight project board
-#    runs-on: ubuntu-latest
-#    if: >
-#        contains(github.event.issue.labels.*.name, 'A-Spaces') ||
-#        contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
-#        contains(github.event.issue.labels.*.name, 'A-Subspaces')
-#    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_kwDOAM0swc1HvQ"
-#          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+  #  delight_issues_to_board:
+  #    name: Spaces issues to new Delight project board
+  #    runs-on: ubuntu-latest
+  #    # Skip in forks
+  #    if: >
+  #      github.repository == 'vector-im/element-android' &&
+  #      contains(github.event.issue.labels.*.name, 'A-Spaces') ||
+  #      contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
+  #      contains(github.event.issue.labels.*.name, 'A-Subspaces')
+  #    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_kwDOAM0swc1HvQ"
+  #          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   move_voice-message_issues:
     name: A-Voice Messages to voice message board
     runs-on: ubuntu-latest
+    # Skip in forks
     if: >
-        contains(github.event.issue.labels.*.name, 'A-Voice Messages')
+      github.repository == 'vector-im/element-android' &&
+      contains(github.event.issue.labels.*.name, 'A-Voice Messages')
     steps:
       - uses: octokit/graphql-action@v2.x
         with:
@@ -98,8 +106,10 @@ jobs:
   move_threads_issues:
     name: A-Threads to Thread board
     runs-on: ubuntu-latest
+    # Skip in forks
     if: >
-        contains(github.event.issue.labels.*.name, 'A-Threads')
+      github.repository == 'vector-im/element-android' &&
+      contains(github.event.issue.labels.*.name, 'A-Threads')
     steps:
       - uses: octokit/graphql-action@v2.x
         with:
@@ -121,8 +131,10 @@ jobs:
   move_message_bubbles_issues:
     name: A-Message-Bubbles to Message bubbles board
     runs-on: ubuntu-latest
+    # Skip in forks
     if: >
-        contains(github.event.issue.labels.*.name, 'A-Message-Bubbles')
+      github.repository == 'vector-im/element-android' &&
+      contains(github.event.issue.labels.*.name, 'A-Message-Bubbles')
     steps:
       - uses: octokit/graphql-action@v2.x
         with:

diff --git a/.github/workflows/triage-move-unlabelled.yml b/.github/workflows/triage-move-unlabelled.yml
@@ -3,14 +3,15 @@ name: Move unlabelled from needs info columns to triaged
 on:
   issues:
     types: [unlabeled]
-    
+
 jobs:
   Move_Unabeled_Issue_On_Project_Board:
     name: Move no longer X-Needs-Info issues to Triaged
     runs-on: ubuntu-latest
+    # Skip in forks
     if: >
-        ${{
-        !contains(github.event.issue.labels.*.name, 'X-Needs-Info') }}
+      github.repository == 'vector-im/element-android' &&
+      !contains(github.event.issue.labels.*.name, 'X-Needs-Info')
     env:
       BOARD_NAME: "Issue triage"
       OWNER: ${{ github.repository_owner }}

diff --git a/.github/workflows/triage-priority-bugs.yml b/.github/workflows/triage-priority-bugs.yml
@@ -7,23 +7,25 @@ on:
 jobs:
   p1_issues_to_team_workboard:
     runs-on: ubuntu-latest
+    # Skip in forks
     if: >
-        (!contains(github.event.issue.labels.*.name, 'A-E2EE') &&
-         !contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') &&
-         !contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') &&
-         !contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') &&
-         !contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification') &&
-         !contains(github.event.issue.labels.*.name, 'A-Spaces') &&
-         !contains(github.event.issue.labels.*.name, 'A-Spaces-Settings') &&
-         !contains(github.event.issue.labels.*.name, 'A-Subspaces')) &&
-        (contains(github.event.issue.labels.*.name, 'T-Defect') &&
-         contains(github.event.issue.labels.*.name, 'S-Critical') &&
-         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+      github.repository == 'vector-im/element-android' &&
+      (!contains(github.event.issue.labels.*.name, 'A-E2EE') &&
+        !contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') &&
+        !contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') &&
+        !contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') &&
+        !contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification') &&
+        !contains(github.event.issue.labels.*.name, 'A-Spaces') &&
+        !contains(github.event.issue.labels.*.name, 'A-Spaces-Settings') &&
+        !contains(github.event.issue.labels.*.name, 'A-Subspaces')) &&
+      (contains(github.event.issue.labels.*.name, 'T-Defect') &&
+        contains(github.event.issue.labels.*.name, 'S-Critical') &&
+        (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
           contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
-         contains(github.event.issue.labels.*.name, 'S-Major') &&
-         contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-         contains(github.event.issue.labels.*.name, 'A11y') &&
-         contains(github.event.issue.labels.*.name, 'O-Frequent'))
+        contains(github.event.issue.labels.*.name, 'S-Major') &&
+        contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+        contains(github.event.issue.labels.*.name, 'A11y') &&
+        contains(github.event.issue.labels.*.name, 'O-Frequent'))
     steps:
       - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:
@@ -33,20 +35,22 @@ jobs:
 
   P1_issues_to_crypto_team_workboard:
     runs-on: ubuntu-latest
+    # Skip in forks
     if: >
-        (contains(github.event.issue.labels.*.name, 'A-E2EE') ||
-         contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') ||
-         contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
-         contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') ||
-         contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification')) &&
-        (contains(github.event.issue.labels.*.name, 'T-Defect') &&
-         contains(github.event.issue.labels.*.name, 'S-Critical') &&
-         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+      github.repository == 'vector-im/element-android' &&
+      (contains(github.event.issue.labels.*.name, 'A-E2EE') ||
+        contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') ||
+        contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
+        contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') ||
+        contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification')) &&
+      (contains(github.event.issue.labels.*.name, 'T-Defect') &&
+        contains(github.event.issue.labels.*.name, 'S-Critical') &&
+        (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
           contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
-         contains(github.event.issue.labels.*.name, 'S-Major') &&
-         contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-         contains(github.event.issue.labels.*.name, 'A11y') &&
-         contains(github.event.issue.labels.*.name, 'O-Frequent'))
+        contains(github.event.issue.labels.*.name, 'S-Major') &&
+        contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+        contains(github.event.issue.labels.*.name, 'A11y') &&
+        contains(github.event.issue.labels.*.name, 'O-Frequent'))
     steps:
       - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:

diff --git a/.idea/dictionaries/bmarty.xml b/.idea/dictionaries/bmarty.xml