From d4fd3af43300966cb148e1d1243d397e83d51ad4 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 3 May 2019 16:26:32 +1000 Subject: [PATCH] Fix Signal bug --- Signal/src/ViewControllers/NewContactThreadViewController.m | 2 +- Signal/translations/en.lproj/Localizable.strings | 1 + SignalMessaging/ViewControllers/SelectThreadViewController.m | 2 +- SignalMessaging/Views/ContactsViewHelper.m | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/NewContactThreadViewController.m b/Signal/src/ViewControllers/NewContactThreadViewController.m index 7d8c7b48e..154617a2e 100644 --- a/Signal/src/ViewControllers/NewContactThreadViewController.m +++ b/Signal/src/ViewControllers/NewContactThreadViewController.m @@ -126,7 +126,7 @@ NS_ASSUME_NONNULL_BEGIN UISearchBar *searchBar = [OWSSearchBar new]; _searchBar = searchBar; searchBar.delegate = self; - searchBar.placeholder = NSLocalizedString(@"SEARCH_BYNAMEORNUMBER_PLACEHOLDER_TEXT", @""); + searchBar.placeholder = NSLocalizedString(@"Search by name or public key", @""); [searchBar sizeToFit]; SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, searchBar); diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 70c1e79b7..15ae30c0a 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -2564,3 +2564,4 @@ "You seem to be missing the last word of your mnemonic. Please check what you entered and try again." = "You seem to be missing the last word of your mnemonic. Please check what you entered and try again."; "There appears to be an invalid word in your mnemonic. Please check what you entered and try again." = "There appears to be an invalid word in your mnemonic. Please check what you entered and try again."; "Your mnemonic couldn't be verified. Please check what you entered and try again." = "Your mnemonic couldn't be verified. Please check what you entered and try again."; +"Search by name or public key" = "Search by name or public key"; diff --git a/SignalMessaging/ViewControllers/SelectThreadViewController.m b/SignalMessaging/ViewControllers/SelectThreadViewController.m index 41d8da3e0..bf8e5d5f9 100644 --- a/SignalMessaging/ViewControllers/SelectThreadViewController.m +++ b/SignalMessaging/ViewControllers/SelectThreadViewController.m @@ -90,7 +90,7 @@ NS_ASSUME_NONNULL_BEGIN UISearchBar *searchBar = [OWSSearchBar new]; _searchBar = searchBar; searchBar.delegate = self; - searchBar.placeholder = NSLocalizedString(@"SEARCH_BYNAMEORNUMBER_PLACEHOLDER_TEXT", @""); + searchBar.placeholder = NSLocalizedString(@"Search by name or public key", @""); [searchBar sizeToFit]; UIView *header = [self.selectThreadViewDelegate createHeaderWithSearchBar:searchBar]; diff --git a/SignalMessaging/Views/ContactsViewHelper.m b/SignalMessaging/Views/ContactsViewHelper.m index 7d5950c65..f754815f4 100644 --- a/SignalMessaging/Views/ContactsViewHelper.m +++ b/SignalMessaging/Views/ContactsViewHelper.m @@ -188,7 +188,7 @@ NS_ASSUME_NONNULL_BEGIN self.nonSignalContacts = nil; // Don't fire delegate "change" events during initialization. - if (!self.shouldNotifyDelegateOfUpdatedContacts) { + if (self.shouldNotifyDelegateOfUpdatedContacts) { [self.delegate contactsViewHelperDidUpdateContacts]; self.hasUpdatedContactsAtLeastOnce = YES; }