From b30c27b7a6f58d1bbcacc176c8a5bca895f24f4c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 18 Jun 2021 21:50:12 +0200 Subject: [PATCH 1/4] Version++ --- vector/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/build.gradle b/vector/build.gradle index 21f62647c0..8e4c8a720f 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 = 1 -ext.versionPatch = 10 +ext.versionPatch = 11 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' From d8327a51610ebb863fd98c48250aaa3c1db23752 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 18 Jun 2021 18:55:13 +0200 Subject: [PATCH 2/4] Fix crash on signout: release session at the end so you clean up files first. --- changelog.d/3538.bugfix | 1 + .../sdk/internal/session/cleanup/CleanupSession.kt | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 changelog.d/3538.bugfix diff --git a/changelog.d/3538.bugfix b/changelog.d/3538.bugfix new file mode 100644 index 0000000000..bad8f045ba --- /dev/null +++ b/changelog.d/3538.bugfix @@ -0,0 +1 @@ +Fix crash on signout: release session at the end of clean up. \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt index b5c1e6a282..8870d92a35 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt @@ -51,15 +51,12 @@ internal class CleanupSession @Inject constructor( @UserMd5 private val userMd5: String ) { suspend fun handle() { - Timber.d("Cleanup: release session...") - sessionManager.releaseSession(sessionId) + Timber.d("Cleanup: delete session params...") + sessionParamsStore.delete(sessionId) Timber.d("Cleanup: cancel pending works...") workManagerProvider.cancelAllWorks() - Timber.d("Cleanup: delete session params...") - sessionParamsStore.delete(sessionId) - Timber.d("Cleanup: clear session data...") clearSessionDataTask.execute(Unit) @@ -74,6 +71,9 @@ internal class CleanupSession @Inject constructor( realmKeysUtils.clear(SessionModule.getKeyAlias(userMd5)) realmKeysUtils.clear(CryptoModule.getKeyAlias(userMd5)) + Timber.d("Cleanup: release session...") + sessionManager.releaseSession(sessionId) + // Sanity check if (BuildConfig.DEBUG) { Realm.getGlobalInstanceCount(realmSessionConfiguration) From c21b19f49f20227d2b9659ebbe3a483c87189e6e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 21 Jun 2021 14:06:43 +0200 Subject: [PATCH 3/4] Send button does not show up half of the time (#3535) --- changelog.d/3535.feature | 1 + .../app/features/home/room/detail/composer/TextComposerView.kt | 1 + 2 files changed, 2 insertions(+) create mode 100644 changelog.d/3535.feature diff --git a/changelog.d/3535.feature b/changelog.d/3535.feature new file mode 100644 index 0000000000..840f938acf --- /dev/null +++ b/changelog.d/3535.feature @@ -0,0 +1 @@ +Send button does not show up half of the time \ No newline at end of file diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt index fa5e736c1c..033eb12563 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt @@ -73,6 +73,7 @@ class TextComposerView @JvmOverloads constructor( override fun onTextBlankStateChanged(isBlank: Boolean) { callback?.onTextBlankStateChanged(isBlank) val shouldBeVisible = currentConstraintSetId == R.layout.composer_layout_constraint_set_expanded || !isBlank + TransitionManager.endTransitions(this@TextComposerView) if (views.sendButton.isVisible != shouldBeVisible) { TransitionManager.beginDelayedTransition( this@TextComposerView, From b76fd5dd4ead3bd35cb836642a0a4ef30d206959 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 22 Jun 2021 12:27:36 +0200 Subject: [PATCH 4/4] Prepare release 1.1.11 --- CHANGES.md | 9 +++++++++ changelog.d/3535.feature | 1 - changelog.d/3538.bugfix | 1 - fastlane/metadata/android/en-US/changelogs/40101110.txt | 2 ++ 4 files changed, 11 insertions(+), 2 deletions(-) delete mode 100644 changelog.d/3535.feature delete mode 100644 changelog.d/3538.bugfix create mode 100644 fastlane/metadata/android/en-US/changelogs/40101110.txt diff --git a/CHANGES.md b/CHANGES.md index 1f4c680f53..9947146a9e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,12 @@ +Changes in Element v1.1.11 (2021-06-22) +======================================= + +Bugfixes 🐛 +---------- + - Send button does not show up half of the time ([#3535](https://github.com/vector-im/element-android/issues/3535)) + - Fix crash on signout: release session at the end of clean up. ([#3538](https://github.com/vector-im/element-android/issues/3538)) + + Changes in Element v1.1.10 (2021-06-18) ======================================= diff --git a/changelog.d/3535.feature b/changelog.d/3535.feature deleted file mode 100644 index 840f938acf..0000000000 --- a/changelog.d/3535.feature +++ /dev/null @@ -1 +0,0 @@ -Send button does not show up half of the time \ No newline at end of file diff --git a/changelog.d/3538.bugfix b/changelog.d/3538.bugfix deleted file mode 100644 index bad8f045ba..0000000000 --- a/changelog.d/3538.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix crash on signout: release session at the end of clean up. \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/40101110.txt b/fastlane/metadata/android/en-US/changelogs/40101110.txt new file mode 100644 index 0000000000..cb3e85d6c0 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40101110.txt @@ -0,0 +1,2 @@ +Main changes in this version: theme and style update and new features for spaces (bugfix for 1.1.10) +Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.1.11 \ No newline at end of file