Merge pull request #7590 from vector-im/aringenbach/7570_fix_reconciliate_after_multiple_newlines

Fix RTE sometimes inserting characters in wrong locations after multiple new lines

Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-wysiwyg-composer-swift",
       "state" : {
-        "revision" : "ff5e8054da60212051cb0dec244500ca0f441bac",
-        "version" : "2.1.0"
+        "revision" : "1100b217c04d096dfe072afb4484660ff794d805",
+        "version" : "2.2.2"
       }
     },
     {

Riot/Modules/Room/RoomViewController.m

@@ -5172,7 +5172,7 @@ static CGSize kThreadListBarButtonItemImageSize;
 
 - (MXMediaManager *)mediaManager
 {
-    return self.roomDataSource.mxSession.mediaManager;
+    return self.mainSession.mediaManager;
 }
 
 - (void)roomInputToolbarViewDidOpenActionMenu:(RoomInputToolbarView*)toolbarView

changelog.d/7570.bugfix

@@ -0,0 +1 @@
+Labs: Fix RTE sometimes inserting characters in wrong locations after multiple new lines

changelog.d/7577.bugfix

@@ -0,0 +1 @@
+Labs: RTE: Fix a crash when creating a new direct chat

project.yml

@@ -57,7 +57,7 @@ packages:
     branch: 0.0.1
   WysiwygComposer:
     url: https://github.com/matrix-org/matrix-wysiwyg-composer-swift
-    version: 2.1.0
+    version: 2.2.2
   DeviceKit:
     url: https://github.com/devicekit/DeviceKit
     majorVersion: 4.7.0