Merge branch 'charlesmchen/attachmentEmojis'

7 years ago · dd36c945e4
parent 2df54a5775 2b3b08d7c5
commit dd36c945e4
1 changed files with 6 additions and 2 deletions
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
@ -181,9 +181,13 @@ NSUInteger const TSAttachmentSchemaVersion = 4;
    if ([MIMETypeUtil isImage:contentType]) {
        return @"📷";
    } else if ([MIMETypeUtil isVideo:contentType]) {
-        return @"📽";
+        return @"🎥";
    } else if ([MIMETypeUtil isAudio:contentType]) {
-        return @"📻";
+        if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(11, 0)) {
+            return @"🎧";
+        } else {
+            return @"📻";
+        }
    } else if ([MIMETypeUtil isAnimated:contentType]) {
        return @"🎡";
    } else {