diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 4c00894a36..8358eae14b 100644 --- a/.github/workflows/danger.yml +++ b/.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: diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 09b40a28ce..b007073106 100644 --- a/.github/workflows/quality.yml +++ b/.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: diff --git a/CHANGES.md b/CHANGES.md index c577db65e7..905f178526 100644 --- a/CHANGES.md +++ b/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) ======================================= diff --git a/changelog.d/7882.bugfix b/changelog.d/7882.bugfix deleted file mode 100644 index dea9d13795..0000000000 --- a/changelog.d/7882.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix multiple read receipts for the same user in timeline. diff --git a/changelog.d/8307.bugfix b/changelog.d/8307.bugfix deleted file mode 100644 index b548287ee7..0000000000 --- a/changelog.d/8307.bugfix +++ /dev/null @@ -1,2 +0,0 @@ - The new permalink rendering is not applied on permalink created with the potential clientPermalinkBaseUrl - \ No newline at end of file diff --git a/changelog.d/8313.bugfix b/changelog.d/8313.bugfix deleted file mode 100644 index b524678101..0000000000 --- a/changelog.d/8313.bugfix +++ /dev/null @@ -1 +0,0 @@ -Keep screen on while recording voicebroadcast diff --git a/dependencies.gradle b/dependencies.gradle index 3611a1c688..be357a5bcd 100644 --- a/dependencies.gradle +++ b/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", diff --git a/fastlane/metadata/android/en-US/changelogs/40105320.txt b/fastlane/metadata/android/en-US/changelogs/40105320.txt new file mode 100644 index 0000000000..df2e163506 --- /dev/null +++ b/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 diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index 03525964ce..b85f11303e 100644 --- a/matrix-sdk-android/build.gradle +++ b/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()}\"" diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 52f30ed808..d466bba599 100644 --- a/vector-app/build.gradle +++ b/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' diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt index 2a055b23b9..73bbcac070 100644 --- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt +++ b/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 {