From a07e1e0cf95659793150db7dbdb607b4f26827af Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Mon, 20 Nov 2017 16:50:18 -0500
Subject: [PATCH] For most views, only try to dismiss keyboard when scroll drag
 starts.

---
 Signal/src/ViewControllers/CountryCodeViewController.m      | 2 +-
 Signal/src/ViewControllers/NewContactThreadViewController.m | 2 +-
 Signal/src/ViewControllers/NewGroupViewController.m         | 2 +-
 Signal/src/ViewControllers/OWSTableViewController.h         | 2 +-
 Signal/src/ViewControllers/OWSTableViewController.m         | 4 ++--
 Signal/src/ViewControllers/SelectRecipientViewController.m  | 2 +-
 Signal/src/ViewControllers/SelectThreadViewController.m     | 2 +-
 Signal/src/ViewControllers/UpdateGroupViewController.m      | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Signal/src/ViewControllers/CountryCodeViewController.m b/Signal/src/ViewControllers/CountryCodeViewController.m
index c202436cb..0acad149c 100644
--- a/Signal/src/ViewControllers/CountryCodeViewController.m
+++ b/Signal/src/ViewControllers/CountryCodeViewController.m
@@ -152,7 +152,7 @@
 
 #pragma mark - OWSTableViewControllerDelegate
 
-- (void)tableViewDidScroll
+- (void)tableViewWillBeginDragging
 {
     [self.searchBar resignFirstResponder];
 }
diff --git a/Signal/src/ViewControllers/NewContactThreadViewController.m b/Signal/src/ViewControllers/NewContactThreadViewController.m
index e9d540269..9b65ec0a6 100644
--- a/Signal/src/ViewControllers/NewContactThreadViewController.m
+++ b/Signal/src/ViewControllers/NewContactThreadViewController.m
@@ -842,7 +842,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - OWSTableViewControllerDelegate
 
-- (void)tableViewDidScroll
+- (void)tableViewWillBeginDragging
 {
     [self.searchBar resignFirstResponder];
 }
diff --git a/Signal/src/ViewControllers/NewGroupViewController.m b/Signal/src/ViewControllers/NewGroupViewController.m
index 87c4b3544..a7b27ce58 100644
--- a/Signal/src/ViewControllers/NewGroupViewController.m
+++ b/Signal/src/ViewControllers/NewGroupViewController.m
@@ -591,7 +591,7 @@ const NSUInteger kNewGroupViewControllerAvatarWidth = 68;
 
 #pragma mark - OWSTableViewControllerDelegate
 
-- (void)tableViewDidScroll
+- (void)tableViewWillBeginDragging
 {
     [self.groupNameTextField resignFirstResponder];
 }
diff --git a/Signal/src/ViewControllers/OWSTableViewController.h b/Signal/src/ViewControllers/OWSTableViewController.h
index 697b7b444..b6c97efe0 100644
--- a/Signal/src/ViewControllers/OWSTableViewController.h
+++ b/Signal/src/ViewControllers/OWSTableViewController.h
@@ -100,7 +100,7 @@ typedef UITableViewCell *_Nonnull (^OWSTableCustomCellBlock)(void);
 
 @protocol OWSTableViewControllerDelegate <NSObject>
 
-- (void)tableViewDidScroll;
+- (void)tableViewWillBeginDragging;
 
 @end
 
diff --git a/Signal/src/ViewControllers/OWSTableViewController.m b/Signal/src/ViewControllers/OWSTableViewController.m
index 55c1787ad..f1b140e0a 100644
--- a/Signal/src/ViewControllers/OWSTableViewController.m
+++ b/Signal/src/ViewControllers/OWSTableViewController.m
@@ -616,9 +616,9 @@ NSString * const kOWSTableCellIdentifier = @"kOWSTableCellIdentifier";
 
 #pragma mark - UIScrollViewDelegate
 
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView
+- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
 {
-    [self.delegate tableViewDidScroll];
+    [self.delegate tableViewWillBeginDragging];
 }
 
 @end
diff --git a/Signal/src/ViewControllers/SelectRecipientViewController.m b/Signal/src/ViewControllers/SelectRecipientViewController.m
index 65bd1c323..9c7671a80 100644
--- a/Signal/src/ViewControllers/SelectRecipientViewController.m
+++ b/Signal/src/ViewControllers/SelectRecipientViewController.m
@@ -573,7 +573,7 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien
 
 #pragma mark - OWSTableViewControllerDelegate
 
-- (void)tableViewDidScroll
+- (void)tableViewWillBeginDragging
 {
     [self.phoneNumberTextField resignFirstResponder];
 }
diff --git a/Signal/src/ViewControllers/SelectThreadViewController.m b/Signal/src/ViewControllers/SelectThreadViewController.m
index dd662aaae..a68ce4151 100644
--- a/Signal/src/ViewControllers/SelectThreadViewController.m
+++ b/Signal/src/ViewControllers/SelectThreadViewController.m
@@ -279,7 +279,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - OWSTableViewControllerDelegate
 
-- (void)tableViewDidScroll
+- (void)tableViewWillBeginDragging
 {
     [self.searchBar resignFirstResponder];
 }
diff --git a/Signal/src/ViewControllers/UpdateGroupViewController.m b/Signal/src/ViewControllers/UpdateGroupViewController.m
index 6706193fb..fb5c9cb97 100644
--- a/Signal/src/ViewControllers/UpdateGroupViewController.m
+++ b/Signal/src/ViewControllers/UpdateGroupViewController.m
@@ -469,7 +469,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - OWSTableViewControllerDelegate
 
-- (void)tableViewDidScroll
+- (void)tableViewWillBeginDragging
 {
     [self.groupNameTextField resignFirstResponder];
 }