fix connected property

set connected property in on_connect callback based on the return code value. fixes #8
mobile-web-messaging · May 14, 2014 · dde41f1 · dde41f1
1 parent 25ea739
commit dde41f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/MQTTKit/MQTTKit.m b/MQTTKit/MQTTKit.m
@@ -80,7 +80,7 @@ static void on_connect(struct mosquitto *mosq, void *obj, int rc)
 {
     MQTTClient* client = (__bridge MQTTClient*)obj;
     LogDebug(@"on_connect rc = %d", rc);
-    client.connected = YES;
+    client.connected = (rc == ConnectionAccepted);
     if (client.connectionCompletionHandler) {
         client.connectionCompletionHandler(rc);
     }
@@ -232,8 +232,6 @@ - (void) connectWithCompletionHandler:(void (^)(MQTTConnectionReturnCode code))c
         mosquitto_loop_forever(mosq, 10, 1);
         LogDebug(@"end mosquitto loop");
     });
-
-    self.connected = YES;
 }
 
 - (void)connectToHost:(NSString *)host

diff --git a/MQTTKitTests/MQTTKitTests.m b/MQTTKitTests/MQTTKitTests.m
@@ -88,6 +88,8 @@ - (void)testConnectOnUnknownServer
     }];
 
     XCTAssertFalse(gotSignal(connectError, 4));
+
+    XCTAssertFalse(client.connected);
 }
 
 - (void)testConnectDisconnect
@@ -105,6 +107,7 @@ - (void)testConnectDisconnect
     }];
 
     XCTAssertTrue(gotSignal(connected, 4));
+    XCTAssertTrue(client.connected);
 
     dispatch_semaphore_t disconnected = dispatch_semaphore_create(0);
 
@@ -113,6 +116,7 @@ - (void)testConnectDisconnect
     }];
 
     XCTAssertTrue(gotSignal(disconnected, 4));
+    XCTAssertFalse(client.connected);
 }
 
 - (void)testPublish