Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens

Riot/Modules/MatrixKit/Models/MXKAppSettings.m

@@ -145,7 +145,9 @@ static NSString *const kMXAppGroupID = @"group.org.matrix";
             kMXEventTypeStringCallNegotiate,
             kMXEventTypeStringSticker,
             kMXEventTypeStringKeyVerificationCancel,
-            kMXEventTypeStringKeyVerificationDone
+            kMXEventTypeStringKeyVerificationDone,
+            kMXEventTypeStringPollStart,
+            kMXEventTypeStringPollStartMSC3381
         ].mutableCopy;
         
 
@@ -175,7 +177,9 @@ static NSString *const kMXAppGroupID = @"group.org.matrix";
             kMXEventTypeStringCallNegotiate,
             kMXEventTypeStringSticker,
             kMXEventTypeStringKeyVerificationCancel,
-            kMXEventTypeStringKeyVerificationDone
+            kMXEventTypeStringKeyVerificationDone,
+            kMXEventTypeStringPollStart,
+            kMXEventTypeStringPollStartMSC3381
         ].mutableCopy;
         
         lastMessageEventTypesAllowList = @[
@@ -186,7 +190,9 @@ static NSString *const kMXAppGroupID = @"group.org.matrix";
             kMXEventTypeStringCallInvite,
             kMXEventTypeStringCallAnswer,
             kMXEventTypeStringCallHangup,
-            kMXEventTypeStringSticker
+            kMXEventTypeStringSticker,
+            kMXEventTypeStringPollStart,
+            kMXEventTypeStringPollStartMSC3381
         ].mutableCopy;
         
         _messageDetailsAllowSharing = YES;

Riot/Modules/MatrixKit/Models/Room/MXKAttachment.h

@@ -33,7 +33,6 @@ typedef enum : NSUInteger {
     MXKAttachmentTypeAudio,
     MXKAttachmentTypeVoiceMessage,
     MXKAttachmentTypeVideo,
-    MXKAttachmentTypeLocation,
     MXKAttachmentTypeFile,
     MXKAttachmentTypeSticker
     

Riot/Modules/MatrixKit/Models/Room/MXKAttachment.m

@@ -91,7 +91,7 @@ NSString *const kMXKAttachmentFileNameBase = @"attatchment";
         else
         {
             // Note: mxEvent.eventType is supposed to be MXEventTypeRoomMessage here.
-            NSString *msgtype = eventContent[@"msgtype"];
+            NSString *msgtype = eventContent[kMXMessageTypeKey];
             if ([msgtype isEqualToString:kMXMessageTypeImage])
             {
                 _type = MXKAttachmentTypeImage;
@@ -109,12 +109,6 @@ NSString *const kMXKAttachmentFileNameBase = @"attatchment";
                 _type = MXKAttachmentTypeVideo;
                 MXJSONModelSetDictionary(_thumbnailInfo, eventContent[@"info"][@"thumbnail_info"]);
             }
-            else if ([msgtype isEqualToString:kMXMessageTypeLocation])
-            {
-                // Not supported yet
-                // _type = MXKAttachmentTypeLocation;
-                return nil;
-            }
             else if ([msgtype isEqualToString:kMXMessageTypeFile])
             {
                 _type = MXKAttachmentTypeFile;
@@ -125,7 +119,7 @@ NSString *const kMXKAttachmentFileNameBase = @"attatchment";
             }
         }
         
-        MXJSONModelSetString(_originalFileName, eventContent[@"body"]);
+        MXJSONModelSetString(_originalFileName, eventContent[kMXMessageBodyKey]);
         MXJSONModelSetDictionary(_contentInfo, eventContent[@"info"]);
         MXJSONModelSetMXJSONModel(contentFile, MXEncryptedContentFile, eventContent[@"file"]);
         

Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataWithAppendingMode.m

@@ -102,7 +102,7 @@ static NSAttributedString *messageSeparator = nil;
                     return NO;
                 }
             }
-        
+            
             // Add all components of the provided message
             for (MXKRoomBubbleComponent* component in cellData.bubbleComponents)
             {

Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleComponent.m

@@ -115,7 +115,7 @@
         return;
     }
     
-    NSString *messageType = self.event.content[@"msgtype"];
+    NSString *messageType = self.event.content[kMXMessageTypeKey];
     
     if (!messageType || !([messageType isEqualToString:kMXMessageTypeText] || [messageType isEqualToString:kMXMessageTypeNotice] || [messageType isEqualToString:kMXMessageTypeEmote]))
     {

Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.h

@@ -591,6 +591,25 @@ extern NSString *const kMXKRoomDataSourceTimelineErrorErrorKey;
                        success:(void (^)(NSString *eventId))success
                        failure:(void (^)(NSError *error))failure;
 
+/**
+ Send a location message to a room.
+ 
+ While sending, a fake event will be echoed in the messages list.
+ Once complete, this local echo will be replaced by the event saved by the homeserver.
+ 
+ @param latitude the location's latitude
+ @param longitude the location's longitude
+ @param description an optional description
+ @param success A block object called when the operation succeeds. It returns
+                the event id of the event generated on the homeserver
+ @param failure A block object called when the operation fails.
+ */
+- (void)sendLocationWithLatitude:(double)latitude
+                       longitude:(double)longitude
+                     description:(NSString *)description
+                         success:(void (^)(NSString *))success
+                         failure:(void (^)(NSError *))failure;
+
 /**
  Send a generic non state event to a room.
 

Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m

@@ -1914,6 +1914,29 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
     }
 }
 
+- (void)sendLocationWithLatitude:(double)latitude
+                       longitude:(double)longitude
+                     description:(NSString *)description
+                         success:(void (^)(NSString *))success
+                         failure:(void (^)(NSError *))failure
+{
+    __block MXEvent *localEchoEvent = nil;
+    
+    // Make the request to the homeserver
+    [_room sendLocationWithLatitude:latitude
+                          longitude:longitude
+                        description:description
+                          localEcho:&localEchoEvent
+                            success:success failure:failure];
+    
+    if (localEchoEvent)
+    {
+        // Make the data source digest this fake local echo message
+        [self queueEventForProcessing:localEchoEvent withRoomState:self.roomState direction:MXTimelineDirectionForwards];
+        [self processQueuedEvents:nil];
+    }
+}
+
 - (void)sendEventOfType:(MXEventTypeString)eventTypeString content:(NSDictionary<NSString*, id>*)msgContent success:(void (^)(NSString *eventId))success failure:(void (^)(NSError *error))failure
 {
     __block MXEvent *localEchoEvent = nil;
@@ -1951,7 +1974,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
     else if ([event.type isEqualToString:kMXEventTypeStringRoomMessage])
     {
         // And retry the send the message according to its type
-        NSString *msgType = event.content[@"msgtype"];
+        NSString *msgType = event.content[kMXMessageTypeKey];
         if ([msgType isEqualToString:kMXMessageTypeText] || [msgType isEqualToString:kMXMessageTypeEmote])
         {
             // Resend the Matrix event by reusing the existing echo
@@ -2697,11 +2720,27 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
 - (BOOL)canPerformActionOnEvent:(MXEvent*)event
 {
     BOOL isSent = event.sentState == MXEventSentStateSent;
-    BOOL isRoomMessage = event.eventType == MXEventTypeRoomMessage;
     
-    NSString *messageType = event.content[@"msgtype"];
+    if (!isSent) {
+        return NO;
+    }
     
-    return isSent && isRoomMessage && messageType && ![messageType isEqualToString:@"m.bad.encrypted"];
+    if (event.eventType == MXEventTypePollStart) {
+        return YES;
+    }
+    
+    BOOL isRoomMessage = (event.eventType == MXEventTypeRoomMessage);
+    
+    if (!isRoomMessage) {
+        return NO;
+    }
+    
+    NSString *messageType = event.content[kMXMessageTypeKey];
+    if (messageType == nil || [messageType isEqualToString:@"m.bad.encrypted"]) {
+        return NO;
+    }
+    
+    return YES;
 }
 
 - (void)setState:(MXKDataSourceState)newState
@@ -3912,7 +3951,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
     
     if ([self canPerformActionOnEvent:event])
     {
-        NSString *messageType = event.content[@"msgtype"];
+        NSString *messageType = event.content[kMXMessageTypeKey];
         
         if ([messageType isEqualToString:kMXMessageTypeKeyVerificationRequest])
         {
@@ -3955,7 +3994,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
 {
     MXEvent *event = [self eventWithEventId:eventId];
     BOOL isRoomMessage = event.eventType == MXEventTypeRoomMessage;
-    NSString *messageType = event.content[@"msgtype"];
+    NSString *messageType = event.content[kMXMessageTypeKey];
     
     return isRoomMessage
     && ([messageType isEqualToString:kMXMessageTypeText] || [messageType isEqualToString:kMXMessageTypeEmote])
@@ -3976,7 +4015,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
     }
     else
     {
-        editableTextMessage = event.content[@"body"];
+        editableTextMessage = event.content[kMXMessageBodyKey];
     }
     
     return editableTextMessage;
@@ -4093,7 +4132,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
     NSString *sanitizedText = [self sanitizedMessageText:text];
     NSString *formattedText = [self htmlMessageFromSanitizedText:sanitizedText];
     
-    NSString *eventBody = event.content[@"body"];
+    NSString *eventBody = event.content[kMXMessageBodyKey];
     NSString *eventFormattedBody = event.content[@"formatted_body"];
     
     if (![sanitizedText isEqualToString:eventBody] && (!eventFormattedBody || ![formattedText isEqualToString:eventFormattedBody]))

Riot/Modules/MatrixKit/Models/Room/MXKSendReplyEventStringLocalizer.m

@@ -45,6 +45,11 @@
     return [MatrixKitL10n messageReplyToSenderSentAFile];
 }
 
+- (NSString *)senderSentTheirLocation
+{
+    return [MatrixKitL10n messageReplyToSenderSentTheirLocation];
+}
+
 - (NSString *)messageToReplyToPrefix
 {
     return [MatrixKitL10n messageReplyToMessageToReplyToPrefix];

Riot/Modules/MatrixKit/Models/Search/MXKSearchCellData.m

@@ -56,7 +56,7 @@
         date = [searchDataSource.eventFormatter dateStringFromEvent:searchResult.result withTime:YES];
 
         // Code from [MXEventFormatter stringFromEvent] for the particular case of a text message
-        message = [searchResult.result.content[@"body"] isKindOfClass:[NSString class]] ? searchResult.result.content[@"body"] : nil;
+        message = [searchResult.result.content[kMXMessageBodyKey] isKindOfClass:[NSString class]] ? searchResult.result.content[kMXMessageBodyKey] : nil;
     }
     return self;
 }