Clean up ahead of PR.
This commit is contained in:
parent
fe9a61117c
commit
21ab670fc9
|
@ -373,6 +373,10 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
|
|||
|
||||
- (void)showNewConversationView
|
||||
{
|
||||
OWSAssertIsOnMainThread();
|
||||
|
||||
DDLogInfo(@"%@ %s", self.logTag, __PRETTY_FUNCTION__);
|
||||
|
||||
NewContactThreadViewController *viewController = [NewContactThreadViewController new];
|
||||
|
||||
[self.contactsManager requestSystemContactsOnceWithCompletion:^(NSError *_Nullable error) {
|
||||
|
@ -1050,11 +1054,9 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
|
|||
if (![[self.uiDatabaseConnection ext:TSThreadDatabaseViewExtensionName] hasChangesForGroup:self.currentGrouping
|
||||
inNotifications:notifications]) {
|
||||
[self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
|
||||
[self.self.threadMappings updateWithTransaction:transaction];
|
||||
[self.threadMappings updateWithTransaction:transaction];
|
||||
}];
|
||||
[self checkIfEmptyView];
|
||||
self.threadMappings = [[YapDatabaseViewMappings alloc] initWithGroups:@[ self.currentGrouping ]
|
||||
view:TSThreadDatabaseViewExtensionName];
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
//
|
||||
|
||||
#import "ShowGroupMembersViewController.h"
|
||||
#import "HomeViewController.h"
|
||||
#import "Signal-Swift.h"
|
||||
#import "SignalApp.h"
|
||||
#import "ViewControllerUtils.h"
|
||||
|
|
|
@ -211,9 +211,12 @@
|
|||
keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing
|
||||
callOnViewAppearing:(BOOL)callOnViewAppearing
|
||||
{
|
||||
OWSAssertIsOnMainThread();
|
||||
// At most one.
|
||||
OWSAssert(!keyboardOnViewAppearing || !callOnViewAppearing);
|
||||
|
||||
DDLogInfo(@"%@ %s", self.logTag, __PRETTY_FUNCTION__);
|
||||
|
||||
if (!thread) {
|
||||
OWSFail(@"%@ Can't present nil thread.", self.logTag);
|
||||
return;
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
//
|
||||
|
||||
#import "ViewControllerUtils.h"
|
||||
#import "HomeViewController.h"
|
||||
#import "NSString+OWS.h"
|
||||
#import "PhoneNumber.h"
|
||||
#import <AVFoundation/AVFoundation.h>
|
||||
|
|
Loading…
Reference in New Issue