From f230717b688b5720a693b369f4f85846995f6c84 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 3 Apr 2018 14:59:27 -0400
Subject: [PATCH 1/2] Modify attachment emojis.

---
 SignalServiceKit/src/Messages/Attachments/TSAttachment.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachment.m b/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
index c44c4990b..70b153a4c 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
@@ -181,9 +181,9 @@ NSUInteger const TSAttachmentSchemaVersion = 4;
     if ([MIMETypeUtil isImage:contentType]) {
         return @"📷";
     } else if ([MIMETypeUtil isVideo:contentType]) {
-        return @"📽";
+        return @"🎥";
     } else if ([MIMETypeUtil isAudio:contentType]) {
-        return @"📻";
+        return @"🎧";
     } else if ([MIMETypeUtil isAnimated:contentType]) {
         return @"🎡";
     } else {

From 2b3b08d7c5750fe994256da1fb021f021a14007e Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 5 Apr 2018 10:23:56 -0400
Subject: [PATCH 2/2] Respond to CR.

---
 SignalServiceKit/src/Messages/Attachments/TSAttachment.m | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachment.m b/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
index 70b153a4c..1d4e0957d 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
@@ -183,7 +183,11 @@ NSUInteger const TSAttachmentSchemaVersion = 4;
     } else if ([MIMETypeUtil isVideo:contentType]) {
         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 {