From 2b582d3a48efc8b0948ca68bbcdefa5404a4e020 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Apr 2023 23:56:47 +0000 Subject: [PATCH 1/5] Bump danger/danger-js from 11.2.4 to 11.2.6 Bumps [danger/danger-js](https://github.com/danger/danger-js) from 11.2.4 to 11.2.6. - [Release notes](https://github.com/danger/danger-js/releases) - [Changelog](https://github.com/danger/danger-js/blob/main/CHANGELOG.md) - [Commits](https://github.com/danger/danger-js/compare/11.2.4...11.2.6) --- updated-dependencies: - dependency-name: danger/danger-js dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/danger.yml | 2 +- .github/workflows/quality.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 bf298df26e..4b12594a68 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -66,7 +66,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: From 40bbd3ebd136259943d4671c4ca9510bacc3c090 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 10:15:36 +0000 Subject: [PATCH 2/5] Bump com.googlecode.libphonenumber:libphonenumber from 8.13.9 to 8.13.10 (#8338) Bumps [com.googlecode.libphonenumber:libphonenumber](https://github.com/google/libphonenumber) from 8.13.9 to 8.13.10. - [Release notes](https://github.com/google/libphonenumber/releases) - [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md) - [Commits](https://github.com/google/libphonenumber/compare/v8.13.9...v8.13.10) --- updated-dependencies: - dependency-name: com.googlecode.libphonenumber:libphonenumber dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", From 0143cf7ea886801699a47dd2ad0ac8149d812cc7 Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 19 Apr 2023 16:15:35 +0200 Subject: [PATCH 3/5] Changelog for version 1.5.32 --- CHANGES.md | 10 ++++++++++ changelog.d/7882.bugfix | 1 - changelog.d/8307.bugfix | 2 -- changelog.d/8313.bugfix | 1 - .../vector/app/features/home/HomeActivityViewModel.kt | 1 + 5 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 changelog.d/7882.bugfix delete mode 100644 changelog.d/8307.bugfix delete mode 100644 changelog.d/8313.bugfix 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/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt index f961cc5da6..9472ee262d 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 @@ -182,6 +182,7 @@ class HomeActivityViewModel @AssistedInject constructor( if (analyticsConfig.isEnabled) { analyticsStore.didAskUserConsentFlow .onEach { didAskUser -> + Timber.v("DidAskUserConsent: $didAskUser") if (!didAskUser) { _viewEvents.post(HomeActivityViewEvents.ShowAnalyticsOptIn) } else { From ca849e40a44f3d5b0f7f628c590a306c2a4a85ef Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 19 Apr 2023 16:17:31 +0200 Subject: [PATCH 4/5] Adding fastlane file for version 1.5.32 --- fastlane/metadata/android/en-US/changelogs/40105320.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/40105320.txt 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 From 83296727a26bc71b64c365eee99aee8b8bfb4bc4 Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 19 Apr 2023 16:26:20 +0200 Subject: [PATCH 5/5] version++ --- matrix-sdk-android/build.gradle | 2 +- vector-app/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index 63792efe5b..31e0a638b9 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -62,7 +62,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 7f330a22ca..790284973d 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'