Updates to sending and message sequences

kordophone/Bridge/MBIMUpdateQueue.m

@@ -7,8 +7,15 @@
 //
 
 #import "MBIMUpdateQueue.h"
+#import "IMMessageItem+Encoded.h"
+#import "IMChat+Encoded.h"
+
+@interface MBIMUpdateItem (/*INTERNAL*/)
+@property (nonatomic, assign) NSUInteger messageSequenceNumber;
+@end
 
 @implementation MBIMUpdateQueue {
+    NSUInteger           _messageSequenceNumber;
     dispatch_queue_t     _accessQueue;
     NSMutableArray      *_consumers;
 }
@@ -30,6 +37,7 @@
     if (self) {
         _accessQueue = dispatch_queue_create("net.buzzert.MBIMUpdateQueue", DISPATCH_QUEUE_SERIAL);
         _consumers = [[NSMutableArray alloc] init];
+        _messageSequenceNumber = 0;
     }
     
     return self;
@@ -43,8 +51,19 @@
     });
 }
 
+- (void)removeConsumer:(MBIMUpdateConsumer)consumer
+{
+    __weak NSMutableArray *consumers = _consumers;
+    dispatch_async(_accessQueue, ^{
+        [consumers removeObject:consumer];
+    });
+}
+
 - (void)enqueueUpdateItem:(MBIMUpdateItem *)item
 {
+    _messageSequenceNumber++;
+    item.messageSequenceNumber = _messageSequenceNumber;
+    
     __weak NSMutableArray *consumers = _consumers;
     dispatch_async(_accessQueue, ^{
         for (MBIMUpdateConsumer consumer in consumers) {
@@ -58,4 +77,20 @@
 @end
 
 @implementation MBIMUpdateItem
+- (NSDictionary *)dictionaryRepresentation
+{
+    NSMutableDictionary *updateDict = [NSMutableDictionary dictionary];
+    updateDict[@"messageSequenceNumber"] = @(_messageSequenceNumber);
+    
+    if ([self changedChat]) {
+        updateDict[@"conversation"] = [[self changedChat] mbim_dictionaryRepresentation];
+    }
+    
+    if ([self addedMessage]) {
+        updateDict[@"message"] = [[self addedMessage] mbim_dictionaryRepresentation];
+    }
+    
+    return updateDict;
+}
+
 @end