Merge branch 'develop' into feature/bca/rust_flavor

.github/workflows/danger.yml

@@ -11,7 +11,7 @@ jobs:
       - run: |
           npm install --save-dev @babel/plugin-transform-flow-strip-types
       - name: Danger
-        uses: danger/danger-js@11.2.4
+        uses: danger/danger-js@11.2.6
         with:
           args: "--dangerfile ./tools/danger/dangerfile.js"
         env:

.github/workflows/quality.yml

@@ -68,7 +68,7 @@ jobs:
           yarn add danger-plugin-lint-report --dev
       - name: Danger lint
         if: always()
-        uses: danger/danger-js@11.2.4
+        uses: danger/danger-js@11.2.6
         with:
           args: "--dangerfile ./tools/danger/dangerfile-lint.js"
         env:

CHANGES.md

@@ -1,3 +1,13 @@
+Changes in Element v1.5.32 (2023-04-19)
+=======================================
+
+Bugfixes 🐛
+----------
+ - Fix multiple read receipts for the same user in timeline. ([#7882](https://github.com/vector-im/element-android/issues/7882))
+ - The new permalink rendering is not applied on permalink created with the potential clientPermalinkBaseUrl ([#8307](https://github.com/vector-im/element-android/issues/8307))
+ - Keep screen on while recording voicebroadcast ([#8313](https://github.com/vector-im/element-android/issues/8313))
+
+
 Changes in Element v1.5.30 (2023-04-05)
 =======================================
 

changelog.d/7882.bugfix

@@ -1 +0,0 @@
-Fix multiple read receipts for the same user in timeline.

changelog.d/8307.bugfix

@@ -1,2 +0,0 @@
- The new permalink rendering is not applied on permalink created with the potential clientPermalinkBaseUrl
- 

changelog.d/8313.bugfix

@@ -1 +0,0 @@
-Keep screen on while recording voicebroadcast

dependencies.gradle

@@ -86,7 +86,7 @@ ext.libs = [
                 'appdistributionApi'      : "com.google.firebase:firebase-appdistribution-api-ktx:$appDistribution",
                 'appdistribution'         : "com.google.firebase:firebase-appdistribution:$appDistribution",
                 // Phone number https://github.com/google/libphonenumber
-                'phonenumber'             : "com.googlecode.libphonenumber:libphonenumber:8.13.9"
+                'phonenumber'             : "com.googlecode.libphonenumber:libphonenumber:8.13.10"
         ],
         dagger      : [
                 'dagger'                  : "com.google.dagger:dagger:$dagger",

fastlane/metadata/android/en-US/changelogs/40105320.txt

@@ -0,0 +1,2 @@
+Main changes in this version: Mainly bugfixing.
+Full changelog: https://github.com/vector-im/element-android/releases

matrix-sdk-android/build.gradle

@@ -63,7 +63,7 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
-        buildConfigField "String", "SDK_VERSION", "\"1.5.32\""
+        buildConfigField "String", "SDK_VERSION", "\"1.5.34\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""

vector-app/build.gradle

@@ -37,7 +37,7 @@ ext.versionMinor = 5
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-ext.versionPatch = 32
+ext.versionPatch = 34
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt

@@ -183,6 +183,7 @@ class HomeActivityViewModel @AssistedInject constructor(
         if (analyticsConfig.isEnabled) {
             analyticsStore.didAskUserConsentFlow
                     .onEach { didAskUser ->
+                        Timber.v("DidAskUserConsent: $didAskUser")
                         if (!didAskUser) {
                             _viewEvents.post(HomeActivityViewEvents.ShowAnalyticsOptIn)
                         } else {