Merge branch 'mkirk/fix-debug-sync'

Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m

@@ -195,8 +195,6 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1;
 {
     OWSAssertIsOnMainThread();
 
-    DDLogVerbose(@"%@ %s", self.logTag, __PRETTY_FUNCTION__);
-
     // External database modifications can't be converted into incremental updates,
     // so rebuild everything.  This is expensive and usually isn't necessary, but
     // there's no alternative.

SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m

@@ -8,6 +8,7 @@
 #import "OWSSignalServiceProtos.pb.h"
 #import "TSAttachment.h"
 #import "TSAttachmentStream.h"
+#import "TSContactThread.h"
 #import "TSGroupModel.h"
 #import "TSGroupThread.h"
 
@@ -58,7 +59,10 @@ NS_ASSUME_NONNULL_BEGIN
         enumerateCollectionObjectsWithTransaction:transaction
                                        usingBlock:^(id obj, BOOL *stop) {
                                            if (![obj isKindOfClass:[TSGroupThread class]]) {
-                                               DDLogVerbose(@"Ignoring non group thread in thread collection: %@", obj);
+                                               if (![obj isKindOfClass:[TSContactThread class]]) {
+                                                   DDLogWarn(
+                                                       @"Ignoring non group thread in thread collection: %@", obj);
+                                               }
                                                return;
                                            }
                                            TSGroupThread *groupThread = (TSGroupThread *)obj;

SignalServiceKit/src/Messages/OWSMessageSender.m

@@ -494,7 +494,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
                      failure:(RetryableFailureHandler)failureHandler
 {
     dispatch_async([OWSDispatch sendingQueue], ^{
-        TSThread *thread = message.thread;
+        TSThread *_Nullable thread = message.thread;
 
         // TODO: It would be nice to combine the "contact" and "group" send logic here.
         if ([thread isKindOfClass:[TSContactThread class]] &&
@@ -1121,6 +1121,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
         case 404: {
             DDLogWarn(@"%@ Unregistered recipient: %@", self.logTag, recipient.uniqueId);
 
+            OWSAssert(thread);
             [self unregisteredRecipient:recipient message:message thread:thread];
             NSError *error = OWSErrorMakeNoSuchSignalRecipientError();
             // No need to retry if the recipient is not registered.