ios support unsubscribe

Author: pinke

ios/RCTMqtt/Mqtt.h

@@ -6,10 +6,10 @@
 //  Copyright © 2016 Tuan PM. All rights reserved.
 //
 #import <Foundation/Foundation.h>
-#import "RCTBridgeModule.h"
-#import "RCTLog.h"
-#import "RCTUtils.h"
-#import "RCTEventDispatcher.h"
+#import <React/RCTBridgeModule.h>
+#import <React/RCTLog.h>
+#import <React/RCTUtils.h>
+#import <React/RCTEventDispatcher.h>
 
 #import <MQTTClient/MQTTClient.h>
 #import <MQTTClient/MQTTSessionManager.h>
@@ -25,5 +25,6 @@
 - (void) connect;
 - (void) disconnect;
 - (void) subscribe:(NSString *)topic qos:(NSNumber *)qos;
+- (void) unsubscribe:(NSString *)topic;
 - (void) publish:(NSString *) topic data:(NSData *)data qos:(NSNumber *)qos retain:(BOOL) retain;
-@end
+@end

ios/RCTMqtt/Mqtt.m

@@ -164,14 +164,35 @@ - (void) disconnect {
 }
 
 - (void) subscribe:(NSString *)topic qos:(NSNumber *)qos {
+
+    NSDictionary<NSString *, NSNumber *> *oldSubs=[self.manager subscriptions];
+    NSMutableDictionary<NSString *, NSNumber *>  *newSubscriptions=[NSMutableDictionary dictionaryWithObject:qos forKey:topic];
 
-    [self.manager setSubscriptions:[NSDictionary dictionaryWithObject:qos forKey:topic]];
+    for (NSString *topicFilter in oldSubs) {
+        if (![newSubscriptions objectForKey:topicFilter]) {
+            [newSubscriptions setObject:oldSubs[topicFilter] forKey:topicFilter];
+            
+        }
+    }
+    [self.manager setSubscriptions:newSubscriptions];
+    //[self.manager setSubscriptions:[NSDictionary dictionaryWithObject:qos forKey:topic]];
+}
+
+- (void) unsubscribe:(NSString *)topic {
+    NSDictionary<NSString *, NSNumber *> *oldSubs=[self.manager subscriptions];
+    NSMutableDictionary<NSString *, NSNumber *>  *newSubscriptions=[[NSMutableDictionary alloc] init];
+    for (NSString *topicFilter in oldSubs) {
+        if (![topic isEqualToString:topicFilter]) {
+            [newSubscriptions setObject:oldSubs[topicFilter] forKey:topicFilter];
+        }
+    }
+    [self.manager setSubscriptions:newSubscriptions];
 }
 
 - (void) publish:(NSString *) topic data:(NSData *)data qos:(NSNumber *)qos retain:(BOOL) retain {
     [self.manager sendData:data
                      topic:topic
-                       qos:[qos intValue]
+                       qos:(MQTTQosLevel)qos
                     retain:retain];
     //[data dataUsingEncoding:NSUTF8StringEncoding]
 }

ios/RCTMqtt/RCTMqtt.m

@@ -7,10 +7,10 @@
 //
 
 #import "RCTMqtt.h"
-#import "RCTBridgeModule.h"
-#import "RCTLog.h"
-#import "RCTUtils.h"
-#import "RCTEventDispatcher.h"
+#import <React/RCTBridgeModule.h>
+#import <React/RCTLog.h>
+#import <React/RCTUtils.h>
+#import <React/RCTEventDispatcher.h>
 
 #import <MQTTClient/MQTTClient.h>
 #import <MQTTClient/MQTTSessionManager.h>
@@ -85,37 +85,32 @@ - (void)appDidBecomeActive {
     resolve([NSNumber numberWithInt:clientRef]);
 
 }
-
-RCT_EXPORT_METHOD(removeClient:(int) clientRef
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(connect:(int) clientRef) {
 
-    [[self clients] removeObjectForKey:[NSNumber numberWithInt:clientRef]];
-    resolve([NSNumber numberWithInt:clientRef]);
+    [[[self clients] objectForKey:[NSNumber numberWithInt:clientRef]] connect];
 
 }
 
-RCT_EXPORT_METHOD(connect:(nonnull NSNumber *) clientRef) {
-    
-    [[[self clients] objectForKey:clientRef] connect];
-    
-}
 
+RCT_EXPORT_METHOD(disconnect:(int) clientRef) {
+    [[[self clients] objectForKey:[NSNumber numberWithInt:clientRef]] disconnect];
+}
 
-RCT_EXPORT_METHOD(disconnect:(nonnull NSNumber *) clientRef) {
-    [[[self clients] objectForKey:clientRef] disconnect];
+RCT_EXPORT_METHOD(subscribe:(int) clientRef topic:(NSString *)topic qos:(int)qos) {
+    [[[self clients] objectForKey:[NSNumber numberWithInt:clientRef]] subscribe:topic qos:[NSNumber numberWithInt:qos]];
+    
 }
 
-RCT_EXPORT_METHOD(subscribe:(nonnull NSNumber *) clientRef topic:(NSString *)topic qos:(nonnull NSNumber *)qos) {
-    [[[self clients] objectForKey:clientRef] subscribe:topic qos:qos]];
+RCT_EXPORT_METHOD(unsubscribe:(int) clientRef topic:(NSString *)topic) {
+    [[[self clients] objectForKey:[NSNumber numberWithInt:clientRef]] unsubscribe:topic];
 
 }
 
-RCT_EXPORT_METHOD(publish:(nonnull NSNumber *) clientRef topic:(NSString *)topic data:(NSString*)data qos:(nonnull NSNumber *)qos retain:(BOOL)retain) {
-    [[[self clients] objectForKey:clientRef] publish:topic
-                                                data:[data dataUsingEncoding:NSUTF8StringEncoding]
-                                                 qos:qos
-                                              retain:retain];
+RCT_EXPORT_METHOD(publish:(int) clientRef topic:(NSString *)topic data:(NSString*)data qos:(int)qos retain:(int)retain) {
+    [[[self clients] objectForKey:[NSNumber numberWithInt:clientRef]] publish:topic
+                                                                         data:[data dataUsingEncoding:NSUTF8StringEncoding]
+                                                                          qos:[NSNumber numberWithInt:qos]
+                                                                       retain:(BOOL)retain];
 
 }