From 499c8d0bc1afa32c7be42e7ed5b0d07fa365420d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 18 Apr 2017 12:41:56 -0400 Subject: [PATCH] Add muting of threads. // FREEBIE --- .../OWSConversationSettingsTableViewController.m | 9 ++++----- Signal/translations/en.lproj/Localizable.strings | 3 --- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m index 74ee43982..0f3a86d16 100644 --- a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m +++ b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m @@ -712,12 +712,11 @@ static NSString *const OWSConversationSettingsTableViewControllerSegueShowGroupM - (void)showMuteUnmuteActionSheet { - NSString *title; + // The "unmute" action sheet has no title or message; the + // action label speaks for itself. + NSString *title = nil; NSString *message = nil; - if (self.thread.isMuted) { - title = NSLocalizedString( - @"CONVERSATION_SETTINGS_UNMUTE_ACTION_SHEET_TITLE", @"Title of the 'unmute this thread' action sheet."); - } else { + if (!self.thread.isMuted) { title = NSLocalizedString( @"CONVERSATION_SETTINGS_MUTE_ACTION_SHEET_TITLE", @"Title of the 'mute this thread' action sheet."); message = NSLocalizedString( diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 49d1d1308..d5b4e9461 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -265,9 +265,6 @@ /* Label for button to unmute a thread. */ "CONVERSATION_SETTINGS_UNMUTE_ACTION" = "Unmute"; -/* Title of the 'unmute this thread' action sheet. */ -"CONVERSATION_SETTINGS_UNMUTE_ACTION_SHEET_TITLE" = "Unmute"; - /* ActionSheet title */ "CORRUPTED_SESSION_DESCRIPTION" = "Resetting your session will allow you to receive future messages from %@, but it will not recover any already corrupted messages.";