[FIX] updated docs

novastone-media · Oct 8, 2015 · 3c3e2a0 · 3c3e2a0
1 parent 5e5f230
commit 3c3e2a0
Show file tree

Hide file tree

Showing 27 changed files with 443 additions and 306 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 MQTT-Client-Framework iOS Release Notes
 =======================================
 
-## MQTT-Client-Framework 0.3.1
+## MQTT-Client-Framework 0.3.1/2
 >Release date: 2015-10-08
 
 [NEW] comment out tvOS until Cocoapods supports it

diff --git a/MQTTClient.podspec b/MQTTClient.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name         = "MQTTClient"
-  s.version      = "0.3.1"
+  s.version      = "0.3.2"
   s.summary      = "iOS, OSX and tvOS native ObjectiveC MQTT Framework"
   s.homepage     = "https://github.com/ckrey/MQTT-Client-Framework"
   s.license      = { :type => "MIT", :file => "LICENSE" }
   s.author       = { "Christoph Krey" => "[email protected]" }
-  s.source       = { :git => "https://github.com/ckrey/MQTT-Client-Framework.git", :tag => "0.3.1" }
+  s.source       = { :git => "https://github.com/ckrey/MQTT-Client-Framework.git", :tag => "0.3.2" }
 
   s.source_files = "MQTTClient/MQTTClient", "MQTTClient/MQTTClient/**/*.{h,m}"
   s.requires_arc = true

diff --git a/MQTTClient/MQTTClientTests/MQTTClientTests.m b/MQTTClient/MQTTClientTests/MQTTClientTests.m
@@ -684,12 +684,13 @@ - (void)test_throttling_incoming_q0 {
                    withObject:nil
                    afterDelay:PROCESSING_TIMEOUT];
 
-        while ((self.processed != self.received || self.received != PROCESSING_NUMBER) && !self.timeout) {
+        while ((self.processed != self.received || self.received == 0) && !self.timeout) {
             NSLog(@"waiting for processing");
             [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]];
         }
 
         XCTAssert(!self.timeout, @"timeout");
+        [self.processingSimulationTimer invalidate];
 
         [self shutdown:parameters];
     }
@@ -744,7 +745,8 @@ - (void)test_throttling_incoming_q1 {
         }
 
         XCTAssert(!self.timeout, @"timeout");
-
+        [self.processingSimulationTimer invalidate];
+
         [self shutdown:parameters];
     }
 }
@@ -798,7 +800,8 @@ - (void)test_throttling_incoming_q2 {
         }
 
         XCTAssert(!self.timeout, @"timeout");
-
+        [self.processingSimulationTimer invalidate];
+
         [self shutdown:parameters];
     }
 }

diff --git a/MQTTClient/dist/MQTTClient.framework/Versions/A/Headers/MQTTSession.h b/MQTTClient/dist/MQTTClient.framework/Versions/A/Headers/MQTTSession.h
@@ -72,6 +72,22 @@ typedef NS_ENUM(NSInteger, MQTTSessionEvent) {
           retained:(BOOL)retained
                mid:(unsigned int)mid;
 
+/** gets called when a new message was received
+ @param session the MQTTSession reporting the new message
+ @param data the data received, might be zero length
+ @param topic the topic the data was published to
+ @param qos the qos of the message
+ @param retained indicates if the data retransmitted from server storage
+ @param mid the Message Identifier of the message if qos = 1 or 2, zero otherwise
+ @return true if the message was or will be processed, false if the message shall not be ack-ed
+ */
+- (BOOL)newMessageWithFeedback:(MQTTSession *)session
+                          data:(NSData *)data
+                       onTopic:(NSString *)topic
+                           qos:(MQTTQosLevel)qos
+                      retained:(BOOL)retained
+                           mid:(unsigned int)mid;
+
 /** for mqttio-OBJC backward compatibility
  @param session see newMessage for description
  @param data see newMessage for description

diff --git a/MQTTClient/dist/MQTTClient.framework/Versions/A/MQTTClient b/MQTTClient/dist/MQTTClient.framework/Versions/A/MQTTClient
diff --git a/MQTTClient/dist/documentation/html/Nodes.xml b/MQTTClient/dist/documentation/html/Nodes.xml
@@ -378,6 +378,11 @@
               <Path>protocol_m_q_t_t_session_delegate-p.html</Path>
               <Anchor>a85ecb50aa7dfb9865ec6acfd1192b92c</Anchor>
              </Node>
+             <Node>
+              <Name>newMessageWithFeedback:data:onTopic:qos:retained:mid:</Name>
+              <Path>protocol_m_q_t_t_session_delegate-p.html</Path>
+              <Anchor>a5e103157ac155294481ebca786bfb5fd</Anchor>
+             </Node>
              <Node>
               <Name>protocolError:error:</Name>
               <Path>protocol_m_q_t_t_session_delegate-p.html</Path>

diff --git a/MQTTClient/dist/documentation/html/Tokens.xml b/MQTTClient/dist/documentation/html/Tokens.xml
@@ -681,6 +681,17 @@
     <Anchor>a85ecb50aa7dfb9865ec6acfd1192b92c</Anchor>
     <DeclaredIn>MQTTSession.h</DeclaredIn>
   </Token>
+  <Token>
+    <TokenIdentifier>
+      <Name>newMessageWithFeedback:data:onTopic:qos:retained:mid:</Name>
+      <APILanguage>occ</APILanguage>
+      <Type>intfm</Type>
+      <Scope>MQTTSessionDelegate-p</Scope>
+    </TokenIdentifier>
+    <Path>protocol_m_q_t_t_session_delegate-p.html</Path>
+    <Anchor>a5e103157ac155294481ebca786bfb5fd</Anchor>
+    <DeclaredIn>MQTTSession.h</DeclaredIn>
+  </Token>
   <Token>
     <TokenIdentifier>
       <Name>session:newMessage:onTopic:</Name>
@@ -966,6 +977,17 @@
     <Anchor>a85ecb50aa7dfb9865ec6acfd1192b92c</Anchor>
     <DeclaredIn>MQTTSession.h</DeclaredIn>
   </Token>
+  <Token>
+    <TokenIdentifier>
+      <Name>newMessageWithFeedback:data:onTopic:qos:retained:mid:</Name>
+      <APILanguage>occ</APILanguage>
+      <Type>intfm</Type>
+      <Scope>MQTTSessionDelegate-p</Scope>
+    </TokenIdentifier>
+    <Path>protocol_m_q_t_t_session_delegate-p.html</Path>
+    <Anchor>a5e103157ac155294481ebca786bfb5fd</Anchor>
+    <DeclaredIn>MQTTSession.h</DeclaredIn>
+  </Token>
   <Token>
     <TokenIdentifier>
       <Name>session:newMessage:onTopic:</Name>