avoid using initWithSuiteName which does not support iOS 7 (#765)

firebase · Feb 7, 2018 · 976635f · 976635f
1 parent 4b0dc13
commit 976635f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/Example/Messaging/Tests/FIRMessagingTest.m b/Example/Messaging/Tests/FIRMessagingTest.m
@@ -54,9 +54,8 @@ - (void)setUp {
   _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
@@ -72,8 +72,6 @@
 
 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 @@ - (instancetype)initPrivately {
   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
@@ -26,7 +26,6 @@ typedef NS_ENUM(int8_t, FIRMessagingNetworkStatus) {
 };
 
 FOUNDATION_EXPORT NSString *const kFIRMessagingUserDefaultsKeyAutoInitEnabled;
-FOUNDATION_EXPORT NSString *const kFIRMessagingSuiteName;
 
 @interface FIRMessagingRemoteMessage ()