From 14b6294d6f44796b3b33a1e238dc16c4d79475c1 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 18 May 2017 10:04:13 -0400 Subject: [PATCH] code cleanup pre CR // FREEBIE --- .../OWSConversationSettingsTableViewController.m | 7 +++++-- Signal/src/contact/SystemContactsFetcher.swift | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m index 3c7543ba7..84ab77034 100644 --- a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m +++ b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m @@ -604,7 +604,9 @@ NS_ASSUME_NONNULL_BEGIN [self showUpdateGroupView:UpdateGroupMode_EditGroupName]; } } else { - [self presentContactViewController]; + if (self.contactsManager.supportsContactEditing) { + [self presentContactViewController]; + } } } } @@ -678,7 +680,8 @@ NS_ASSUME_NONNULL_BEGIN - (void)presentContactViewController { if (!self.contactsManager.supportsContactEditing) { - DDLogWarn(@"%@ Contact editing not supported", self.tag); + DDLogError(@"%@ Contact editing not supported", self.tag); + OWSAssert(NO); return; } if (![self.thread isKindOfClass:[TSContactThread class]]) { diff --git a/Signal/src/contact/SystemContactsFetcher.swift b/Signal/src/contact/SystemContactsFetcher.swift index f0357fa96..33ae0601a 100644 --- a/Signal/src/contact/SystemContactsFetcher.swift +++ b/Signal/src/contact/SystemContactsFetcher.swift @@ -175,7 +175,6 @@ class AddressBookContactStoreAdaptee: ContactStoreAdaptee { andImage: addressBookRecord.image, andContactID: addressBookRecord.recordId) } - } /**