Merge branch 'mkirk/dev-fixups' into private-master

Signal/src/ViewControllers/DebugUI/DebugUIContacts.h

@@ -1,20 +1,16 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class OWSTableSection;
 @class CNContact;
+@class OWSTableSection;
 
 @interface DebugUIContacts : DebugUIPage
 
-+ (void)createRandomContacts:(NSUInteger)count
-              contactHandler:
-                  (nullable void (^)(CNContact *_Nonnull contact, NSUInteger idx, BOOL *_Nonnull stop))contactHandler;
-
 @end
 
 NS_ASSUME_NONNULL_END

Signal/src/ViewControllers/DebugUI/DebugUIMessages.m

@@ -3,6 +3,7 @@
 //
 
 #import "DebugUIMessages.h"
+#import "DebugContactsUtils.h"
 #import "DebugUIContacts.h"
 #import "DebugUIMessagesAction.h"
 #import "DebugUIMessagesAssetLoader.h"
@@ -3640,7 +3641,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
 
 + (void)createFakeThreads:(NSUInteger)threadCount withFakeMessages:(NSUInteger)messageCount
 {
-    [DebugUIContacts
+    [DebugContactsUtils
         createRandomContacts:threadCount
               contactHandler:^(CNContact *_Nonnull contact, NSUInteger idx, BOOL *_Nonnull stop) {
                   NSString *phoneNumberText = contact.phoneNumbers.firstObject.value.stringValue;