From 92e8b117f5af81d95cd0c0957b6be9aabf4f3133 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 3 Oct 2018 16:26:50 -0600 Subject: [PATCH] fixup debug contacts --- Signal/src/ViewControllers/DebugUI/DebugUIContacts.h | 8 ++------ Signal/src/ViewControllers/DebugUI/DebugUIMessages.m | 3 ++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.h b/Signal/src/ViewControllers/DebugUI/DebugUIContacts.h index f228bb093..1a2866816 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.h +++ b/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 diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m index d269fd043..9c5f1e91d 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m +++ b/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;