Merge branch 'develop' into feature/aris/fix_account_deactivation_issue

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt

Author: ariskotsomitopoulos

.github/workflows/build.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Assemble ${{ matrix.target }} debug apk
         run: ./gradlew assemble${{ matrix.target }}Debug $CI_GRADLE_ARG_PROPERTIES --stacktrace
       - name: Upload ${{ matrix.target }} debug APKs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: vector-${{ matrix.target }}-debug
           path: |
@@ -61,7 +61,7 @@ jobs:
       - name: Assemble GPlay unsigned apk
         run: ./gradlew clean assembleGplayRelease $CI_GRADLE_ARG_PROPERTIES  --stacktrace
       - name: Upload Gplay unsigned APKs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: vector-gplay-release-unsigned
           path: |

.github/workflows/nightly.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
           java-version: 11
@@ -196,7 +196,7 @@ jobs:
             - `[org.matrix.android.sdk.PermalinkParserTest]`<br>${{ steps.get-comment-body-permalink.outputs.permalink }}
           edit-mode: replace
       - name: Upload Test Report Log
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: always()
         with:
           name: integrationtest-error-results
@@ -235,7 +235,7 @@ jobs:
           uploadLogs: true
           httpPort: 8080
           disableRateLimiting: true
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
           java-version: '11'
@@ -256,7 +256,7 @@ jobs:
             adb logcat >> emulator.log &
             ./gradlew $CI_GRADLE_ARG_PROPERTIES connectedGplayDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest || (adb pull storage/emulated/0/Pictures/failure_screenshots && exit 1 )
       - name: Upload Test Report Log
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: always()
         with:
           name: uitest-error-results
@@ -269,7 +269,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with: 
           distribution: 'adopt'
           java-version: '11'
@@ -283,7 +283,7 @@ jobs:
             ${{ runner.os }}-gradle-
       - run: ./gradlew allCodeCoverageReport $CI_GRADLE_ARG_PROPERTIES
       - name: Upload Codecov data
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: always()
         with:
           name: codecov-xml
@@ -298,7 +298,7 @@ jobs:
       - codecov-units
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
           java-version: '11'

.github/workflows/quality.yml

@@ -29,7 +29,7 @@ jobs:
           ./gradlew ktlintCheck --continue
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ktlinting-report
           path: |
@@ -109,7 +109,7 @@ jobs:
         run: ./gradlew clean :vector:lint --stacktrace
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: lint-report
           path: |
@@ -142,7 +142,7 @@ jobs:
         run: ./gradlew clean lint${{ matrix.target }}Release --stacktrace
       - name: Upload ${{ matrix.target }} linting report
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: release-lint-report-${{ matrix.target }}
           path: |

.github/workflows/tests.yml

@@ -21,7 +21,7 @@ jobs:
       cancel-in-progress: true
     steps: 
       - uses: actions/checkout@v3 
-      - uses: actions/setup-java@v2 
+      - uses: actions/setup-java@v3 
         with: 
           distribution: 'adopt' 
           java-version: 11 

CHANGES.md

@@ -1,3 +1,11 @@
+Changes in Element v1.4.11 (2022-04-07)
+=======================================
+
+Bugfixes 🐛
+----------
+ - Choosing "leave all rooms and spaces" while leaving Space won't cause leaving DMs in this Space anymore ([#5609](https://github.com/vector-im/element-android/issues/5609))
+
+
 Changes in Element v1.4.10 (2022-04-05)
 =======================================
 

build.gradle

@@ -22,6 +22,7 @@ buildscript {
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
         classpath "com.likethesalad.android:stem-plugin:2.0.0"
         classpath 'org.owasp:dependency-check-gradle:7.0.4.1'
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.6.10"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

changelog.d/2396.wip

@@ -0,0 +1 @@
+Adds a new homeserver selection screen when creating an account

changelog.d/5475.bugfix

@@ -0,0 +1 @@
+Fix some cases where the read marker line would not show up

changelog.d/5554.bugfix

@@ -0,0 +1 @@
+Fix sometimes endless loading timeline

changelog.d/5570.bugfix

@@ -0,0 +1 @@
+Use member name instead of room name in DM creation item