Merge pull request #774 from vector-im/vector_723

End-to-end encryption UI/UX
element-hq · Nov 10, 2016 · 00e72f9 · 00e72f9
2 parents 6dc7d71 + 853885e
commit 00e72f9
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/Vector/Views/RoomBubbleList/Encryption/RoomEncryptedDataBubbleCell.m b/Vector/Views/RoomBubbleList/Encryption/RoomEncryptedDataBubbleCell.m
@@ -26,7 +26,17 @@ + (UIImage*)encryptionIconForEvent:(MXEvent*)event andSession:(MXSession*)sessio
 
     if (!event.isEncrypted)
     {
-        encryptionIcon = @"e2e_unencrypted";
+        // Patch: Display the verified icon on outgoing messages in the encrypted rooms (until #773 is fixed)
+        MXRoom *room = [session roomWithRoomId:event.roomId];
+        if (room.state.isEncrypted && session.crypto && [event.sender isEqualToString:session.myUser.userId])
+        {
+            // The outgoing message are encrypted by default
+            encryptionIcon = @"e2e_verified";
+        }
+        else
+        {
+            encryptionIcon = @"e2e_unencrypted";
+        }
     }
     else if (event.decryptionError)
     {