From 67120348a050a0ef0056089c3df71cbd465d9adf Mon Sep 17 00:00:00 2001 From: Lingyi Zhang Date: Mon, 25 Jun 2018 15:11:45 -0700 Subject: Remove heartbeat timestamp (#1449) --- Firebase/Messaging/FIRMessaging.m | 2 +- Firebase/Messaging/FIRMessagingConnection.h | 1 - Firebase/Messaging/FIRMessagingConnection.m | 3 --- Firebase/Messaging/FIRMessagingSecureSocket.m | 4 ---- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Firebase/Messaging/FIRMessaging.m b/Firebase/Messaging/FIRMessaging.m index 100c18a..fa4bdbc 100644 --- a/Firebase/Messaging/FIRMessaging.m +++ b/Firebase/Messaging/FIRMessaging.m @@ -724,7 +724,7 @@ NSString *const kFIRMessagingPlistAutoInitEnabled = - (void)unsubscribeFromTopic:(NSString *)topic completion:(nullable FIRMessagingTopicOperationCompletion)completion { - if ([FIRMessagingPubSub hasTopicsPrefix:topic]) { + if ([FIRMessagingPubSub hasTopicsPrefix:topic]) { FIRMessagingLoggerWarn(kFIRMessagingMessageCodeTopicFormatIsDeprecated, @"Format '%@' is deprecated. Only '%@' should be used in " @"unsubscribeFromTopic.", diff --git a/Firebase/Messaging/FIRMessagingConnection.h b/Firebase/Messaging/FIRMessagingConnection.h index e78adbf..25a018c 100644 --- a/Firebase/Messaging/FIRMessagingConnection.h +++ b/Firebase/Messaging/FIRMessagingConnection.h @@ -67,7 +67,6 @@ typedef NS_ENUM(NSUInteger, FIRMessagingConnectionCloseReason) { */ @interface FIRMessagingConnection : NSObject -@property(nonatomic, readwrite, assign) int64_t lastHeartbeatPingTimestamp; @property(nonatomic, readonly, assign) FIRMessagingConnectionState state; @property(nonatomic, readonly, copy) NSString *host; @property(nonatomic, readonly, assign) NSUInteger port; diff --git a/Firebase/Messaging/FIRMessagingConnection.m b/Firebase/Messaging/FIRMessagingConnection.m index afbd0ba..8694326 100644 --- a/Firebase/Messaging/FIRMessagingConnection.m +++ b/Firebase/Messaging/FIRMessagingConnection.m @@ -460,9 +460,6 @@ static NSString *const kRemoteFromAddress = @"from"; } - (void)didReceiveHeartbeatAck:(GtalkHeartbeatAck *)heartbeatAck { -#if FIRMessaging_PROBER - self.lastHeartbeatPingTimestamp = FIRMessagingCurrentTimestampInSeconds(); -#endif } - (void)didReceiveDataMessageStanza:(GtalkDataMessageStanza *)dataMessageStanza { diff --git a/Firebase/Messaging/FIRMessagingSecureSocket.m b/Firebase/Messaging/FIRMessagingSecureSocket.m index b7e8133..3a03ee3 100644 --- a/Firebase/Messaging/FIRMessagingSecureSocket.m +++ b/Firebase/Messaging/FIRMessagingSecureSocket.m @@ -129,10 +129,6 @@ static NSUInteger SerializedSize(int32_t value) { BOOL isVOIPSocket = NO; -#if FIRMessaging_PROBER - isVOIPSocket = YES; -#endif - [self openStream:self.outStream isVOIPStream:isVOIPSocket]; [self openStream:self.inStream isVOIPStream:isVOIPSocket]; } -- cgit v1.2.3