diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 8b0079e03..04b0838bc 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2821,7 +2821,7 @@ typedef enum : NSUInteger { [self clearUnreadMessagesIndicator]; self.inputToolbar.quotedReply = nil; - if (!Environment.preferences.getHasSentAMessage) { + if (!Environment.preferences.hasSentAMessage) { [Environment.preferences setHasSentAMessage:YES]; } if ([Environment.preferences soundInForeground]) { diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 79448803d..07dfa26f7 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -941,7 +941,6 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations @"Pressing this button moves a thread from the inbox to the archive") handler:^(UITableViewRowAction *_Nonnull action, NSIndexPath *_Nonnull tappedIndexPath) { [self archiveIndexPath:tappedIndexPath]; - [Environment.preferences setHasArchivedAMessage:YES]; }]; } else { @@ -1503,7 +1502,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations NSString *secondLine = @""; if (self.homeViewMode == HomeViewMode_Inbox) { - if ([Environment.preferences getHasSentAMessage]) { + if ([Environment.preferences hasSentAMessage]) { firstLine = NSLocalizedString( @"EMPTY_INBOX_TITLE", @"Header text an existing user sees when viewing an empty inbox"); secondLine = NSLocalizedString( @@ -1545,7 +1544,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations // If the user hasn't sent a message, we don't want to ask them for a review yet. - (void)requestReviewIfAppropriate { - if (self.hasEverAppeared && Environment.preferences.getHasSentAMessage) { + if (self.hasEverAppeared && Environment.preferences.hasSentAMessage) { DDLogDebug(@"%@ in %s requesting review", self.logTag, __PRETTY_FUNCTION__); if (@available(iOS 10, *)) { // In Debug this pops up *every* time, which is helpful, but annoying. diff --git a/SignalMessaging/utils/OWSPreferences.h b/SignalMessaging/utils/OWSPreferences.h index 15c653f38..e11f8cff4 100644 --- a/SignalMessaging/utils/OWSPreferences.h +++ b/SignalMessaging/utils/OWSPreferences.h @@ -33,12 +33,9 @@ extern NSString *const OWSPreferencesCallLoggingDidChangeNotification; + (BOOL)isReadyForAppExtensions; + (void)setIsReadyForAppExtensions; -- (BOOL)getHasSentAMessage; +- (BOOL)hasSentAMessage; - (void)setHasSentAMessage:(BOOL)enabled; -- (BOOL)getHasArchivedAMessage; -- (void)setHasArchivedAMessage:(BOOL)enabled; - + (BOOL)isLoggingEnabled; + (void)setIsLoggingEnabled:(BOOL)flag; diff --git a/SignalMessaging/utils/OWSPreferences.m b/SignalMessaging/utils/OWSPreferences.m index 9484812df..3c9637fd1 100644 --- a/SignalMessaging/utils/OWSPreferences.m +++ b/SignalMessaging/utils/OWSPreferences.m @@ -19,7 +19,6 @@ NSString *const OWSPreferencesKeyScreenSecurity = @"Screen Security Key"; NSString *const OWSPreferencesKeyEnableDebugLog = @"Debugging Log Enabled Key"; NSString *const OWSPreferencesKeyNotificationPreviewType = @"Notification Preview Type Key"; NSString *const OWSPreferencesKeyHasSentAMessage = @"User has sent a message"; -NSString *const OWSPreferencesKeyHasArchivedAMessage = @"User archived a message"; NSString *const OWSPreferencesKeyPlaySoundInForeground = @"NotificationSoundInForeground"; NSString *const OWSPreferencesKeyLastRecordedPushToken = @"LastRecordedPushToken"; NSString *const OWSPreferencesKeyLastRecordedVoipToken = @"LastRecordedVoipToken"; @@ -118,7 +117,7 @@ NSString *const OWSPreferencesKeySystemCallLogEnabled = @"OWSPreferencesKeySyste [self setValueForKey:OWSPreferencesKeyScreenSecurity toValue:@(flag)]; } -- (BOOL)getHasSentAMessage +- (BOOL)hasSentAMessage { NSNumber *preference = [self tryGetValueForKey:OWSPreferencesKeyHasSentAMessage]; if (preference) { @@ -128,16 +127,6 @@ NSString *const OWSPreferencesKeySystemCallLogEnabled = @"OWSPreferencesKeySyste } } -- (BOOL)getHasArchivedAMessage -{ - NSNumber *preference = [self tryGetValueForKey:OWSPreferencesKeyHasArchivedAMessage]; - if (preference) { - return [preference boolValue]; - } else { - return NO; - } -} - + (BOOL)isLoggingEnabled { NSNumber *preference = [NSUserDefaults.appUserDefaults objectForKey:OWSPreferencesKeyEnableDebugLog]; @@ -165,11 +154,6 @@ NSString *const OWSPreferencesKeySystemCallLogEnabled = @"OWSPreferencesKeySyste [self setValueForKey:OWSPreferencesKeyHasSentAMessage toValue:@(enabled)]; } -- (void)setHasArchivedAMessage:(BOOL)enabled -{ - [self setValueForKey:OWSPreferencesKeyHasArchivedAMessage toValue:@(enabled)]; -} - - (BOOL)hasDeclinedNoContactsView { NSNumber *preference = [self tryGetValueForKey:OWSPreferencesKeyHasDeclinedNoContactsView];