From 042e91ee1c9c1c7018b7f8c9ab104102526486a8 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 26 Oct 2021 18:28:47 +0200 Subject: [PATCH 1/3] Set version to 1.3.6 --- matrix-sdk-android/build.gradle | 2 +- vector/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 c92d735fac..e3d0f273b8 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -31,7 +31,7 @@ android { // that the app's state is completely cleared between tests. testInstrumentationRunnerArguments clearPackageData: 'true' - buildConfigField "String", "SDK_VERSION", "\"1.3.5\"" + buildConfigField "String", "SDK_VERSION", "\"1.3.6\"" buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\"" resValue "string", "git_sdk_revision", "\"${gitRevision()}\"" diff --git a/vector/build.gradle b/vector/build.gradle index 254bf3873c..eed3e7909e 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -14,7 +14,7 @@ kapt { // Note: 2 digits max for each value ext.versionMajor = 1 ext.versionMinor = 3 -ext.versionPatch = 5 +ext.versionPatch = 6 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' From d5e7a8542beedec137939721495c3232f588c65d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 5 Nov 2021 12:48:27 +0100 Subject: [PATCH 2/3] Limit the number of pushed shortcuts --- .../java/im/vector/app/features/home/ShortcutsHandler.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt index 612e2dcf87..e63d8cf5b2 100644 --- a/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt +++ b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt @@ -41,6 +41,7 @@ class ShortcutsHandler @Inject constructor( private val pinCodeStore: PinCodeStore ) : PinCodeStoreListener { private val isRequestPinShortcutSupported = ShortcutManagerCompat.isRequestPinShortcutSupported(context) + private val maxShortcutCountPerActivity = ShortcutManagerCompat.getMaxShortcutCountPerActivity(context) // Value will be set correctly if necessary private var hasPinCode = true @@ -93,9 +94,11 @@ class ShortcutsHandler @Inject constructor( // No shortcut in this case (privacy) ShortcutManagerCompat.removeAllDynamicShortcuts(context) } else { - val shortcuts = rooms.mapIndexed { index, room -> - shortcutCreator.create(room, index) - } + val shortcuts = rooms + .take(maxShortcutCountPerActivity) + .mapIndexed { index, room -> + shortcutCreator.create(room, index) + } shortcuts.forEach { shortcut -> ShortcutManagerCompat.pushDynamicShortcut(context, shortcut) From 6c127e9de50f58147cd2822fff93fd8b39ef5642 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 17 Dec 2021 18:21:56 +0100 Subject: [PATCH 3/3] Release: prepare CHANGES --- CHANGES.md | 17 +++++++++++++++++ changelog.d/2467.bugfix | 1 - changelog.d/4700.bugfix | 1 - changelog.d/4710.bugfix | 1 - changelog.d/4713.misc | 1 - changelog.d/4733.bugfix | 1 - changelog.d/4742.bugfix | 1 - changelog.d/4743.bugfix | 1 - .../android/en-US/changelogs/40103110.txt | 2 ++ 9 files changed, 19 insertions(+), 7 deletions(-) delete mode 100644 changelog.d/2467.bugfix delete mode 100644 changelog.d/4700.bugfix delete mode 100644 changelog.d/4710.bugfix delete mode 100644 changelog.d/4713.misc delete mode 100644 changelog.d/4733.bugfix delete mode 100644 changelog.d/4742.bugfix delete mode 100644 changelog.d/4743.bugfix create mode 100644 fastlane/metadata/android/en-US/changelogs/40103110.txt diff --git a/CHANGES.md b/CHANGES.md index fbefb75e06..a776f483e6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,20 @@ +Changes in Element v1.3.11 (2021-12-17) +======================================= + +Bugfixes 🐛 +---------- + - Fixing proximity sensor still being active after a call ([#2467](https://github.com/vector-im/element-android/issues/2467)) + - Fix name and shield are truncated in the room detail screen ([#4700](https://github.com/vector-im/element-android/issues/4700)) + - Call banner: center text vertically ([#4710](https://github.com/vector-im/element-android/issues/4710)) + - Fixes unable to render messages by allowing them to render whilst the emoji library is initialising ([#4733](https://github.com/vector-im/element-android/issues/4733)) + - Fix app crash uppon long press on a reply event ([#4742](https://github.com/vector-im/element-android/issues/4742)) + - Fixes crash when launching rooms which contain emojis in the emote content on android 12+ ([#4743](https://github.com/vector-im/element-android/issues/4743)) + +Other changes +------------- + - Avoids leaking the activity windows when loading dialogs are displaying ([#4713](https://github.com/vector-im/element-android/issues/4713)) + + Changes in Element v1.3.10 (2021-12-14) ======================================= diff --git a/changelog.d/2467.bugfix b/changelog.d/2467.bugfix deleted file mode 100644 index e707199e8a..0000000000 --- a/changelog.d/2467.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixing proximity sensor still being active after a call \ No newline at end of file diff --git a/changelog.d/4700.bugfix b/changelog.d/4700.bugfix deleted file mode 100644 index c8ad7c9b66..0000000000 --- a/changelog.d/4700.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix name and shield are truncated in the room detail screen \ No newline at end of file diff --git a/changelog.d/4710.bugfix b/changelog.d/4710.bugfix deleted file mode 100644 index 4abfaa91bd..0000000000 --- a/changelog.d/4710.bugfix +++ /dev/null @@ -1 +0,0 @@ -Call banner: center text vertically \ No newline at end of file diff --git a/changelog.d/4713.misc b/changelog.d/4713.misc deleted file mode 100644 index 5207c03871..0000000000 --- a/changelog.d/4713.misc +++ /dev/null @@ -1 +0,0 @@ -Avoids leaking the activity windows when loading dialogs are displaying \ No newline at end of file diff --git a/changelog.d/4733.bugfix b/changelog.d/4733.bugfix deleted file mode 100644 index 53979d21c4..0000000000 --- a/changelog.d/4733.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixes unable to render messages by allowing them to render whilst the emoji library is initialising \ No newline at end of file diff --git a/changelog.d/4742.bugfix b/changelog.d/4742.bugfix deleted file mode 100644 index ba4f32acf7..0000000000 --- a/changelog.d/4742.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix app crash uppon long press on a reply event diff --git a/changelog.d/4743.bugfix b/changelog.d/4743.bugfix deleted file mode 100644 index 645b812314..0000000000 --- a/changelog.d/4743.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixes crash when launching rooms which contain emojis in the emote content on android 12+ \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/40103110.txt b/fastlane/metadata/android/en-US/changelogs/40103110.txt new file mode 100644 index 0000000000..c28b303a35 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40103110.txt @@ -0,0 +1,2 @@ +Main changes in this version: Bug fixes! +Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.3.11 \ No newline at end of file