diff options
author | Chen Liang <chliang@google.com> | 2018-02-06 18:13:54 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-06 18:13:54 -0800 |
commit | 976635fd87a1abbb9c28590a6377a4b887583ab1 (patch) | |
tree | a423a313121c18a70f42a9f92b5c53d2f2aa1ecc | |
parent | 4b0dc137c2279cffe91f2792c9027183fc55078b (diff) |
avoid using initWithSuiteName which does not support iOS 7 (#765)
-rw-r--r-- | Example/Messaging/Tests/FIRMessagingTest.m | 5 | ||||
-rw-r--r-- | Firebase/Messaging/FIRMessaging.m | 4 | ||||
-rw-r--r-- | Firebase/Messaging/FIRMessaging_Private.h | 1 |
3 files changed, 3 insertions, 7 deletions
diff --git a/Example/Messaging/Tests/FIRMessagingTest.m b/Example/Messaging/Tests/FIRMessagingTest.m index 86ed647..0052e1b 100644 --- a/Example/Messaging/Tests/FIRMessagingTest.m +++ b/Example/Messaging/Tests/FIRMessagingTest.m @@ -54,9 +54,8 @@ extern NSString *const kFIRMessagingFCMTokenFetchAPNSOption; _mockMessaging = OCMPartialMock(self.messaging); _mockInstanceIDProxy = OCMPartialMock(self.messaging.instanceIDProxy); self.messaging.instanceIDProxy = _mockInstanceIDProxy; - [self.messaging.messagingUserDefaults removePersistentDomainForName:kFIRMessagingSuiteName]; - self.messaging.messagingUserDefaults = - [[NSUserDefaults alloc] initWithSuiteName:kFIRMessagingSuiteName]; + [[NSUserDefaults standardUserDefaults] + removePersistentDomainForName:[NSBundle mainBundle].bundleIdentifier]; } - (void)tearDown { diff --git a/Firebase/Messaging/FIRMessaging.m b/Firebase/Messaging/FIRMessaging.m index 3132831..1cc9a6c 100644 --- a/Firebase/Messaging/FIRMessaging.m +++ b/Firebase/Messaging/FIRMessaging.m @@ -72,8 +72,6 @@ NSString * const FIRMessagingRegistrationTokenRefreshedNotification = NSString *const kFIRMessagingUserDefaultsKeyAutoInitEnabled = @"com.firebase.messaging.auto-init.enabled"; // Auto Init Enabled key stored in NSUserDefaults -NSString *const kFIRMessagingSuiteName = - @"com.firebase.messaging.user_defaults"; // Suite name for NSUserDefaults static NSString *const kFIRMessagingPlistAutoInitEnabled = @"FirebaseMessagingAutoInitEnabled"; // Auto Init Enabled key stored in Info.plist @@ -175,7 +173,7 @@ static NSString *const kFIRMessagingPlistAutoInitEnabled = if (self) { _loggedMessageIDs = [NSMutableSet set]; _instanceIDProxy = [[FIRMessagingInstanceIDProxy alloc] init]; - _messagingUserDefaults = [[NSUserDefaults alloc] initWithSuiteName:kFIRMessagingSuiteName]; + _messagingUserDefaults = [NSUserDefaults standardUserDefaults]; } return self; } diff --git a/Firebase/Messaging/FIRMessaging_Private.h b/Firebase/Messaging/FIRMessaging_Private.h index 135f091..496fea4 100644 --- a/Firebase/Messaging/FIRMessaging_Private.h +++ b/Firebase/Messaging/FIRMessaging_Private.h @@ -26,7 +26,6 @@ typedef NS_ENUM(int8_t, FIRMessagingNetworkStatus) { }; FOUNDATION_EXPORT NSString *const kFIRMessagingUserDefaultsKeyAutoInitEnabled; -FOUNDATION_EXPORT NSString *const kFIRMessagingSuiteName; @interface FIRMessagingRemoteMessage () |