merged element 1.10.12 into bum

Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarView.h

@@ -102,6 +102,14 @@ typedef enum : NSUInteger
  */
 - (void)roomInputToolbarView:(MXKRoomInputToolbarView *)toolbarView sendFormattedTextMessage:(NSString *)formattedTextMessage withRawText:(NSString *)rawText;
 
+/**
+ Tells the delegate that the user wants to send a command.
+
+ @param toolbarView the room input toolbar view.
+ @param commandText the command to send.
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView *)toolbarView sendCommand:(NSString *)commandText;
+
 /**
  Tells the delegate that the user wants to display the send media actions.
 
@@ -205,6 +213,15 @@ typedef enum : NSUInteger
  */
 - (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView updateActivityIndicator:(BOOL)isAnimating;
 
+/**
+ Tells the delegate that the partial content of the composer has changed
+ and should be stored to allow restoring it later if needed.
+
+ @param toolbarView the room input toolbar view
+ @param partialAttributedTextMessage the partial content to store
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView shouldStorePartialContent:(NSAttributedString*)partialAttributedTextMessage;
+
 @end
 
 /**
@@ -382,6 +399,11 @@ typedef enum : NSUInteger
  */
 @property (nonatomic) NSAttributedString *attributedTextMessage;
 
+/**
+ Sets the partial text message to apply to the current message composer.
+ */
+- (void)setPartialContent:(NSAttributedString *)attributedTextMessage;
+
 /**
  Default font for the message composer.
  */

Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarView.m

@@ -1405,4 +1405,9 @@ NSString* MXKFileSizes_description(MXKFileSizes sizes)
     return NO;
 }
 
+- (void)setPartialContent:(NSAttributedString *)attributedTextMessage
+{
+    self.attributedTextMessage = attributedTextMessage;
+}
+
 @end