diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index bbab7a2cb..6f6bbc118 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -25,8 +25,8 @@ 3448BFCC1EDF0EA7005B2D69 /* OWSMessagesToolbarContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3448BFC21EDF0EA7005B2D69 /* OWSMessagesToolbarContentView.m */; }; 3448BFCD1EDF0EA7005B2D69 /* OWSMessagesInputToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 3448BFC41EDF0EA7005B2D69 /* OWSMessagesInputToolbar.m */; }; 3448BFCF1EDF0EA7005B2D69 /* OWSMessagesComposerTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3448BFC81EDF0EA7005B2D69 /* OWSMessagesComposerTextView.m */; }; - 3448BFD01EDF0EA7005B2D69 /* MessagesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3448BFCA1EDF0EA7005B2D69 /* MessagesViewController.m */; }; - 3448BFD11EDF0EA7005B2D69 /* MessagesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3448BFCB1EDF0EA7005B2D69 /* MessagesViewController.xib */; }; + 3448BFD01EDF0EA7005B2D69 /* ConversationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3448BFCA1EDF0EA7005B2D69 /* ConversationViewController.m */; }; + 3448BFD11EDF0EA7005B2D69 /* ConversationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3448BFCB1EDF0EA7005B2D69 /* ConversationViewController.xib */; }; 344F2F671E57A932000D9322 /* UIViewController+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 344F2F661E57A932000D9322 /* UIViewController+OWS.m */; }; 34533F181EA8D2070006114F /* OWSAudioAttachmentPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 34533F171EA8D2070006114F /* OWSAudioAttachmentPlayer.m */; }; 34535D821E256BE9008A4747 /* UIView+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 34535D811E256BE9008A4747 /* UIView+OWS.m */; }; @@ -432,9 +432,9 @@ 3448BFC41EDF0EA7005B2D69 /* OWSMessagesInputToolbar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSMessagesInputToolbar.m; sourceTree = ""; }; 3448BFC71EDF0EA7005B2D69 /* OWSMessagesComposerTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSMessagesComposerTextView.h; sourceTree = ""; }; 3448BFC81EDF0EA7005B2D69 /* OWSMessagesComposerTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSMessagesComposerTextView.m; sourceTree = ""; }; - 3448BFC91EDF0EA7005B2D69 /* MessagesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessagesViewController.h; sourceTree = ""; }; - 3448BFCA1EDF0EA7005B2D69 /* MessagesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessagesViewController.m; sourceTree = ""; }; - 3448BFCB1EDF0EA7005B2D69 /* MessagesViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MessagesViewController.xib; sourceTree = ""; }; + 3448BFC91EDF0EA7005B2D69 /* ConversationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConversationViewController.h; sourceTree = ""; }; + 3448BFCA1EDF0EA7005B2D69 /* ConversationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConversationViewController.m; sourceTree = ""; }; + 3448BFCB1EDF0EA7005B2D69 /* ConversationViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ConversationViewController.xib; sourceTree = ""; }; 344F2F651E57A932000D9322 /* UIViewController+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIViewController+OWS.h"; path = "util/UIViewController+OWS.h"; sourceTree = ""; }; 344F2F661E57A932000D9322 /* UIViewController+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIViewController+OWS.m"; path = "util/UIViewController+OWS.m"; sourceTree = ""; }; 34533F161EA8D2070006114F /* OWSAudioAttachmentPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSAudioAttachmentPlayer.h; sourceTree = ""; }; @@ -966,9 +966,9 @@ 3448BFC01EDF0EA7005B2D69 /* ConversationView */ = { isa = PBXGroup; children = ( - 3448BFC91EDF0EA7005B2D69 /* MessagesViewController.h */, - 3448BFCA1EDF0EA7005B2D69 /* MessagesViewController.m */, - 3448BFCB1EDF0EA7005B2D69 /* MessagesViewController.xib */, + 3448BFC91EDF0EA7005B2D69 /* ConversationViewController.h */, + 3448BFCA1EDF0EA7005B2D69 /* ConversationViewController.m */, + 3448BFCB1EDF0EA7005B2D69 /* ConversationViewController.xib */, 3448BFC71EDF0EA7005B2D69 /* OWSMessagesComposerTextView.h */, 3448BFC81EDF0EA7005B2D69 /* OWSMessagesComposerTextView.m */, 3448BFC31EDF0EA7005B2D69 /* OWSMessagesInputToolbar.h */, @@ -1995,7 +1995,7 @@ B633C59D1A1D190B0059AC12 /* endcall@2x.png in Resources */, FC5CDF391A3393DD00B47253 /* error_white@2x.png in Resources */, B633C5D21A1D190B0059AC12 /* savephoto@2x.png in Resources */, - 3448BFD11EDF0EA7005B2D69 /* MessagesViewController.xib in Resources */, + 3448BFD11EDF0EA7005B2D69 /* ConversationViewController.xib in Resources */, B10C9B611A7049EC00ECA2BF /* play_icon.png in Resources */, AD83FF401A73426500B5C81A /* audio_pause_button_blue@2x.png in Resources */, B66DBF4A19D5BBC8006EA940 /* Images.xcassets in Resources */, @@ -2348,7 +2348,7 @@ 34B3F88D1E8DF1700035BE1A /* OWSQRCodeScanningViewController.m in Sources */, 34B3F8811E8DF1700035BE1A /* LockInteractionController.m in Sources */, 3448BFCC1EDF0EA7005B2D69 /* OWSMessagesToolbarContentView.m in Sources */, - 3448BFD01EDF0EA7005B2D69 /* MessagesViewController.m in Sources */, + 3448BFD01EDF0EA7005B2D69 /* ConversationViewController.m in Sources */, 34CCAF3B1F0C2748004084F4 /* OWSAddToContactViewController.m in Sources */, 45F659731E1BD99C00444429 /* CallKitCallUIAdaptee.swift in Sources */, 45BB93381E688E14001E3939 /* UIDevice+featureSupport.swift in Sources */, diff --git a/Signal/src/ViewControllers/ConversationView/MessagesViewController.h b/Signal/src/ViewControllers/ConversationView/ConversationViewController.h similarity index 76% rename from Signal/src/ViewControllers/ConversationView/MessagesViewController.h rename to Signal/src/ViewControllers/ConversationView/ConversationViewController.h index da36fb9a0..4ca34e2df 100644 --- a/Signal/src/ViewControllers/ConversationView/MessagesViewController.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.h @@ -6,9 +6,9 @@ @class TSThread; -extern NSString *const OWSMessagesViewControllerDidAppearNotification; +extern NSString *const ConversationViewControllerDidAppearNotification; -@interface MessagesViewController : JSQMessagesViewController +@interface ConversationViewController : JSQMessagesViewController @property (nonatomic, readonly) TSThread *thread; diff --git a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m similarity index 98% rename from Signal/src/ViewControllers/ConversationView/MessagesViewController.m rename to Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 78fc76c50..0621f35a4 100644 --- a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2,7 +2,7 @@ // Copyright (c) 2017 Open Whisper Systems. All rights reserved. // -#import "MessagesViewController.h" +#import "ConversationViewController.h" #import "AppDelegate.h" #import "AttachmentSharing.h" #import "BlockListUIUtils.h" @@ -106,7 +106,7 @@ static const int JSQ_IMAGE_INSET = 5; static NSTimeInterval const kTSMessageSentDateShowTimeInterval = 5 * kMinuteInterval; -NSString *const OWSMessagesViewControllerDidAppearNotification = @"OWSMessagesViewControllerDidAppear"; +NSString *const ConversationViewControllerDidAppearNotification = @"ConversationViewControllerDidAppear"; typedef enum : NSUInteger { kMediaTypePicture, @@ -154,7 +154,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { #pragma mark - -@interface MessagesViewController () > *interactions = [NSMutableArray new]; - + [[TSDatabaseView unseenDatabaseViewExtension:transaction] enumerateRowsInGroup:thread.uniqueId usingBlock:^( @@ -4130,7 +4128,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { // Max out the unread count at 99+. const NSUInteger kMaxUnreadCount = 99; - _backButtonUnreadCountLabel.text = [ViewControllerUtils formatInt:(int) MIN(kMaxUnreadCount, unreadCount)]; + _backButtonUnreadCountLabel.text = [ViewControllerUtils formatInt:(int)MIN(kMaxUnreadCount, unreadCount)]; } #pragma mark 3D Touch Preview Actions @@ -4185,7 +4183,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { DDLogError(@"%@ %s", self.tag, __PRETTY_FUNCTION__); DispatchMainThreadSafe(^{ - __weak MessagesViewController *weakSelf = self; + __weak ConversationViewController *weakSelf = self; if ([self isBlockedContactConversation]) { [self showUnblockContactUI:^(BOOL isBlocked) { if (!isBlocked) { @@ -4540,14 +4538,14 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { + (UINib *)nib { - return [UINib nibWithNibName:NSStringFromClass([MessagesViewController class]) - bundle:[NSBundle bundleForClass:[MessagesViewController class]]]; + return [UINib nibWithNibName:NSStringFromClass([ConversationViewController class]) + bundle:[NSBundle bundleForClass:[ConversationViewController class]]]; } + (instancetype)messagesViewController { - return [[[self class] alloc] initWithNibName:NSStringFromClass([MessagesViewController class]) - bundle:[NSBundle bundleForClass:[MessagesViewController class]]]; + return [[[self class] alloc] initWithNibName:NSStringFromClass([ConversationViewController class]) + bundle:[NSBundle bundleForClass:[ConversationViewController class]]]; } #pragma mark - Logging diff --git a/Signal/src/ViewControllers/ConversationView/MessagesViewController.xib b/Signal/src/ViewControllers/ConversationView/ConversationViewController.xib similarity index 94% rename from Signal/src/ViewControllers/ConversationView/MessagesViewController.xib rename to Signal/src/ViewControllers/ConversationView/ConversationViewController.xib index d4b3087a1..994ba729a 100644 --- a/Signal/src/ViewControllers/ConversationView/MessagesViewController.xib +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.xib @@ -1,11 +1,11 @@ - - + + - + diff --git a/Signal/src/ViewControllers/HomeViewController.m b/Signal/src/ViewControllers/HomeViewController.m index 4ebb85fa5..bf500a090 100644 --- a/Signal/src/ViewControllers/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeViewController.m @@ -5,8 +5,8 @@ #import "HomeViewController.h" #import "AppDelegate.h" #import "AppSettingsViewController.h" +#import "ConversationViewController.h" #import "InboxTableViewCell.h" -#import "MessagesViewController.h" #import "NSDate+millisecondTimeStamp.h" #import "NewContactThreadViewController.h" #import "OWSContactsManager.h" @@ -326,7 +326,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState }; if (indexPath) { [previewingContext setSourceRect:[self.tableView rectForRowAtIndexPath:indexPath]]; - MessagesViewController *vc = [MessagesViewController new]; + ConversationViewController *vc = [ConversationViewController new]; TSThread *thread = [self threadForIndexPath:indexPath]; self.lastThread = thread; [vc configureForThread:thread keyboardOnViewAppearing:NO callOnViewAppearing:NO]; @@ -341,7 +341,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState }; - (void)previewingContext:(id)previewingContext commitViewController:(UIViewController *)viewControllerToCommit { - MessagesViewController *vc = (MessagesViewController *)viewControllerToCommit; + ConversationViewController *vc = (ConversationViewController *)viewControllerToCommit; [vc popped]; [self.navigationController pushViewController:vc animated:NO]; @@ -758,8 +758,8 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState }; // We do this synchronously if we're already on the main thread. DispatchMainThreadSafe(^{ - MessagesViewController *mvc = - [[MessagesViewController alloc] initWithNibName:@"MessagesViewController" bundle:nil]; + ConversationViewController *mvc = + [[ConversationViewController alloc] initWithNibName:@"ConversationViewController" bundle:nil]; [mvc configureForThread:thread keyboardOnViewAppearing:keyboardOnViewAppearing callOnViewAppearing:callOnViewAppearing]; diff --git a/Signal/src/environment/Environment.m b/Signal/src/environment/Environment.m index e85aa0db8..aca076d1c 100644 --- a/Signal/src/environment/Environment.m +++ b/Signal/src/environment/Environment.m @@ -3,10 +3,10 @@ // #import "Environment.h" +#import "ConversationViewController.h" #import "DebugLogger.h" #import "FunctionalUtil.h" #import "HomeViewController.h" -#import "MessagesViewController.h" #import "Signal-Swift.h" #import "SignalKeyingStorage.h" #import "TSContactThread.h" @@ -195,8 +195,8 @@ static Environment *environment = nil; HomeViewController *vc = env.signalsViewController; UIViewController *topvc = vc.navigationController.topViewController; - if ([topvc isKindOfClass:[MessagesViewController class]]) { - MessagesViewController *mvc = (MessagesViewController *)topvc; + if ([topvc isKindOfClass:[ConversationViewController class]]) { + ConversationViewController *mvc = (ConversationViewController *)topvc; if ([mvc.thread.uniqueId isEqualToString:threadId]) { [mvc popKeyBoard]; return; diff --git a/Signal/src/views/OWSExpirationTimerView.m b/Signal/src/views/OWSExpirationTimerView.m index 4c2987ecc..5d91357f6 100644 --- a/Signal/src/views/OWSExpirationTimerView.m +++ b/Signal/src/views/OWSExpirationTimerView.m @@ -3,7 +3,7 @@ // #import "OWSExpirationTimerView.h" -#import "MessagesViewController.h" +#import "ConversationViewController.h" #import "UIColor+OWS.h" #import @@ -110,7 +110,7 @@ double const OWSExpirationTimerViewBlinkingSeconds = 2; self.initialDurationSeconds = initialDurationSeconds; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleReappearNotification:) - name:OWSMessagesViewControllerDidAppearNotification + name:ConversationViewControllerDidAppearNotification object:nil]; [self startAnimation]; } @@ -176,7 +176,7 @@ double const OWSExpirationTimerViewBlinkingSeconds = 2; - (void)stopTimer { [[NSNotificationCenter defaultCenter] removeObserver:self - name:OWSMessagesViewControllerDidAppearNotification + name:ConversationViewControllerDidAppearNotification object:nil]; [self.layer removeAnimationForKey:@"alphaBlink"];