Merge pull request #809 from zom/friending_problems

Friending problems
ChatSecure · Jul 26, 2017 · 6bb23ab · 6bb23ab
2 parents 1f93359 + dbd958a
commit 6bb23ab
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 9 deletions.
diff --git a/ChatSecure/Classes/Controllers/OTROMEMOSignalCoordinator.swift b/ChatSecure/Classes/Controllers/OTROMEMOSignalCoordinator.swift
@@ -16,6 +16,8 @@ import SignalProtocolObjC
  * This is the glue between XMPP/OMEMO and Signal
  */
 @objc open class OTROMEMOSignalCoordinator: NSObject {
+
+    public static let DeviceListUpdateNotificationName = Notification.Name(rawValue: "DeviceListUpdateNotification")
 
     open let signalEncryptionManager:OTRAccountSignalEncryptionManager
     open let omemoStorageManager:OTROMEMOStorageManager
@@ -617,7 +619,13 @@ extension OTROMEMOSignalCoordinator:OMEMOStorageDelegate {
         if (isOurDeviceList) {
             self.omemoStorageManager.storeOurDevices(deviceIds)
         } else {
-            self.omemoStorageManager.storeBuddyDevices(deviceIds, buddyUsername: jid.bare())
+            self.omemoStorageManager.storeBuddyDevices(deviceIds, buddyUsername: jid.bare(), completion: {() -> Void in
+
+                //Devices updated for buddy
+                DispatchQueue.main.async {
+                    NotificationCenter.default.post(name: OTROMEMOSignalCoordinator.DeviceListUpdateNotificationName, object: self, userInfo: ["jid":jid])
+                }
+            })
         }
     }
 

diff --git a/ChatSecure/Classes/Controllers/OTROMEMOStorageManager.swift b/ChatSecure/Classes/Controllers/OTROMEMOStorageManager.swift
@@ -153,7 +153,7 @@ open class OTROMEMOStorageManager {
      - parameter devices: An array of the device numbers. Should be UInt32.
      - parameter buddyUsername: The bare JID for the buddy.
      */
-    open func storeBuddyDevices(_ devices:[NSNumber], buddyUsername:String) {
+    open func storeBuddyDevices(_ devices:[NSNumber], buddyUsername:String, completion:(()->Void)?) {
         self.databaseConnection.asyncReadWrite { (transaction) in
             // Fetch the buddy from the database.
             var buddy = OTRBuddy.fetch(withUsername: buddyUsername, withAccountUniqueId: self.accountKey, transaction: transaction)
@@ -167,6 +167,9 @@ open class OTROMEMOStorageManager {
             }
             if let bud = buddy {
                 self.storeDevices(devices, parentYapKey: bud.uniqueId, parentYapCollection: type(of: bud).collection, transaction: transaction)
+                if let completion = completion {
+                    completion()
+                }
             }
 
         }

diff --git a/ChatSecure/Classes/Controllers/XMPP/OTRYapDatabaseRosterStorage.m b/ChatSecure/Classes/Controllers/XMPP/OTRYapDatabaseRosterStorage.m
@@ -293,6 +293,7 @@ - (void)handlePresence:(XMPPPresence *)presence xmppStream:(XMPPStream *)stream
             if (!buddy) { return; }
             buddy.pendingApproval = NO;
             [buddy saveWithTransaction:transaction];
+            [[NSNotificationCenter defaultCenter] postNotificationName:OTRBuddyPendingApprovalDidChangeNotification object:self userInfo:@{@"buddy": buddy}];
         }];
     }
 

diff --git a/ChatSecure/Classes/View Controllers/OTRConversationViewController.m b/ChatSecure/Classes/View Controllers/OTRConversationViewController.m
@@ -423,6 +423,7 @@ - (void) handleSubscriptionRequest:(OTRXMPPPresenceSubscriptionRequest*)request
                 buddy.lastMessageId = @"";
             }
             buddy.displayName = request.jid;
+            buddy.pendingApproval = YES;
             [buddy saveWithTransaction:transaction];
         }];
         [manager.xmppRoster acceptPresenceSubscriptionRequestFrom:jid andAddToRoster:YES];

diff --git a/ChatSecure/Classes/View Controllers/OTRMessagesViewController.m b/ChatSecure/Classes/View Controllers/OTRMessagesViewController.m
@@ -77,6 +77,9 @@ @interface OTRMessagesViewController () <UITextViewDelegate, OTRAttachmentPicker
 
 @property (nonatomic, weak) id didFinishGeneratingPrivateKeyNotificationObject;
 @property (nonatomic, weak) id messageStateDidChangeNotificationObject;
+@property (nonatomic, weak) id pendingApprovalDidChangeNotificationObject;
+@property (nonatomic, weak) id deviceListUpdateNotificationObject;
+
 
 @property (nonatomic ,strong) UIBarButtonItem *lockBarButtonItem;
 @property (nonatomic, strong) OTRLockButton *lockButton;
@@ -355,7 +358,38 @@ - (void)setThreadKey:(NSString *)key collection:(NSString *)collection
     [self updateEncryptionState];
     [self updateJIDForwardingHeader];
 
+    __weak typeof(self)weakSelf = self;
+    if (self.pendingApprovalDidChangeNotificationObject == nil) {
+        self.pendingApprovalDidChangeNotificationObject = [[NSNotificationCenter defaultCenter] addObserverForName:OTRBuddyPendingApprovalDidChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
+            __strong typeof(weakSelf)strongSelf = weakSelf;
+            OTRXMPPBuddy *notificationBuddy = [note.userInfo objectForKey:@"buddy"];
+            __block NSString *buddyKey = nil;
+            [strongSelf.readOnlyDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction * _Nonnull transaction) {
+                buddyKey = [strongSelf buddyWithTransaction:transaction].uniqueId;
+            }];
+            if ([notificationBuddy.uniqueId isEqualToString:buddyKey]) {
+                [strongSelf fetchOMEMODeviceList];
+                [strongSelf sendPresenceProbe];
+            }
+        }];
+    }
+
+    if (self.deviceListUpdateNotificationObject == nil) {
+        self.deviceListUpdateNotificationObject = [[NSNotificationCenter defaultCenter] addObserverForName:OTROMEMOSignalCoordinator.DeviceListUpdateNotificationName object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification * _Nonnull note) {
+            __strong typeof(weakSelf)strongSelf = weakSelf;
+            XMPPJID *notificationJid = [note.userInfo objectForKey:@"jid"];
+            __block NSString *buddyUser = nil;
+            [strongSelf.readOnlyDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction * _Nonnull transaction) {
+                buddyUser = [strongSelf buddyWithTransaction:transaction].username;
+            }];
+            if (notificationJid != nil && [notificationJid.bare isEqualToString:buddyUser]) {
+                [strongSelf updateEncryptionState];
+            }
+        }];
+    }
+
     [self sendPresenceProbe];
+    [self fetchOMEMODeviceList];
 }
 
 
@@ -390,7 +424,7 @@ - (void) sendPresenceProbe {
         xmpp = [self xmppManagerWithTransaction:transaction];
         buddy = (OTRXMPPBuddy*)[self buddyWithTransaction:transaction];
     }];
-    if (!xmpp || ![buddy isKindOfClass:[OTRXMPPBuddy class]]) { return; }
+    if (!xmpp || ![buddy isKindOfClass:[OTRXMPPBuddy class]] || buddy.pendingApproval) { return; }
     [xmpp sendPresenceProbeForBuddy:buddy];
 }
 
@@ -770,12 +804,7 @@ - (void) infoButtonPressed:(id)sender {
 
     // Hack to manually re-fetch OMEMO devicelist because PEP sucks
     // TODO: Ideally this should be moved to some sort of manual refresh in the Profile view
-    id manager = [[OTRProtocolManager sharedInstance] protocolForAccount:account];
-    if ([manager isKindOfClass:[OTRXMPPManager class]]) {
-        XMPPJID *jid = [XMPPJID jidWithString:buddy.username];
-        OTRXMPPManager *xmpp = manager;
-        [xmpp.omemoSignalCoordinator.omemoModule fetchDeviceIdsForJID:jid elementId:nil];
-    }
+    [self fetchOMEMODeviceList];
 
     XLFormDescriptor *form = [UserProfileViewController profileFormDescriptorForAccount:account buddies:@[buddy] connection:self.readOnlyDatabaseConnection];
 
@@ -788,6 +817,27 @@ - (void) infoButtonPressed:(id)sender {
     [self presentViewController:verifyNav animated:YES completion:nil];
 }
 
+
+// Hack to manually re-fetch OMEMO devicelist because PEP sucks
+// TODO: Ideally this should be moved to some sort of manual refresh in the Profile view
+-(void) fetchOMEMODeviceList {
+    __block OTRAccount *account = nil;
+    __block OTRBuddy *buddy = nil;
+    [self.readOnlyDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction * _Nonnull transaction) {
+        account = [self accountWithTransaction:transaction];
+        buddy = [self buddyWithTransaction:transaction];
+    }];
+    if (!account || !buddy) {
+        return;
+    }
+    id manager = [[OTRProtocolManager sharedInstance] protocolForAccount:account];
+    if ([manager isKindOfClass:[OTRXMPPManager class]]) {
+        XMPPJID *jid = [XMPPJID jidWithString:buddy.username];
+        OTRXMPPManager *xmpp = manager;
+        [xmpp.omemoSignalCoordinator.omemoModule fetchDeviceIdsForJID:jid elementId:nil];
+    }
+}
+
 - (UIBarButtonItem *)rightBarButtonItem
 {
     if (!self.lockBarButtonItem) {