From 61100ba2ede345c7c8025f9c874c2b3a5892191f Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Fri, 16 Sep 2022 19:46:11 +0100
Subject: [PATCH] Only disable the composer if the room is yet to be created.

---
 Riot/Generated/Strings.swift           | 2 +-
 Riot/Modules/Room/RoomViewController.m | 8 ++++----
 changelog.d/6708.bugfix                | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 changelog.d/6708.bugfix

diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
index bdad88cd7..94a7f4631 100644
--- a/Riot/Generated/Strings.swift
+++ b/Riot/Generated/Strings.swift
@@ -187,7 +187,7 @@ public class VectorL10n: NSObject {
   public static var allChatsEmptySpaceInformation: String { 
     return VectorL10n.tr("Vector", "all_chats_empty_space_information") 
   }
-  /// This is where you're unread messages will show up, when you have some.
+  /// This is where your unread messages will show up, when you have some.
   public static var allChatsEmptyUnreadsPlaceholderMessage: String { 
     return VectorL10n.tr("Vector", "all_chats_empty_unreads_placeholder_message") 
   }
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 771c3d657..cb0fb1a31 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -1544,10 +1544,6 @@ static CGSize kThreadListBarButtonItemImageSize;
  */
 - (void)createDiscussionIfNeeded:(void (^)(BOOL readyToSend))onComplete
 {
-    // Disable the input tool bar during this operation. This prevents us from creating several discussions, or
-    // trying to send several invites.
-    self.inputToolbarView.userInteractionEnabled = false;
-    
     void(^completion)(BOOL) = ^(BOOL readyToSend) {
         self.inputToolbarView.userInteractionEnabled = true;
         if (onComplete) {
@@ -1557,6 +1553,10 @@ static CGSize kThreadListBarButtonItemImageSize;
     
     if (self.directChatTargetUser)
     {
+        // Disable the input tool bar during this operation. This prevents us from creating several discussions, or
+        // trying to send several invites.
+        self.inputToolbarView.userInteractionEnabled = false;
+        
         [self createDiscussionWithUser:self.directChatTargetUser completion:completion];
     }
     else
diff --git a/changelog.d/6708.bugfix b/changelog.d/6708.bugfix
new file mode 100644
index 000000000..10961f90f
--- /dev/null
+++ b/changelog.d/6708.bugfix
@@ -0,0 +1 @@
+Message Composer: Stop the keyboard jumping after sending a message on certain devices.