From 21cffdfb5e5129abbfdfdbe429efb757a7aba283 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 10 Apr 2019 14:32:36 -0600 Subject: [PATCH] always specify default when accessing bool preference --- .../src/Messages/OWSReadReceiptManager.m | 19 +++---------------- .../src/Network/OWSSignalService.m | 6 ++++-- .../src/Storage/YapDatabaseConnection+OWS.h | 3 +-- .../src/Storage/YapDatabaseConnection+OWS.m | 5 ----- .../src/Storage/YapDatabaseTransaction+OWS.h | 1 - .../src/Storage/YapDatabaseTransaction+OWS.m | 8 -------- 6 files changed, 8 insertions(+), 34 deletions(-) diff --git a/SignalServiceKit/src/Messages/OWSReadReceiptManager.m b/SignalServiceKit/src/Messages/OWSReadReceiptManager.m index 8f703ca13..e08fe371f 100644 --- a/SignalServiceKit/src/Messages/OWSReadReceiptManager.m +++ b/SignalServiceKit/src/Messages/OWSReadReceiptManager.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSReadReceiptManager.h" @@ -524,22 +524,9 @@ NSString *const OWSReadReceiptManagerAreReadReceiptsEnabled = @"areReadReceiptsE { // We don't need to worry about races around this cached value. if (!self.areReadReceiptsEnabledCached) { - // Default to NO. self.areReadReceiptsEnabledCached = @([self.dbConnection boolForKey:OWSReadReceiptManagerAreReadReceiptsEnabled - inCollection:OWSReadReceiptManagerCollection]); - } - - return [self.areReadReceiptsEnabledCached boolValue]; -} - -- (BOOL)areReadReceiptsEnabledWithTransaction:(YapDatabaseReadTransaction *)transaction -{ - if (!self.areReadReceiptsEnabledCached) { - [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) { - // Default to NO. - self.areReadReceiptsEnabledCached = [transaction objectForKey:OWSReadReceiptManagerAreReadReceiptsEnabled - inCollection:OWSReadReceiptManagerCollection]; - }]; + inCollection:OWSReadReceiptManagerCollection + defaultValue:NO]); } return [self.areReadReceiptsEnabledCached boolValue]; diff --git a/SignalServiceKit/src/Network/OWSSignalService.m b/SignalServiceKit/src/Network/OWSSignalService.m index 0e4d16e75..4784d21ce 100644 --- a/SignalServiceKit/src/Network/OWSSignalService.m +++ b/SignalServiceKit/src/Network/OWSSignalService.m @@ -104,7 +104,8 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = { return [[OWSPrimaryStorage dbReadConnection] boolForKey:kOWSPrimaryStorage_isCensorshipCircumventionManuallyActivated - inCollection:kOWSPrimaryStorage_OWSSignalService]; + inCollection:kOWSPrimaryStorage_OWSSignalService + defaultValue:NO]; } - (void)setIsCensorshipCircumventionManuallyActivated:(BOOL)value @@ -119,7 +120,8 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = - (BOOL)isCensorshipCircumventionManuallyDisabled { return [[OWSPrimaryStorage dbReadConnection] boolForKey:kOWSPrimaryStorage_isCensorshipCircumventionManuallyDisabled - inCollection:kOWSPrimaryStorage_OWSSignalService]; + inCollection:kOWSPrimaryStorage_OWSSignalService + defaultValue:NO]; } - (void)setIsCensorshipCircumventionManuallyDisabled:(BOOL)value diff --git a/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.h b/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.h index bbbdffabb..1b9e3afab 100644 --- a/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.h +++ b/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import @@ -13,7 +13,6 @@ NS_ASSUME_NONNULL_BEGIN @interface YapDatabaseConnection (OWS) - (BOOL)hasObjectForKey:(NSString *)key inCollection:(NSString *)collection; -- (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection; - (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection defaultValue:(BOOL)defaultValue; - (double)doubleForKey:(NSString *)key inCollection:(NSString *)collection defaultValue:(double)defaultValue; - (int)intForKey:(NSString *)key inCollection:(NSString *)collection; diff --git a/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m b/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m index 12d47b08e..f21372f80 100644 --- a/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m +++ b/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m @@ -51,11 +51,6 @@ NS_ASSUME_NONNULL_BEGIN return [self objectForKey:key inCollection:collection ofExpectedType:[NSString class]]; } -- (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection -{ - return [self boolForKey:key inCollection:collection defaultValue:NO]; -} - - (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection defaultValue:(BOOL)defaultValue { NSNumber *_Nullable value = [self objectForKey:key inCollection:collection ofExpectedType:[NSNumber class]]; diff --git a/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.h b/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.h index d4326e8da..b533e367f 100644 --- a/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.h +++ b/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.h @@ -12,7 +12,6 @@ NS_ASSUME_NONNULL_BEGIN @interface YapDatabaseReadTransaction (OWS) -- (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection; - (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection defaultValue:(BOOL)defaultValue; - (int)intForKey:(NSString *)key inCollection:(NSString *)collection; - (nullable NSDate *)dateForKey:(NSString *)key inCollection:(NSString *)collection; diff --git a/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m b/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m index 626472aad..255663255 100644 --- a/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m +++ b/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m @@ -36,14 +36,6 @@ NS_ASSUME_NONNULL_BEGIN return [self objectForKey:key inCollection:collection ofExpectedType:[NSString class]]; } -- (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection -{ - OWSAssertDebug(key.length > 0); - OWSAssertDebug(collection.length > 0); - - return [self boolForKey:key inCollection:collection defaultValue:NO]; -} - - (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection defaultValue:(BOOL)defaultValue { OWSAssertDebug(key.length > 0);