From 1ab08424038eb8a73786e306e194089d8476af3c Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 7 Aug 2018 13:03:33 -0400
Subject: [PATCH] Remove Obj-c proto parser.

---
 .../src/Messages/OWSMessageManager.m          | 39 +++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index 555eb4af1..75f8c6b0e 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -682,31 +682,22 @@ NS_ASSUME_NONNULL_BEGIN
                     }];
             });
         } else if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeGroups) {
-            // We respond asynchronously.
-            //
-            // In rare cases this means we won't respond to the sync request, but that's
-            // acceptable.
-            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                OWSSyncGroupsMessage *syncGroupsMessage = [[OWSSyncGroupsMessage alloc] init];
-                __block NSData *_Nullable syncData;
-                [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
-                    syncData = [syncGroupsMessage buildPlainTextAttachmentDataWithTransaction:transaction];
-                }];
-                if (!syncData) {
-                    OWSFail(@"%@ Failed to serialize groups sync message.", self.logTag);
-                    return;
+            OWSSyncGroupsMessage *syncGroupsMessage = [[OWSSyncGroupsMessage alloc] init];
+            NSData *_Nullable syncData = [syncGroupsMessage buildPlainTextAttachmentDataWithTransaction:transaction];
+            if (!syncData) {
+                OWSFail(@"%@ Failed to serialize groups sync message.", self.logTag);
+                return;
+            }
+            DataSource *dataSource = [DataSourceValue dataSourceWithSyncMessageData:syncData];
+            [self.messageSender enqueueTemporaryAttachment:dataSource
+                contentType:OWSMimeTypeApplicationOctetStream
+                inMessage:syncGroupsMessage
+                success:^{
+                    DDLogInfo(@"%@ Successfully sent Groups response syncMessage.", self.logTag);
                 }
-                DataSource *dataSource = [DataSourceValue dataSourceWithSyncMessageData:syncData];
-                [self.messageSender enqueueTemporaryAttachment:dataSource
-                    contentType:OWSMimeTypeApplicationOctetStream
-                    inMessage:syncGroupsMessage
-                    success:^{
-                        DDLogInfo(@"%@ Successfully sent Groups response syncMessage.", self.logTag);
-                    }
-                    failure:^(NSError *error) {
-                        DDLogError(@"%@ Failed to send Groups response syncMessage with error: %@", self.logTag, error);
-                    }];
-            });
+                failure:^(NSError *error) {
+                    DDLogError(@"%@ Failed to send Groups response syncMessage with error: %@", self.logTag, error);
+                }];
         } else if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeBlocked) {
             DDLogInfo(@"%@ Received request for block list", self.logTag);
             [_blockingManager syncBlockedPhoneNumbers];