Merge branch 'charlesmchen/removeBlockingPref'

src/Protocols/TSPreferences.h

@@ -1,13 +0,0 @@
-//
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
-//
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol TSPreferences <NSObject>
-
-- (BOOL)isSendingIdentityApprovalRequired;
-
-@end
-
-NS_ASSUME_NONNULL_END

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<OWSCallMessageHandler>)callMessageHandler
                            contactsManager:(id<ContactsManagerProtocol>)contactsManager
                              messageSender:(OWSMessageSender *)messageSender
-                      notificationsManager:(id<NotificationsProtocol>)notificationsManager
+                      notificationsManager:(id<NotificationsProtocol>)notificationsManager NS_DESIGNATED_INITIALIZER;
-                               preferences:(id<TSPreferences>)preferences NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)init NS_UNAVAILABLE;
 
@@ -27,7 +25,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly) id<ContactsManagerProtocol> contactsManager;
 @property (nonatomic, readonly) OWSMessageSender *messageSender;
 @property (nonatomic, readonly) id<NotificationsProtocol> notificationsManager;
-@property (nonatomic, readonly) id<TSPreferences> preferences;
 
 @end
 

src/TextSecureKitEnv.m

@@ -10,17 +10,13 @@ static TextSecureKitEnv *TextSecureKitEnvSharedInstance;
 
 @implementation TextSecureKitEnv
 
-@synthesize callMessageHandler = _callMessageHandler,
+@synthesize callMessageHandler = _callMessageHandler, contactsManager = _contactsManager,
-    contactsManager = _contactsManager,
+            messageSender = _messageSender, notificationsManager = _notificationsManager;
-    messageSender = _messageSender,
-    notificationsManager = _notificationsManager,
-    preferences = _preferences;
 
 - (instancetype)initWithCallMessageHandler:(id<OWSCallMessageHandler>)callMessageHandler
                            contactsManager:(id<ContactsManagerProtocol>)contactsManager
                              messageSender:(OWSMessageSender *)messageSender
                       notificationsManager:(id<NotificationsProtocol>)notificationsManager
-                               preferences:(nonnull id<TSPreferences>)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<TSPreferences>)preferences
-{
-    NSAssert(_preferences, @"Trying to access preferences before it's set.");
-    return _preferences;
-}
-
 @end
 
 NS_ASSUME_NONNULL_END