Merge tag 'v1.1.11' into sc

Change-Id: I15d6e584f1594764f956c129003b2a459b5d24a6

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)
 =======================================
 

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

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)

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
 
 ext.scVersion = 35
 

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,