From 98b6eef71eac368692ae249f056a75d89ed0350d Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 6 Jul 2018 09:37:23 -0700 Subject: Split GoogleUtilities from FirebaseCore (#1370) --- Firebase/Messaging/FIRMessagingClient.m | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Firebase/Messaging/FIRMessagingClient.m') diff --git a/Firebase/Messaging/FIRMessagingClient.m b/Firebase/Messaging/FIRMessagingClient.m index 0bfb5a8..9d8c558 100644 --- a/Firebase/Messaging/FIRMessagingClient.m +++ b/Firebase/Messaging/FIRMessagingClient.m @@ -16,7 +16,7 @@ #import "FIRMessagingClient.h" -#import +#import #import "FIRMessaging.h" #import "FIRMessagingConnection.h" @@ -82,7 +82,7 @@ static NSUInteger FIRMessagingServerPort() { // FIRMessagingService owns these instances @property(nonatomic, readwrite, weak) FIRMessagingRmqManager *rmq2Manager; -@property(nonatomic, readwrite, weak) FIRReachabilityChecker *reachability; +@property(nonatomic, readwrite, weak) GULReachabilityChecker *reachability; @property(nonatomic, readwrite, assign) int64_t lastConnectedTimestamp; @property(nonatomic, readwrite, assign) int64_t lastDisconnectedTimestamp; @@ -111,7 +111,7 @@ static NSUInteger FIRMessagingServerPort() { } - (instancetype)initWithDelegate:(id)delegate - reachability:(FIRReachabilityChecker *)reachability + reachability:(GULReachabilityChecker *)reachability rmq2Manager:(FIRMessagingRmqManager *)rmq2Manager { self = [super init]; if (self) { @@ -471,8 +471,8 @@ static NSUInteger FIRMessagingServerPort() { #pragma mark - Schedulers - (void)scheduleConnectRetry { - FIRReachabilityStatus status = self.reachability.reachabilityStatus; - BOOL isReachable = (status == kFIRReachabilityViaWifi || status == kFIRReachabilityViaCellular); + GULReachabilityStatus status = self.reachability.reachabilityStatus; + BOOL isReachable = (status == kGULReachabilityViaWifi || status == kGULReachabilityViaCellular); if (!isReachable) { FIRMessagingLoggerDebug(kFIRMessagingMessageCodeClient010, @"Internet not reachable when signing into MCS during a retry"); -- cgit v1.2.3