Merge branch 'charlesmchen/fingerprintViewVsKeyboard'

7 years ago · 7fb795491c
parent 0bc8a0f373 3ac1e75b5f
commit 7fb795491c
1 changed files with 4 additions and 0 deletions
--- a/Signal/src/ViewControllers/MessagesViewController.m
+++ b/Signal/src/ViewControllers/MessagesViewController.m
@ -972,6 +972,10 @@ typedef enum : NSUInteger {

 - (void)showFingerprintWithTheirIdentityKey:(NSData *)theirIdentityKey theirSignalId:(NSString *)theirSignalId
 {
+    // Ensure keyboard isn't hiding the "safety numbers changed" interaction when we
+    // return from FingerprintViewController.
+    [self dismissKeyBoard];
+
    OWSFingerprintBuilder *builder =
        [[OWSFingerprintBuilder alloc] initWithStorageManager:self.storageManager contactsManager:self.contactsManager];
    OWSFingerprint *fingerprint =