Added remove buddy action

Author: N-Pex

ChatSecure/Classes/Controllers/MessageQueueHandler.swift

@@ -318,7 +318,41 @@ public class MessageQueueHandler:NSObject {
             completion(false, self.accountRetryTimeout)
         }
     }
-    
+
+    fileprivate func removeBuddyFromRoster(_ removeBuddyAction:OTRYapRemoveBuddyAction, completion:@escaping (_ success: Bool, _ retryTimeout: TimeInterval) -> Void) {
+        
+        var acc:OTRAccount? = nil
+        self.databaseConnection.read({ (transaction) in
+            if let accountKey = removeBuddyAction.accountKey {
+                acc = OTRAccount.fetchObject(withUniqueID: accountKey, transaction: transaction)
+            }
+        })
+        guard let account = acc else {
+            completion(true, 0.0)
+            return
+        }
+        
+        //Get the XMPP procol manager associated with this message and therefore account
+        guard let accountProtocol = OTRProtocolManager.sharedInstance().protocol(for: account) as? OTRXMPPManager else {
+            completion(true, 0.0)
+            return
+        }
+        
+        //Ensure protocol is connected or if not and autologin then connnect
+        if (accountProtocol.connectionStatus == .connected) {
+            // Add the buddy to our roster
+            let jid = XMPPJID(string: removeBuddyAction.buddyJid)
+            accountProtocol.xmppRoster.removeUser(jid)
+            completion(true, 0.0)
+        } else if (account.autologin == true) {
+            self.waitingForAccount(account.uniqueId, action: OutstandingActionInfo(action: removeBuddyAction, timer: nil, completion: completion))
+            accountProtocol.connectUserInitiated(false)
+        } else {
+            // Retry later
+            completion(false, self.accountRetryTimeout)
+        }
+    }
+
 
     //Mark: Callback for Account
 
@@ -441,6 +475,8 @@ extension MessageQueueHandler: YapTaskQueueHandler {
                 self.sendMessage(sendMessageAction, completion: completion)
         case let addBuddyAction as OTRYapAddBuddyAction:
                 self.addBuddyToRoster(addBuddyAction, completion: completion)
+        case let removeBuddyAction as OTRYapRemoveBuddyAction:
+            self.removeBuddyFromRoster(removeBuddyAction, completion: completion)
         default: break
         }
     }

ChatSecure/Classes/Controllers/XMPP/OTRXMPPManager.m

@@ -1149,7 +1149,8 @@ -(void)sendChatState:(OTRChatState)chatState withBuddyID:(NSString *)buddyUnique
 - (void) addBuddy:(OTRXMPPBuddy *)newBuddy
 {
     [[OTRDatabaseManager sharedInstance].readWriteDatabaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-        OTRYapAddBuddyAction *addBuddyAction = [[OTRYapAddBuddyAction alloc] initWithBuddyKey:newBuddy.uniqueId];
+        OTRYapAddBuddyAction *addBuddyAction = [[OTRYapAddBuddyAction alloc] init];
+        addBuddyAction.buddyKey = newBuddy.uniqueId;
         [addBuddyAction saveWithTransaction:transaction];
     }];
 }
@@ -1162,13 +1163,17 @@ - (void) setDisplayName:(NSString *) newDisplayName forBuddy:(OTRXMPPBuddy *)bud
 }
 -(void)removeBuddies:(NSArray *)buddies
 {
-    for (OTRXMPPBuddy *buddy in buddies){
-        XMPPJID * jid = [XMPPJID jidWithString:buddy.username];
-        [self.xmppRoster removeUser:jid];
-    }
-    
-    
     [[OTRDatabaseManager sharedInstance].readWriteDatabaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+        
+        // Add actions to the queue
+        for (OTRXMPPBuddy *buddy in buddies){
+            OTRYapRemoveBuddyAction *removeBuddyAction = [[OTRYapRemoveBuddyAction alloc] init];
+            removeBuddyAction.buddyKey = buddy.uniqueId;
+            removeBuddyAction.buddyJid = buddy.username;
+            removeBuddyAction.accountKey = buddy.accountUniqueId;
+            [removeBuddyAction saveWithTransaction:transaction];
+        }
+        
         [transaction removeObjectsForKeys:[buddies valueForKey:NSStringFromSelector(@selector(uniqueId))] inCollection:[OTRXMPPBuddy collection]];
     }];
 

ChatSecure/Classes/Model/Yap Storage/YapActions/BuddyActions.swift

@@ -75,19 +75,8 @@ open class BuddyAction: OTRYapDatabaseObject, YapActionable {
 }
 
 open class OTRYapBuddyAction :OTRYapDatabaseObject, YapTaskQueueAction {
-    var buddyKey:String = ""
-    var date:Date = Date()
-    var accountKey:String?
-    
-    public override init() {
-        super.init()
-    }
-
-    public init(buddyKey:String) {
-        super.init()
-        self.buddyKey = buddyKey
-        self.date = Date()
-    }
+    open var buddyKey:String = ""
+    open var date:Date = Date()
 
     override open var uniqueId: String {
         return buddyKey
@@ -96,18 +85,6 @@ open class OTRYapBuddyAction :OTRYapDatabaseObject, YapTaskQueueAction {
     override open static func collection() -> String {
         return OTRYapMessageSendAction.collection()
     }
-
-    required public init(dictionary dictionaryValue: [AnyHashable : Any]!) throws {
-        try super.init(dictionary: dictionaryValue)
-    }
-
-    required public init!(coder: NSCoder!) {
-        super.init(coder: coder)
-    }
-
-    required public init?(uniqueId: String) {
-        super.init(uniqueId: uniqueId)
-    }
 
     /// The yap key of this item
     public func yapKey() -> String {
@@ -141,3 +118,7 @@ open class OTRYapAddBuddyAction :OTRYapBuddyAction, YapDatabaseRelationshipNode
     }
 }
 
+open class OTRYapRemoveBuddyAction :OTRYapBuddyAction {
+    open var accountKey:String?
+    open var buddyJid:String?
+}

ChatSecure/Classes/View Controllers/OTRComposeViewController.m

@@ -456,9 +456,10 @@ - (void)removeThreadOwner:(id<OTRThreadOwner>)threadOwner {
     [self.readWriteConnection asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction * _Nonnull transaction) {
         OTRBuddy *dbBuddy = [OTRBuddy fetchObjectWithUniqueID:key transaction:transaction];
         if (dbBuddy) {
-            BuddyAction *action = [[BuddyAction alloc] init];
-            action.buddy = dbBuddy;
-            action.action = BuddyActionTypeDelete;
+            OTRYapRemoveBuddyAction *action = [[OTRYapRemoveBuddyAction alloc] init];
+            action.buddyKey = dbBuddy.uniqueId;
+            action.buddyJid = dbBuddy.username;
+            action.accountKey = dbBuddy.accountUniqueId;
             [action saveWithTransaction:transaction];
             [dbBuddy removeWithTransaction:transaction];
         }