Render sticker events in the timeline

- Add the new event type: `m.sticker` element-hq/element-ios#1819
matrix-org · Mar 29, 2018 · 672a370 · 672a370
1 parent caf09a3
commit 672a370
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/MatrixSDK/JSONModels/MXEvent.h b/MatrixSDK/JSONModels/MXEvent.h
@@ -63,6 +63,7 @@ typedef enum : NSUInteger
     MXEventTypeCallCandidates,
     MXEventTypeCallAnswer,
     MXEventTypeCallHangup,
+    MXEventTypeSticker,
 
     // The event is a custom event. Refer to its `MXEventTypeString` version
     MXEventTypeCustom = 1000
@@ -106,6 +107,7 @@ FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallInvite;
 FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallCandidates;
 FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallAnswer;
 FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallHangup;
+FOUNDATION_EXPORT NSString *const kMXEventTypeStringSticker;
 
 /**
  Types of room messages
@@ -359,7 +361,7 @@ extern NSString *const kMXEventIdentifierKey;
 - (BOOL)isUserProfileChange;
 
 /**
- Return YES if the event contains a media: image, audio, video or file.
+ Return YES if the event contains a media: image, audio, video, file or sticker.
  */
 - (BOOL)isMediaAttachment;
 

diff --git a/MatrixSDK/JSONModels/MXEvent.m b/MatrixSDK/JSONModels/MXEvent.m
@@ -54,6 +54,7 @@
 NSString *const kMXEventTypeStringCallCandidates        = @"m.call.candidates";
 NSString *const kMXEventTypeStringCallAnswer            = @"m.call.answer";
 NSString *const kMXEventTypeStringCallHangup            = @"m.call.hangup";
+NSString *const kMXEventTypeStringSticker               = @"m.sticker";
 
 NSString *const kMXMessageTypeText      = @"m.text";
 NSString *const kMXMessageTypeEmote     = @"m.emote";
@@ -350,6 +351,10 @@ - (BOOL)isMediaAttachment
             return YES;
         }
     }
+    else if (self.eventType == MXEventTypeSticker)
+    {
+        return YES;
+    }
     return NO;
 }
 

diff --git a/MatrixSDK/MXSession.h b/MatrixSDK/MXSession.h
@@ -536,7 +536,7 @@ typedef void (^MXOnBackgroundSyncFail)(NSError *error);
 
 /**
  The list of event types considered for counting unread messages returned by MXRoom.localUnreadEventCount.
- By default [m.room.name, m.room.topic, m.room.message, m.call.invite, m.room.encrypted].
+ By default [m.room.name, m.room.topic, m.room.message, m.call.invite, m.room.encrypted, m.sticker].
  */
 @property (nonatomic) NSArray<MXEventTypeString> *unreadEventTypes;
 

diff --git a/MatrixSDK/MXSession.m b/MatrixSDK/MXSession.m
@@ -229,14 +229,16 @@ - (id)initWithMatrixRestClient:(MXRestClient*)mxRestClient
                                       kMXEventTypeStringCallInvite,
                                       kMXEventTypeStringCallCandidates,
                                       kMXEventTypeStringCallAnswer,
-                                      kMXEventTypeStringCallHangup
+                                      kMXEventTypeStringCallHangup,
+                                      kMXEventTypeStringSticker
                                       ];
 
         _unreadEventTypes = @[kMXEventTypeStringRoomName,
                               kMXEventTypeStringRoomTopic,
                               kMXEventTypeStringRoomMessage,
                               kMXEventTypeStringCallInvite,
-                              kMXEventTypeStringRoomEncrypted
+                              kMXEventTypeStringRoomEncrypted,
+                              kMXEventTypeStringSticker
                               ];
 
         _catchingUp = NO;

diff --git a/MatrixSDK/Utils/MXTools.m b/MatrixSDK/Utils/MXTools.m
@@ -90,6 +90,7 @@ + (void)initialize
                                 kMXEventTypeStringCallCandidates,
                                 kMXEventTypeStringCallAnswer,
                                 kMXEventTypeStringCallHangup,
+                                kMXEventTypeStringSticker
                                 ];
 
         NSMutableDictionary *map = [NSMutableDictionary dictionaryWithCapacity:eventTypeMapEnumToString.count];