aboutsummaryrefslogtreecommitdiffhomepage
path: root/Firebase/Messaging/FIRMessaging.m
diff options
context:
space:
mode:
Diffstat (limited to 'Firebase/Messaging/FIRMessaging.m')
-rw-r--r--Firebase/Messaging/FIRMessaging.m8
1 files changed, 2 insertions, 6 deletions
diff --git a/Firebase/Messaging/FIRMessaging.m b/Firebase/Messaging/FIRMessaging.m
index fa4bdbc..1152032 100644
--- a/Firebase/Messaging/FIRMessaging.m
+++ b/Firebase/Messaging/FIRMessaging.m
@@ -36,6 +36,7 @@
#import "FIRMessagingUtilities.h"
#import "FIRMessagingVersionUtilities.h"
+#import <FirebaseCore/FIRAppInternal.h>
#import <FirebaseCore/FIRReachabilityChecker.h>
#import <FirebaseInstanceID/FirebaseInstanceID.h>
@@ -127,7 +128,6 @@ NSString *const kFIRMessagingPlistAutoInitEnabled =
FIRReachabilityDelegate>
// FIRApp properties
-@property(nonatomic, readwrite, copy) NSString *fcmSenderID;
@property(nonatomic, readwrite, strong) NSData *apnsTokenData;
@property(nonatomic, readwrite, strong) NSString *defaultFcmToken;
@@ -173,10 +173,6 @@ NSString *const kFIRMessagingPlistAutoInitEnabled =
_loggedMessageIDs = [NSMutableSet set];
_instanceID = instanceID;
_messagingUserDefaults = defaults;
-
- // TODO: Remove this once the race condition with FIRApp configuring and InstanceID
- // is fixed. This must be fixed before Core's flag becomes public.
- _globalAutomaticDataCollectionEnabled = YES;
}
return self;
}
@@ -479,7 +475,7 @@ NSString *const kFIRMessagingPlistAutoInitEnabled =
}
// If none of above exists, we default to the global switch that comes from FIRApp.
- return self.isGlobalAutomaticDataCollectionEnabled;
+ return [[FIRApp defaultApp] isAutomaticDataCollectionEnabled];
}
- (void)setAutoInitEnabled:(BOOL)autoInitEnabled {