PubNub SDK 4.7.7 Release (#369)

parfeon · web-flow · commit 85d7b282c9ee · 2018-02-14T03:21:32.000+02:00
* fixed log file attributes to prevent their backup locally or to iCloud (CE-3153).
* fixed issue because of which channel(s) and/or group(s) wasn't able to maintain user's presence with heartbeat (CE-3152)
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,9 +1,19 @@
 --- 
 name: objective-c
 scm: github.com/pubnub/objective-c
-version: "4.7.6"
+version: "4.7.7"
 schema: 1
 changelog: 
+  -
+    changes:
+      -
+        text: "Fixed issue because of which channel(s) and/or group(s) wasn't able to maintain user's presence with heartbeat."
+        type: bug
+      -
+        text: "Fixed log file attributes to prevent their backup locally or to iCloud."
+        type: improvement
+    date: Feb 14, 18
+    version: v4.7.7
   -
     changes:
       -
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+14-02-2018 - 0e9968f - 4.7.7
+. fixed issue because of which channel(s) and/or group(s) wasn't able to maintain user's presence with heartbeat.
+. fixed log file attributes to prevent their backup locally or to iCloud.
+
 01-02-2018 - f2e6792 - 4.7.6
 . fixed issue because of which new 'connected' presence API wasn't able to 'disconnect' user.
 . fixed behavior during unsubscribe - connect event won't fire after user 'disconnectec', because there is no new channels about which listeners should be notified.
diff --git a/Example/PubNub Example.xcodeproj/project.pbxproj b/Example/PubNub Example.xcodeproj/project.pbxproj
@@ -54,7 +54,7 @@
 		6003F5A6195388D20070C39A /* PNViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PNViewController.m; sourceTree = "<group>"; };
 		6003F5A8195388D20070C39A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		689DC9F68C012D3E869E6C60 /* Pods-PubNub_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PubNub_Example.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-PubNub_Example/Pods-PubNub_Example.debug.xcconfig"; sourceTree = "<group>"; };
-		78D5FDD94AEDFE48ED24E6A4 /* PubNub.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = PubNub.podspec; path = ../PubNub.podspec; sourceTree = "<group>"; };
+		78D5FDD94AEDFE48ED24E6A4 /* PubNub.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = PubNub.podspec; path = ../PubNub.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		793D26AC1B44048900509447 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CHANGELOG; path = ../CHANGELOG; sourceTree = "<group>"; };
 		793D26AE1B44049400509447 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = VERSION; path = ../VERSION; sourceTree = "<group>"; };
 		7A9945019D33BCC2C3B3B7C1 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
diff --git a/Framework/PubNub/Info.plist b/Framework/PubNub/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>PubNub</string>
 	<key>CFBundleGetInfoString</key>
-	<string>4.7.6</string>
+	<string>4.7.7</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.pubnub.pubnub-objc</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.7.6</string>
+	<string>4.7.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.7.6</string>
+	<string>4.7.7</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>© 2010 - 2018 PubNub, Inc.</string>
 	<key>NSPrincipalClass</key>
diff --git a/Framework/PubNub/PubNub-Fabric-Info.plist b/Framework/PubNub/PubNub-Fabric-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>PubNub</string>
 	<key>CFBundleGetInfoString</key>
-	<string>4.7.6</string>
+	<string>4.7.7</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.pubnub.pubnub-objc</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.7.6</string>
+	<string>4.7.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.7.6</string>
+	<string>4.7.7</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>© 2010 - 2018 PubNub, Inc.</string>
 	<key>NSPrincipalClass</key>
diff --git a/Framework/PubNub/PubNub-iOS-Info.plist b/Framework/PubNub/PubNub-iOS-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>PubNub</string>
 	<key>CFBundleGetInfoString</key>
-	<string>4.7.6</string>
+	<string>4.7.7</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.pubnub.pubnub-objc</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.7.6</string>
+	<string>4.7.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.7.6</string>
+	<string>4.7.7</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>© 2010 - 2018 PubNub, Inc.</string>
 	<key>NSPrincipalClass</key>
diff --git a/Framework/PubNub/PubNub-tvOS-Info.plist b/Framework/PubNub/PubNub-tvOS-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>PubNub</string>
 	<key>CFBundleGetInfoString</key>
-	<string>4.7.6</string>
+	<string>4.7.7</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.pubnub.pubnub-objc</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.7.6</string>
+	<string>4.7.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.7.6</string>
+	<string>4.7.7</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>© 2010 - 2018 PubNub, Inc.</string>
 	<key>NSPrincipalClass</key>
diff --git a/Framework/PubNub/PubNub-watchOS-Info.plist b/Framework/PubNub/PubNub-watchOS-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>PubNub</string>
 	<key>CFBundleGetInfoString</key>
-	<string>4.7.6</string>
+	<string>4.7.7</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.pubnub.pubnub-objc</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.7.6</string>
+	<string>4.7.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.7.6</string>
+	<string>4.7.7</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>© 2010 - 2018 PubNub, Inc.</string>
 	<key>NSPrincipalClass</key>
diff --git a/PubNub.podspec b/PubNub.podspec
@@ -9,7 +9,7 @@
 
 Pod::Spec.new do |spec|
     spec.name     = 'PubNub'
-    spec.version  = '4.7.6'
+    spec.version  = '4.7.7'
     spec.summary  = 'The PubNub Real-Time Network. Build real-time apps quickly and scale them globally.'
     spec.homepage = 'https://github.com/pubnub/objective-c'
 
diff --git a/PubNub/Data/Builders/API Call/Presence/PNPresenceHeartbeatAPICallBuilder.h b/PubNub/Data/Builders/API Call/Presence/PNPresenceHeartbeatAPICallBuilder.h
@@ -54,7 +54,7 @@ NS_ASSUME_NONNULL_BEGIN
  * @discussion On block call return block which consume (\b required) presence change completion block
  *             which pass only one argument - operation processing status object.
  */
-@property (nonatomic, readonly, strong) void(^performWithCompletion)(PNStatusBlock block);
+@property (nonatomic, readonly, strong) void(^performWithCompletion)(PNStatusBlock __nullable block);
 
 #pragma mark -
 
diff --git a/PubNub/Data/Managers/PNHeartbeat.h b/PubNub/Data/Managers/PNHeartbeat.h
@@ -131,7 +131,7 @@ NS_ASSUME_NONNULL_BEGIN
 
  @since 4.0
  */
-- (void)stopHeartbeatIfPossible;
+- (BOOL)stopHeartbeatIfPossible;
 
 #pragma mark -
 
diff --git a/PubNub/Data/Managers/PNHeartbeat.m b/PubNub/Data/Managers/PNHeartbeat.m
@@ -231,15 +231,15 @@ - (void)setConnected:(BOOL)connected forChannelGroups:(NSArray<NSString *> *)cha
 - (void)startHeartbeatIfRequired {
 
     // Stop previous heartbeat timer if it has been launched.
-    [self stopHeartbeatIfPossible];
+    BOOL heartbeatTimerStopped = [self stopHeartbeatIfPossible];
     
     // Silence static analyzer warnings.
     // Code is aware about this case and at the end will simply call on 'nil' object method.
     // In most cases if referenced object become 'nil' it mean what there is no more need in
     // it and probably whole client instance has been deallocated.
     #pragma clang diagnostic push
     #pragma clang diagnostic ignored "-Warc-repeated-use-of-weak"
-    if (self.client.configuration.presenceHeartbeatInterval > 0) {
+    if (self.client.configuration.presenceHeartbeatInterval > 0 && heartbeatTimerStopped) {
         
         __weak __typeof(self) weakSelf = self;
         dispatch_queue_t timerQueue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
@@ -254,11 +254,28 @@ - (void)startHeartbeatIfRequired {
     #pragma clang diagnostic pop
 }
 
-- (void)stopHeartbeatIfPossible {
-
-    dispatch_source_t timer = self.heartbeatTimer;
-    if (timer != NULL && dispatch_source_testcancel(timer) == 0) { dispatch_source_cancel(timer); }
-    self.heartbeatTimer = nil;
+- (BOOL)stopHeartbeatIfPossible {
+    
+    __block BOOL shouldStopHeartbeatTimer = YES;
+    dispatch_barrier_sync(self.resourceAccessQueue, ^{
+        /**
+         * Heartbeat should keep previous interval usage in case if there is channel and or groups
+         * which is not part of subscription loop and user's presence on them kept only by heartbeat.
+         */
+        if (self->_presenceChannels.count || self->_presenceChannelGroups.count) {
+            shouldStopHeartbeatTimer = !self->_heartbeatTimer;
+        }
+        
+        if (shouldStopHeartbeatTimer && self->_heartbeatTimer != NULL && dispatch_source_testcancel(self->_heartbeatTimer) == 0) {
+            dispatch_source_cancel(self->_heartbeatTimer);
+        }
+        
+        if (shouldStopHeartbeatTimer) {
+            self->_heartbeatTimer = nil;
+        }
+    });
+    
+    return shouldStopHeartbeatTimer;
 }
 
 
diff --git a/PubNub/Data/PNConfiguration.m b/PubNub/Data/PNConfiguration.m
@@ -123,7 +123,7 @@ - (void)setPresenceHeartbeatValue:(NSInteger)presenceHeartbeatValue {
     _presenceHeartbeatValue = presenceHeartbeatValue;
     if (self.presenceHeartbeatInterval == 0) { 
         
-        _presenceHeartbeatInterval = (NSInteger)(_presenceHeartbeatValue * 0.5f);
+        _presenceHeartbeatInterval = (NSInteger)(_presenceHeartbeatValue * 0.5f) - 1;
     }
 }
 
diff --git a/PubNub/Misc/Logger/Data/PNLLogFileInformation.m b/PubNub/Misc/Logger/Data/PNLLogFileInformation.m
@@ -63,6 +63,13 @@ - (instancetype)initForFileAtPath:(NSString *)path;
 
 #pragma mark - Misc
 
+/**
+ * @brief  Exclude represented file from device local and iCloud backups.
+ *
+ * @since 4.7.7
+ */
+- (void)excludeFromBackup;
+
 /**
  @brief  Check whether referenced file has attribute with specified \c name or not.
  
@@ -157,6 +164,8 @@ - (instancetype)initForFileAtPath:(NSString *)path {
         _path = [path copy];
         _name = [[_path lastPathComponent] copy];
         _extension = ([_path pathExtension].length ? [_path pathExtension] : nil);
+        
+        [self excludeFromBackup];
     }
     
     return self;
@@ -176,6 +185,17 @@ - (BOOL)isEqual:(id)object {
     return isEqual;
 }
 
+- (void)excludeFromBackup {
+    
+    NSError *error = nil;
+    
+    if (![[NSURL fileURLWithPath:self.path] setResourceValue:@YES forKey:NSURLIsExcludedFromBackupKey error:&error]) {
+#if DEBUG
+        NSLog(@"PNLLogger: '%@' attribute set did dail for '%@': %@", NSURLIsExcludedFromBackupKey, self.path, error);
+#endif // DEBUG
+    }
+}
+
 - (BOOL)hasExtendedAttribute:(NSString *)name {
     
     return (getxattr([self.path UTF8String], [name UTF8String], NULL, 0, 0, 0) > 0);
diff --git a/PubNub/Misc/PNConstants.h b/PubNub/Misc/PNConstants.h
@@ -15,10 +15,10 @@
 #pragma mark General information constants
 
 // Stores client library version number
-static NSString * const kPNLibraryVersion = @"4.7.6";
+static NSString * const kPNLibraryVersion = @"4.7.7";
 
 // Stores information about SDK codebase
-static NSString * const kPNCommit = @"f2e6792708441738fd45c1ffda9a66a1e6355a0a";
+static NSString * const kPNCommit = @"0e9968f2667152f47bf0a0d41d10172e4f15cb60";
 
 /**
  @brief  Stores reference on unique identifier which is used to identify \b PubNub client among other 
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# PubNub 4.7.6 for iOS 7+
+# PubNub 4.7.7 for iOS 7+
 [![Twitter](https://img.shields.io/badge/twitter-%40PubNub-blue.svg?style=flat)](https://twitter.com/PubNub)
 [![Twitter Releases](https://img.shields.io/badge/twitter-%40PubNubRelease-blue.svg?style=flat)](https://twitter.com/PubNubRelease)
 [![License](https://img.shields.io/github/license/pubnub/objective-c.svg?style=flat)](https://img.shields.io/github/license/pubnub/objective-c.svg)
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.7.6
+4.7.7
