|  |  | @ -10,17 +10,13 @@ static TextSecureKitEnv *TextSecureKitEnvSharedInstance; | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | @implementation TextSecureKitEnv |  |  |  | @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 |  |  |  | - (instancetype)initWithCallMessageHandler:(id<OWSCallMessageHandler>)callMessageHandler | 
			
		
	
		
		
			
				
					
					|  |  |  |                            contactsManager:(id<ContactsManagerProtocol>)contactsManager |  |  |  |                            contactsManager:(id<ContactsManagerProtocol>)contactsManager | 
			
		
	
		
		
			
				
					
					|  |  |  |                              messageSender:(OWSMessageSender *)messageSender |  |  |  |                              messageSender:(OWSMessageSender *)messageSender | 
			
		
	
		
		
			
				
					
					|  |  |  |                       notificationsManager:(id<NotificationsProtocol>)notificationsManager |  |  |  |                       notificationsManager:(id<NotificationsProtocol>)notificationsManager | 
			
		
	
		
		
			
				
					
					|  |  |  |                                preferences:(nonnull id<TSPreferences>)preferences |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | { |  |  |  | { | 
			
		
	
		
		
			
				
					
					|  |  |  |     self = [super init]; |  |  |  |     self = [super init]; | 
			
		
	
		
		
			
				
					
					|  |  |  |     if (!self) { |  |  |  |     if (!self) { | 
			
		
	
	
		
		
			
				
					|  |  | @ -31,7 +27,6 @@ static TextSecureKitEnv *TextSecureKitEnvSharedInstance; | 
			
		
	
		
		
			
				
					
					|  |  |  |     _contactsManager = contactsManager; |  |  |  |     _contactsManager = contactsManager; | 
			
		
	
		
		
			
				
					
					|  |  |  |     _messageSender = messageSender; |  |  |  |     _messageSender = messageSender; | 
			
		
	
		
		
			
				
					
					|  |  |  |     _notificationsManager = notificationsManager; |  |  |  |     _notificationsManager = notificationsManager; | 
			
		
	
		
		
			
				
					
					|  |  |  |     _preferences = preferences; |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     return self; |  |  |  |     return self; | 
			
		
	
		
		
			
				
					
					|  |  |  | } |  |  |  | } | 
			
		
	
	
		
		
			
				
					|  |  | @ -76,12 +71,6 @@ static TextSecureKitEnv *TextSecureKitEnvSharedInstance; | 
			
		
	
		
		
			
				
					
					|  |  |  |     return _notificationsManager; |  |  |  |     return _notificationsManager; | 
			
		
	
		
		
			
				
					
					|  |  |  | } |  |  |  | } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | - (id<TSPreferences>)preferences |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | { |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     NSAssert(_preferences, @"Trying to access preferences before it's set."); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     return _preferences; |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | } |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | @end |  |  |  | @end | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | NS_ASSUME_NONNULL_END |  |  |  | NS_ASSUME_NONNULL_END | 
			
		
	
	
		
		
			
				
					|  |  | 
 |