aboutsummaryrefslogtreecommitdiffhomepage
path: root/Firebase/Messaging/FIRMessaging.m
diff options
context:
space:
mode:
authorGravatar Riz <rsattar@gmail.com>2017-05-24 17:29:09 -0700
committerGravatar GitHub <noreply@github.com>2017-05-24 17:29:09 -0700
commit2c133b34b0d3cbbe27b9206d57fe69140e5db6b3 (patch)
tree7c3959cd04e4a9b1c0fced611d51253353f402fa /Firebase/Messaging/FIRMessaging.m
parentdb7f85b9d43906adb99524185d7c375d2161c152 (diff)
Clean up logging and configuration in Messaging (#28)
* Remove mostly unused code from FIRMessagingLogger This cleans up some left-over old logging logic from before we moved to FIRLogger in Firebase Core. We no longer need this logging functionality. * Delete FIRMessagingConfig.{h,m} We no longer need a config class to store an unused log level filter (that filter is no longer needed).
Diffstat (limited to 'Firebase/Messaging/FIRMessaging.m')
-rw-r--r--Firebase/Messaging/FIRMessaging.m26
1 files changed, 4 insertions, 22 deletions
diff --git a/Firebase/Messaging/FIRMessaging.m b/Firebase/Messaging/FIRMessaging.m
index 94347c8..f9a5f50 100644
--- a/Firebase/Messaging/FIRMessaging.m
+++ b/Firebase/Messaging/FIRMessaging.m
@@ -24,7 +24,6 @@
#import <UIKit/UIKit.h>
#import "FIRMessagingClient.h"
-#import "FIRMessagingConfig.h"
#import "FIRMessagingConstants.h"
#import "FIRMessagingContextManagerService.h"
#import "FIRMessagingDataMessageManager.h"
@@ -133,7 +132,6 @@ NSString * const FIRMessagingRegistrationTokenRefreshedNotification =
// Due to our packaging requirements, we can't directly depend on FIRInstanceID currently.
@property(nonatomic, readwrite, strong) FIRMessagingInstanceIDProxy *instanceIDProxy;
-@property(nonatomic, readwrite, strong) FIRMessagingConfig *config;
@property(nonatomic, readwrite, assign) BOOL isClientSetup;
@property(nonatomic, readwrite, strong) FIRMessagingClient *client;
@@ -157,18 +155,15 @@ NSString * const FIRMessagingRegistrationTokenRefreshedNotification =
static FIRMessaging *messaging;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
- // Start Messaging (Fully initialize in one place).
- FIRMessagingConfig *config = [FIRMessagingConfig defaultConfig];
- messaging = [[FIRMessaging alloc] initWithConfig:config];
+ messaging = [[FIRMessaging alloc] initPrivately];
[messaging start];
});
return messaging;
}
-- (instancetype)initWithConfig:(FIRMessagingConfig *)config {
+- (instancetype)initPrivately {
self = [super init];
if (self) {
- _config = config;
_loggedMessageIDs = [NSMutableSet set];
_instanceIDProxy = [[FIRMessagingInstanceIDProxy alloc] init];
}
@@ -192,11 +187,9 @@ NSString * const FIRMessagingRegistrationTokenRefreshedNotification =
#pragma mark - Config
- (void)start {
- _FIRMessagingDevAssert(self.config, @"Invalid nil config in FIRMessagingService");
[self saveLibraryVersion];
- [self setupLogger:self.config.logLevel];
- [self setupReceiverWithConfig:self.config];
+ [self setupReceiver];
NSString *hostname = kFIRMessagingReachabilityHostname;
self.reachability = [[FIRReachabilityChecker alloc] initWithReachabilityDelegate:self
@@ -259,18 +252,7 @@ NSString * const FIRMessagingRegistrationTokenRefreshedNotification =
currentLibraryVersion);
}
-- (void)setupLogger:(FIRMessagingLogLevel)loggerLevel {
-#if FIRMessaging_PROBER
- // do nothing
-#else
- FIRMessagingLogger *logger = FIRMessagingSharedLogger();
- FIRMessagingLogLevelFilter *filter =
- [[FIRMessagingLogLevelFilter alloc] initWithLevel:loggerLevel];
- [logger setFilter:filter];
-#endif
-}
-
-- (void)setupReceiverWithConfig:(FIRMessagingConfig *)config {
+- (void)setupReceiver {
self.receiver = [[FIRMessagingReceiver alloc] init];
self.receiver.delegate = self;
}