Merge branch 'release/1.6.10' into main

Author: bmarty

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: true
 contact_links:
   - name: Enhancement or feature request
-    url: https://github.com/vector-im/element-meta/discussions/categories/ideas
+    url: https://github.com/element-hq/element-meta/discussions/categories/ideas
     about: Do you have a suggestion or feature request?
   - name: Element Android Community Support
     url: https://matrix.to/#/#element-android:matrix.org

.github/ISSUE_TEMPLATE/release.yml

@@ -19,7 +19,7 @@ body:
         - [ ] Check the update of the store descriptions (using Google Translate if necessary) to ensure that the changes are acceptable to be published to the stores.
         - [ ] While Weblate is locked, and after the PR from Weblate has been merged, handle all the TODOs in the main `strings.xml` file
         - [ ] Run the script `./tools/release/pushPlayStoreMetaData.sh`. You can check in the GooglePlay console the Activity log to check the effect.
-        - [ ] Ensure all [the required PRs](https://github.com/vector-im/element-android/pulls?q=is%3Aopen+is%3Apr+label%3AZ-NextRelease) have been merged
+        - [ ] Ensure all [the required PRs](https://github.com/element-hq/element-android/pulls?q=is%3Aopen+is%3Apr+label%3AZ-NextRelease) have been merged
 
         ### Do the release
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!-- Please read [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
+<!-- Please read [CONTRIBUTING.md](https://github.com/element-hq/element-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
 
 ## Type of change
 
@@ -49,10 +49,10 @@ Uncomment this markdown table below and edit the last line `|||`:
 
 - [ ] Changes has been tested on an Android device or Android emulator with API 21
 - [ ] UI change has been tested on both light and dark themes
-- [ ] Accessibility has been taken into account. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#accessibility
+- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-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-android/blob/develop/CONTRIBUTING.md#changelog
+- [ ] Pull request includes a new file under ./changelog.d. See https://github.com/element-hq/element-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
-- [ ] If you have modified the screen flow, or added new screens to the application, you have updated the test [UiAllScreensSanityTest.allScreensTest()](https://github.com/vector-im/element-android/blob/main/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt#L73)
+- [ ] If you have modified the screen flow, or added new screens to the application, you have updated the test [UiAllScreensSanityTest.allScreensTest()](https://github.com/element-hq/element-android/blob/main/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt#L73)

.github/dependabot.yml

@@ -11,7 +11,7 @@ updates:
     schedule:
       interval: "weekly"
     reviewers:
-      - "vector-im/element-android-reviewers"
+      - "element-hq/element-android-reviewers"
     ignore:
       - dependency-name: "*"
   # Updates for Gradle dependencies used in the app
@@ -21,7 +21,7 @@ updates:
       interval: "daily"
     open-pull-requests-limit: 200
     reviewers:
-      - "vector-im/element-android-reviewers"
+      - "element-hq/element-android-reviewers"
     allow:
       - dependency-name: "io.element.android:wysiwyg"
       - dependency-name: "org.matrix.rustcomponents:crypto-android"

.github/workflows/build.yml

@@ -79,12 +79,18 @@ jobs:
       - name: Execute exodus-standalone
         uses: docker://exodusprivacy/exodus-standalone:latest
         with:
-          args: /github/workspace/gplay/release/vector-gplay-universal-release-unsigned.apk -j -o /github/workspace/exodus.json
+          # Don't fail when finding trackers so they can be reported later
+          args: /github/workspace/gplay/release/vector-gplay-universal-release-unsigned.apk -j -o /github/workspace/exodus.json -e 0
       - name: Upload exodus json report
         uses: actions/upload-artifact@v3
         with:
           name: exodus.json
           path: |
             exodus.json
       - name: Check for trackers
-        run: "jq -e '.trackers == []' exodus.json > /dev/null || { echo '::error static analysis identified user tracking library' ; exit 1; }"
+        env:
+          SENTRY_ID: 447
+        # Should only contain a Sentry item
+        run: |
+          TRACKER_IDS=$(jq ".trackers[] | .id" exodus.json)
+          [ $TRACKER_IDS = ${{ env.SENTRY_ID }} ] || { echo '::error static analysis identified user tracking library' ; exit 1; }

.github/workflows/sync-from-external-sources.yml

@@ -9,7 +9,7 @@ jobs:
   sync-emojis:
     runs-on: ubuntu-latest
     # Skip in forks
-    if: github.repository == 'vector-im/element-android'
+    if: github.repository == 'element-hq/element-android'
     # No concurrency required, runs every time on a schedule.
     steps:
       - uses: actions/checkout@v3
@@ -36,7 +36,7 @@ jobs:
   sync-sas-strings:
     runs-on: ubuntu-latest
     # Skip in forks
-    if: github.repository == 'vector-im/element-android'
+    if: github.repository == 'element-hq/element-android'
     # No concurrency required, runs every time on a schedule.
     steps:
       - uses: actions/checkout@v3
@@ -62,7 +62,7 @@ jobs:
   sync-analytics-plan:
     runs-on: ubuntu-latest
     # Skip in forks
-    if: github.repository == 'vector-im/element-android'
+    if: github.repository == 'element-hq/element-android'
     # No concurrency required, runs every time on a schedule.
     steps:
       - uses: actions/checkout@v3

.github/workflows/triage-incoming.yml

@@ -47,25 +47,12 @@ jobs:
               labels: ['Help Wanted']
             })
 
-  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:
-          action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
-          project-url: "https://github.com/vector-im/element-android/projects/4"
-          column-name: "Need info"
-          label-name: "X-Needs-Info"
-
   add_design_issues_to_project:
     name: X-Needs-Design to Design project board
     runs-on: ubuntu-latest
     # Skip in forks
     if: >
-      github.repository == 'vector-im/element-android' &&
+      github.repository == 'element-hq/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') ||
@@ -76,7 +63,7 @@ jobs:
     steps:
       - uses: actions/add-to-project@main
         with:
-          project-url: https://github.com/orgs/vector-im/projects/18
+          project-url: https://github.com/orgs/element-hq/projects/18
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   add_product_issues:
@@ -87,84 +74,6 @@ jobs:
     steps:
       - uses: actions/add-to-project@main
         with:
-          project-url: https://github.com/orgs/vector-im/projects/28
-          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-BBQ-Alpha') ||
-        contains(github.event.issue.labels.*.name, 'Z-BBQ-Beta') ||
-        contains(github.event.issue.labels.*.name, 'Z-BBQ-Release') ||
-        contains(github.event.issue.labels.*.name, 'Z-Banquet-Alpha') ||
-        contains(github.event.issue.labels.*.name, 'Z-Banquet-Beta') ||
-        contains(github.event.issue.labels.*.name, 'Z-Banquet-Release'))
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/vector-im/projects/43
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ex_plorers:
-    name: Add labelled issues to X-Plorer project
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'Team: Element X Feature')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/vector-im/projects/73
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features1:
-    name: Add labelled issues to PS features team 1
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-Polls') ||
-      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
-      (contains(github.event.issue.labels.*.name, 'A-Voice-Messages') &&
-        !contains(github.event.issue.labels.*.name, 'A-Broadcast')) ||
-      (contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') &&
-        contains(github.event.issue.labels.*.name, 'A-User-Settings'))
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/vector-im/projects/56
+          project-url: https://github.com/orgs/element-hq/projects/28
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
-  ps_features2:
-    name: Add labelled issues to PS features team 2
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-DM-Start') ||
-      contains(github.event.issue.labels.*.name, 'A-Broadcast')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/vector-im/projects/58
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features3:
-    name: Add labelled issues to PS features team 3
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/vector-im/projects/57
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  voip:
-    name: Add labelled issues to VoIP project board
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'Team: VoIP')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/vector-im/projects/41
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/triage-labelled.yml

@@ -8,15 +8,15 @@ jobs:
     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'
+    if: github.repository == 'element-hq/element-android'
     steps:
       - uses: octokit/graphql-action@v2.x
         id: find_team_members
         with:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             query find_team_members($team: String!) {
-              organization(login: "vector-im") {
+              organization(login: "element-hq") {
                 team(slug: $team) {
                   members {
                     nodes {
@@ -77,15 +77,15 @@ jobs:
     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'
+    if: github.repository == 'element-hq/element-android'
     steps:
       - uses: octokit/graphql-action@v2.x
         id: find_team_members
         with:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             query find_team_members($team: String!) {
-              organization(login: "vector-im") {
+              organization(login: "element-hq") {
                 team(slug: $team) {
                   members {
                     nodes {

.github/workflows/triage-move-review-requests.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     # Skip in forks
     if: >
-      github.repository == 'vector-im/element-android' &&
+      github.repository == 'element-hq/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') &&
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     # Skip in forks
     if: >
-      github.repository == 'vector-im/element-android' &&
+      github.repository == 'element-hq/element-android' &&
       (contains(github.event.issue.labels.*.name, 'Z-UISI') ||
         (contains(github.event.issue.labels.*.name, 'A-E2EE') ||
         contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') ||