Merge branch 'charlesmchen/cacheAccountNames'

src/Messages/TSMessagesManager.m

@@ -955,11 +955,7 @@ NS_ASSUME_NONNULL_BEGIN
         // Update thread preview in inbox
         [thread touch];
 
-        // TODO Delay notification by 100ms?
-        // It's pretty annoying when you're phone keeps buzzing while you're having a conversation on Desktop.
-        NSString *name = [thread name];
         [[TextSecureKitEnv sharedEnv].notificationsManager notifyUserForIncomingMessage:incomingMessage
-                                                                                   from:name
                                                                                inThread:thread
                                                                         contactsManager:self.contactsManager];
     }

src/Protocols/NotificationsProtocol.h

@@ -1,5 +1,6 @@
-//  Created by Frederic Jacobs on 05/12/15.
+//
-//  Copyright © 2015 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
 
 @class TSErrorMessage;
 @class TSIncomingMessage;
@@ -9,7 +10,6 @@
 @protocol NotificationsProtocol <NSObject>
 
 - (void)notifyUserForIncomingMessage:(TSIncomingMessage *)incomingMessage
-                                from:(NSString *)name
                             inThread:(TSThread *)thread
                      contactsManager:(id<ContactsManagerProtocol>)contactsManager;