Respond to CR.

Signal/src/ViewControllers/ConversationView/ConversationViewController.m

@@ -89,7 +89,8 @@
 #import <SignalServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
 #import <SignalServiceKit/TSNetworkManager.h>
 #import <SignalServiceKit/Threading.h>
-#import <YapDatabase/YapDatabaseView.h>
+#import <YapDatabase/YapDatabaseViewChange.h>
+#import <YapDatabase/YapDatabaseViewConnection.h>
 
 @import Photos;
 

Signal/src/util/Pastelog.m

@@ -64,7 +64,7 @@
                                          @"Label for the 'send to last thread' option of the the debug log alert.")
                                            style:UIAlertActionStyleDefault
                                          handler:^(UIAlertAction *_Nonnull action) {
-                                             [Pastelog.sharedManager sendToLastThread:urlString];
+                                             [Pastelog.sharedManager sendToMostRecentThread:urlString];
                                          }]];
 #endif
             [alert addAction:
@@ -274,7 +274,7 @@
     [[UIPasteboard generalPasteboard] setString:url];
 }
 
-- (void)sendToLastThread:(NSString *)url
+- (void)sendToMostRecentThread:(NSString *)url
 {
     if (![TSAccountManager isRegistered]) {
         return;

SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.m

@@ -14,7 +14,6 @@
 #import <AxolotlKit/NSData+keyVersionByte.h>
 #import <AxolotlKit/PreKeyWhisperMessage.h>
 #import <YapDatabase/YapDatabaseTransaction.h>
-#import <YapDatabase/YapDatabaseView.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Messages/OWSBatchMessageProcessor.m

@@ -15,7 +15,6 @@
 #import <YapDatabase/YapDatabaseAutoView.h>
 #import <YapDatabase/YapDatabaseConnection.h>
 #import <YapDatabase/YapDatabaseTransaction.h>
-#import <YapDatabase/YapDatabaseView.h>
 #import <YapDatabase/YapDatabaseViewTypes.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Messages/OWSMessageReceiver.m

@@ -16,7 +16,6 @@
 #import <YapDatabase/YapDatabaseAutoView.h>
 #import <YapDatabase/YapDatabaseConnection.h>
 #import <YapDatabase/YapDatabaseTransaction.h>
-#import <YapDatabase/YapDatabaseView.h>
 #import <YapDatabase/YapDatabaseViewTypes.h>
 
 NS_ASSUME_NONNULL_BEGIN

SignalServiceKit/src/Storage/TSDatabaseView.m

@@ -13,7 +13,6 @@
 #import "TSThread.h"
 #import <YapDatabase/YapDatabaseAutoView.h>
 #import <YapDatabase/YapDatabaseCrossProcessNotification.h>
-#import <YapDatabase/YapDatabaseView.h>
 #import <YapDatabase/YapDatabaseViewTypes.h>
 
 NSString *const DatabaseViewRegistrationCompleteNotification = @"DatabaseViewRegistrationCompleteNotification";