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/FIRMessaging.m | 23 +++++++++++------------ Firebase/Messaging/FIRMessagingClient.h | 4 ++-- Firebase/Messaging/FIRMessagingClient.m | 10 +++++----- 3 files changed, 18 insertions(+), 19 deletions(-) (limited to 'Firebase/Messaging') diff --git a/Firebase/Messaging/FIRMessaging.m b/Firebase/Messaging/FIRMessaging.m index 1152032..5dd7004 100644 --- a/Firebase/Messaging/FIRMessaging.m +++ b/Firebase/Messaging/FIRMessaging.m @@ -37,8 +37,8 @@ #import "FIRMessagingVersionUtilities.h" #import -#import #import +#import #import "NSError+FIRMessaging.h" @@ -125,7 +125,7 @@ NSString *const kFIRMessagingPlistAutoInitEnabled = @end @interface FIRMessaging () + GULReachabilityDelegate> // FIRApp properties @property(nonatomic, readwrite, strong) NSData *apnsTokenData; @@ -136,7 +136,7 @@ NSString *const kFIRMessagingPlistAutoInitEnabled = @property(nonatomic, readwrite, assign) BOOL isClientSetup; @property(nonatomic, readwrite, strong) FIRMessagingClient *client; -@property(nonatomic, readwrite, strong) FIRReachabilityChecker *reachability; +@property(nonatomic, readwrite, strong) GULReachabilityChecker *reachability; @property(nonatomic, readwrite, strong) FIRMessagingDataMessageManager *dataMessageManager; @property(nonatomic, readwrite, strong) FIRMessagingPubSub *pubsub; @property(nonatomic, readwrite, strong) FIRMessagingRmqManager *rmq2Manager; @@ -200,8 +200,7 @@ NSString *const kFIRMessagingPlistAutoInitEnabled = [self setupReceiver]; NSString *hostname = kFIRMessagingReachabilityHostname; - self.reachability = [[FIRReachabilityChecker alloc] initWithReachabilityDelegate:self - loggerDelegate:nil + self.reachability = [[GULReachabilityChecker alloc] initWithReachabilityDelegate:self withHost:hostname]; [self.reachability start]; @@ -800,10 +799,10 @@ NSString *const kFIRMessagingPlistAutoInitEnabled = } } -#pragma mark - FIRReachabilityDelegate +#pragma mark - GULReachabilityDelegate -- (void)reachability:(FIRReachabilityChecker *)reachability - statusChanged:(FIRReachabilityStatus)status { +- (void)reachability:(GULReachabilityChecker *)reachability + statusChanged:(GULReachabilityStatus)status { [self onNetworkStatusChanged]; } @@ -821,15 +820,15 @@ NSString *const kFIRMessagingPlistAutoInitEnabled = } - (BOOL)isNetworkAvailable { - FIRReachabilityStatus status = self.reachability.reachabilityStatus; - return (status == kFIRReachabilityViaCellular || status == kFIRReachabilityViaWifi); + GULReachabilityStatus status = self.reachability.reachabilityStatus; + return (status == kGULReachabilityViaCellular || status == kGULReachabilityViaWifi); } - (FIRMessagingNetworkStatus)networkType { - FIRReachabilityStatus status = self.reachability.reachabilityStatus; + GULReachabilityStatus status = self.reachability.reachabilityStatus; if (![self isNetworkAvailable]) { return kFIRMessagingReachabilityNotReachable; - } else if (status == kFIRReachabilityViaCellular) { + } else if (status == kGULReachabilityViaCellular) { return kFIRMessagingReachabilityReachableViaWWAN; } else { return kFIRMessagingReachabilityReachableViaWiFi; diff --git a/Firebase/Messaging/FIRMessagingClient.h b/Firebase/Messaging/FIRMessagingClient.h index cb76e98..98337a3 100644 --- a/Firebase/Messaging/FIRMessagingClient.h +++ b/Firebase/Messaging/FIRMessagingClient.h @@ -16,7 +16,7 @@ #import "FIRMessaging.h" -@class FIRReachabilityChecker; +@class GULReachabilityChecker; @class GPBMessage; @class FIRMessagingConnection; @@ -48,7 +48,7 @@ typedef void(^FIRMessagingConnectCompletionHandler)(NSError *error); // Designated initializer - (instancetype)initWithDelegate:(id)delegate - reachability:(FIRReachabilityChecker *)reachability + reachability:(GULReachabilityChecker *)reachability rmq2Manager:(FIRMessagingRmqManager *)rmq2Manager; - (void)teardown; 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