From 077b74a0aa1615fbcb2ef81d8157d7d8d1ace256 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Thu, 21 Sep 2017 14:03:24 -0400
Subject: [PATCH] Fix handling of edge cases around groups.

// FREEBIE
---
 SignalServiceKit/src/Messages/OWSMessageManager.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index eae549d34..0d96a0fb7 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -300,8 +300,10 @@ NS_ASSUME_NONNULL_BEGIN
                 failure:^(NSError *error) {
                     DDLogError(@"%@ Failed to send Request Group Info message with error: %@", self.tag, error);
                 }];
+            return;
         }
     }
+
     if ((dataMessage.flags & OWSSignalServiceProtosDataMessageFlagsEndSession) != 0) {
         [self handleEndSessionMessageWithEnvelope:envelope dataMessage:dataMessage transaction:transaction];
     } else if ((dataMessage.flags & OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate) != 0) {
@@ -750,7 +752,6 @@ NS_ASSUME_NONNULL_BEGIN
                                                             image:nil
                                                           groupId:dataMessage.group.id];
         TSGroupThread *gThread = [TSGroupThread getOrCreateThreadWithGroupModel:model transaction:transaction];
-        [gThread saveWithTransaction:transaction];
 
         switch (dataMessage.group.type) {
             case OWSSignalServiceProtosGroupContextTypeUpdate: {