Fix pending approval issue from half-finished presence requests

Author: chrisballinger

ChatSecure/Classes/Controllers/OTROMEMOSignalCoordinator.swift

@@ -545,7 +545,7 @@ extension OTROMEMOSignalCoordinator: OMEMOModuleDelegate {
                 result = true
             } catch let err as NSError {
                 #if DEBUG
-                    NSLog("Error consuming incoming bundle %@", err)
+                    NSLog("Error consuming incoming bundle %@ %@", err, responseIq.prettyXMLString())
                 #endif
             }
             self?.callAndRemoveOutstandingBundleBlock(elementId!, success: result)

ChatSecure/Classes/Controllers/XMPP/OTRXMPPManager.h

@@ -23,7 +23,7 @@
 @import Foundation;
 @import UIKit;
 @import XMPPFramework;
-#import "OTRBuddy.h"
+#import "OTRXMPPBuddy.h"
 #import "OTRIncomingMessage.h"
 #import "OTROutgoingMessage.h"
 #import "OTRProtocol.h"
@@ -73,8 +73,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)changePassword:(NSString *)newPassword completion:(void (^)(BOOL,NSError*))completion;
 
-/** Will send a probe to fetch last seen */
-- (void) sendPresenceProbeForBuddy:(OTRBuddy*)buddy;
+/** Will try to send a probe to fetch last seen. If buddy is still pendingApproval it will retry subscription request. */
+- (void) sendPresenceProbeForBuddy:(OTRXMPPBuddy*)buddy;
 
 /** Will send an away presence with your last idle timestamp */
 - (void) goAway;

ChatSecure/Classes/Controllers/XMPP/OTRXMPPManager.m

@@ -514,11 +514,20 @@ - (BOOL)continueRegisteringNewAccount
 #pragma mark Public Methods
 
 /** Will send a probe to fetch last seen */
-- (void) sendPresenceProbeForBuddy:(OTRBuddy*)buddy {
+- (void) sendPresenceProbeForBuddy:(OTRXMPPBuddy*)buddy {
+    NSParameterAssert(buddy);
+    if (!buddy) { return; }
+    XMPPJID *jid = buddy.bareJID;
+    if (!jid) { return; }
+    
+    // We can't probe presence if we are still pending approval, so resend the request.
+    if (buddy.pendingApproval) {
+        [self.xmppRoster subscribePresenceToUser:jid];
+        return;
+    }
+    
     // https://xmpp.org/extensions/xep-0318.html
     // <presence from='juliet@capulet.com/balcony' to='romeo@montague.com' type='probe' />
-    XMPPJID *jid = [XMPPJID jidWithString:buddy.username];
-    if (!jid) { return; }
     XMPPPresence *probe = [XMPPPresence presenceWithType:@"probe" to:jid];
     if (!probe) { return; }
     [self.xmppStream sendElement:probe];

ChatSecure/Classes/Model/Yap Storage/OTRXMPPBuddy.h

@@ -9,20 +9,19 @@
 #import "OTRBuddy.h"
 #import "OTRvCard.h"
 
-@class XMPPvCardTemp;
+@import XMPPFramework;
 
 /** Contains userInfo with buddy object in "buddy" key */
 extern NSString * _Nonnull const OTRBuddyPendingApprovalDidChangeNotification;
 
 @interface OTRXMPPBuddy : OTRBuddy <OTRvCard>
 
+/** Returns the bare JID derived from the self.username property */
+@property (nonatomic, strong, readonly, nullable) XMPPJID *bareJID;
 
 /** This is for outgoing subscription requests */
 @property (nonatomic) BOOL pendingApproval;
 /** Incoming subscription requests mean this object is a stub/placeholder */
 @property (nonatomic) BOOL hasIncomingSubscriptionRequest;
 
-
-
-
 @end

ChatSecure/Classes/Model/Yap Storage/OTRXMPPBuddy.m

@@ -71,6 +71,10 @@ - (NSString *)threadName
     return threadName;
 }
 
+- (nullable XMPPJID*) bareJID {
+    return [XMPPJID jidWithString:self.username];
+}
+
 #pragma - mark Class Methods
 
 + (NSString *)collection

ChatSecure/Classes/View Controllers/OTRMessagesViewController.m

@@ -376,12 +376,12 @@ - (nullable OTRXMPPManager *)xmppManagerWithTransaction:(nonnull YapDatabaseRead
 /** Will send a probe to fetch last seen */
 - (void) sendPresenceProbe {
     __block OTRXMPPManager *xmpp = nil;
-    __block OTRBuddy *buddy = nil;
+    __block OTRXMPPBuddy *buddy = nil;
     [self.readOnlyDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction * _Nonnull transaction) {
         xmpp = [self xmppManagerWithTransaction:transaction];
-        buddy = [self buddyWithTransaction:transaction];
+        buddy = (OTRXMPPBuddy*)[self buddyWithTransaction:transaction];
     }];
-    if (!xmpp || !buddy) { return; }
+    if (!xmpp || ![buddy isKindOfClass:[OTRXMPPBuddy class]]) { return; }
     [xmpp sendPresenceProbeForBuddy:buddy];
 }