Merge pull request #687 from matrix-org/riot_2448

Reactions: Send them in clear in e2e rooms for the moment

MatrixSDK/Data/MXRoom.m

@@ -545,7 +545,9 @@ - (MXHTTPOperation*)sendEventOfType:(MXEventTypeString)eventTypeString
     };
 
     // Check whether the content must be encrypted before sending
-    if (mxSession.crypto && self.summary.isEncrypted)
+    if (mxSession.crypto
+        && self.summary.isEncrypted
+        && [self isEncryptionRequiredForEventType:eventTypeString])
     {
         // Check whether the provided content is already encrypted
         if ([eventTypeString isEqualToString:kMXEventTypeStringRoomEncrypted])
@@ -3067,6 +3069,25 @@ - (MXHTTPOperation *)enableEncryptionWithAlgorithm:(NSString *)algorithm
     return operation;
 }
 
+/**
+ Check if we need to encrypt event with a given type.
+
+ @param eventType the event type
+ @return YES to event.
+ */
+- (BOOL)isEncryptionRequiredForEventType:(MXEventTypeString)eventType
+{
+    BOOL isEncryptionRequired = YES;
+
+    if ([eventType isEqualToString:kMXEventTypeStringReaction])
+    {
+        // Do not encrypt reaction for the moment
+        isEncryptionRequired = NO;
+    }
+
+    return isEncryptionRequired;
+}
+
 
 #pragma mark - Utils