diff --git a/src/Protocols/TSPreferences.h b/src/Protocols/TSPreferences.h deleted file mode 100644 index c21ab211e..000000000 --- a/src/Protocols/TSPreferences.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. -// - -NS_ASSUME_NONNULL_BEGIN - -@protocol TSPreferences - -- (BOOL)isSendingIdentityApprovalRequired; - -@end - -NS_ASSUME_NONNULL_END diff --git a/src/TextSecureKitEnv.h b/src/TextSecureKitEnv.h index 80ddefc1b..424f6daed 100644 --- a/src/TextSecureKitEnv.h +++ b/src/TextSecureKitEnv.h @@ -8,15 +8,13 @@ NS_ASSUME_NONNULL_BEGIN @class OWSMessageSender; @protocol NotificationsProtocol; @protocol OWSCallMessageHandler; -@protocol TSPreferences; @interface TextSecureKitEnv : NSObject - (instancetype)initWithCallMessageHandler:(id)callMessageHandler contactsManager:(id)contactsManager messageSender:(OWSMessageSender *)messageSender - notificationsManager:(id)notificationsManager - preferences:(id)preferences NS_DESIGNATED_INITIALIZER; + notificationsManager:(id)notificationsManager NS_DESIGNATED_INITIALIZER; - (instancetype)init NS_UNAVAILABLE; @@ -27,7 +25,6 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) id contactsManager; @property (nonatomic, readonly) OWSMessageSender *messageSender; @property (nonatomic, readonly) id notificationsManager; -@property (nonatomic, readonly) id preferences; @end diff --git a/src/TextSecureKitEnv.m b/src/TextSecureKitEnv.m index b62757eaa..aba5ed412 100644 --- a/src/TextSecureKitEnv.m +++ b/src/TextSecureKitEnv.m @@ -10,17 +10,13 @@ static TextSecureKitEnv *TextSecureKitEnvSharedInstance; @implementation TextSecureKitEnv -@synthesize callMessageHandler = _callMessageHandler, - contactsManager = _contactsManager, - messageSender = _messageSender, - notificationsManager = _notificationsManager, - preferences = _preferences; +@synthesize callMessageHandler = _callMessageHandler, contactsManager = _contactsManager, + messageSender = _messageSender, notificationsManager = _notificationsManager; - (instancetype)initWithCallMessageHandler:(id)callMessageHandler contactsManager:(id)contactsManager messageSender:(OWSMessageSender *)messageSender notificationsManager:(id)notificationsManager - preferences:(nonnull id)preferences { self = [super init]; if (!self) { @@ -31,7 +27,6 @@ static TextSecureKitEnv *TextSecureKitEnvSharedInstance; _contactsManager = contactsManager; _messageSender = messageSender; _notificationsManager = notificationsManager; - _preferences = preferences; return self; } @@ -76,12 +71,6 @@ static TextSecureKitEnv *TextSecureKitEnvSharedInstance; return _notificationsManager; } -- (id)preferences -{ - NSAssert(_preferences, @"Trying to access preferences before it's set."); - return _preferences; -} - @end NS_ASSUME_NONNULL_END