Merge branch 'release/1.5.26' into main

Author: ganfra

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,5 +1,5 @@
 name: Bug report for the Element Android app
-description: Report any issues that you have found with the Element app. Please [check open issues](https://github.com/vector-im/element-android/issues) first, in case it has already been reported.
+description: Report any issues that you have found with the Element app. Please check open issues first, in case it has already been reported.
 labels: [T-Defect]
 body:
   - type: markdown

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Enhancement or feature request
+    url: https://github.com/vector-im/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
+    about: General Element Android support questions can be asked in the app Matrix room

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -1,5 +1,5 @@
 name: Matrix SDK bug or enhancement
-description: Report issue or ask for a feature in the [Android Matrix SDK](https://github.com/matrix-org/matrix-android-sdk2)
+description: "Report issue or ask for a feature in the Android Matrix SDK: https://github.com/matrix-org/matrix-android-sdk2"
 title: "[SDK] "
 labels: [matrix-sdk]
 

.github/ISSUE_TEMPLATE/matrix-sdk.yml

@@ -25,6 +25,9 @@ jobs:
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v3
+        with:
+          # https://github.com/actions/checkout/issues/881
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       - name: Configure gradle
         uses: gradle/gradle-build-action@v2
         with:
@@ -46,6 +49,9 @@ jobs:
       cancel-in-progress: ${{ github.ref != 'refs/head/main' }}
     steps:
       - uses: actions/checkout@v3
+        with:
+          # https://github.com/actions/checkout/issues/881
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       - name: Configure gradle
         uses: gradle/gradle-build-action@v2
         with:

.github/workflows/build.yml

@@ -4,6 +4,8 @@ on:
   pull_request: { }
   push:
     branches: [ main, develop ]
+    paths-ignore:
+      - '.github/**'
 
 # Enrich gradle.properties for CI/CD
 env:

.github/workflows/tests.yml

@@ -271,6 +271,31 @@ jobs:
           PROJECT_ID: "PVT_kwDOAM0swc4ABTXY"
           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: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+              mutation add_to_project($projectid:ID!,$contentid:ID!) {
+                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
+                  id
+                  }
+                }
+              }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PVT_kwDOAM0swc4ALoFY"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
   ps_features1:
     name: Add labelled issues to PS features team 1
     runs-on: ubuntu-latest

.github/workflows/triage-labelled.yml

@@ -5,6 +5,7 @@
 .idea/caches
 .idea/libraries
 .idea/inspectionProfiles
+.idea/sonarlint
 .idea/*.xml
 .DS_Store
 /build

.gitignore

@@ -1,3 +1,32 @@
+Changes in Element v1.5.26 (2023-02-22)
+=======================================
+
+Features ✨
+----------
+ - Adds MSC3824 OIDC-awareness when talking to an OIDC-enabled homeservers ([#6367](https://github.com/vector-im/element-android/issues/6367))
+ - [Poll] Synchronize polls push rules with message push rules ([#8007](https://github.com/vector-im/element-android/issues/8007))
+ - [Rich text editor] Add code block, quote and indentation actions ([#8045](https://github.com/vector-im/element-android/issues/8045))
+ - [Poll] History list: details screen of a poll
+ - [Poll] History list: enable the new settings entry in release mode ([#8056](https://github.com/vector-im/element-android/issues/8056))
+ - [Location sharing] Show own location in map views ([#8110](https://github.com/vector-im/element-android/issues/8110))
+ - Updates to protocol used for Sign in with QR code ([#8123](https://github.com/vector-im/element-android/issues/8123))
+ - [Poll] Synchronize polls and message push rules ([#8130](https://github.com/vector-im/element-android/issues/8130))
+
+Bugfixes 🐛
+----------
+ - Android app does not show correct poll data ([#6121](https://github.com/vector-im/element-android/issues/6121))
+ - Fix timeline always jumps to the bottom when screen goes back to foreground. ([#8090](https://github.com/vector-im/element-android/issues/8090))
+ - [Poll] Improve rendering of poll end message when poll start event isn't available ([#8129](https://github.com/vector-im/element-android/issues/8129))
+ - Replace hardcoded colors by theming colors on send button. ([#8142](https://github.com/vector-im/element-android/issues/8142))
+ - [Timeline]: Editing a reply from iOS breaks the "in reply to" rendering ([#8150](https://github.com/vector-im/element-android/issues/8150))
+
+Other changes
+-------------
+ - Build unmerged APKs on pull request ([#8044](https://github.com/vector-im/element-android/issues/8044))
+ - Replace 'Bots' with 'bots' inside terms_description_for_integration_manager ([#8115](https://github.com/vector-im/element-android/issues/8115))
+ - Fix ktlint issue with fields and a new line. ([#8139](https://github.com/vector-im/element-android/issues/8139))
+
+
 Changes in Element v1.5.25 (2023-02-15)
 =======================================
 

CHANGES.md

@@ -29,7 +29,7 @@ buildscript {
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.5.0.2730'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6'
         classpath "com.likethesalad.android:stem-plugin:2.3.0"
-        classpath 'org.owasp:dependency-check-gradle:8.0.2'
+        classpath 'org.owasp:dependency-check-gradle:8.1.0'
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20"
         classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
         classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
@@ -41,7 +41,7 @@ buildscript {
 
 plugins {
     // ktlint Plugin
-    id "org.jlleitschuh.gradle.ktlint" version "11.1.0"
+    id "org.jlleitschuh.gradle.ktlint" version "11.2.0"
     // Detekt
     id "io.gitlab.arturbosch.detekt" version "1.22.0"
     // Ksp