Merge pull request #678 from matrix-org/riot_2526

Crypto: Device Verification: Name for 🔒 is "Lock"
matrix-org · Jun 24, 2019 · c09ac9f · c09ac9f
2 parents 3f73930 + fd89c8a
commit c09ac9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -12,6 +12,7 @@ Improvements:
 
 Bug Fix:
  * MXMediaLoader: Disable trusting the built-in anchors certificates when the certificate pinning is enabled.
+ * Crypto: Device Verification: Name for 🔒 is "Lock" (vector-im/riot-ios/issues/2526).
 
 API break:
  * MXEvent: unsignedData is now of type MXEventUnsignedData.

diff --git a/MatrixSDK/Crypto/Verification/Transactions/SAS/MXSASTransaction.m b/MatrixSDK/Crypto/Verification/Transactions/SAS/MXSASTransaction.m
@@ -393,7 +393,7 @@ + (void)initializeSasEmojis
                    [[MXEmojiRepresentation alloc] initWithEmoji:@"✏️" andName:@"pencil"],     // 43
                    [[MXEmojiRepresentation alloc] initWithEmoji:@"📎" andName:@"paperclip"],  // 44
                    [[MXEmojiRepresentation alloc] initWithEmoji:@"✂️" andName:@"scissors"],   // 45
-                   [[MXEmojiRepresentation alloc] initWithEmoji:@"🔒" andName:@"padlock"],    // 46
+                   [[MXEmojiRepresentation alloc] initWithEmoji:@"🔒" andName:@"lock"],       // 46
                    [[MXEmojiRepresentation alloc] initWithEmoji:@"🔑" andName:@"key"],        // 47
                    [[MXEmojiRepresentation alloc] initWithEmoji:@"🔨" andName:@"hammer"],     // 48
                    [[MXEmojiRepresentation alloc] initWithEmoji:@"☎️" andName:@"telephone"],  // 49