Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use standardUserDefaults instead of initWithSuiteName to support ios 7 #765

Merged
merged 1 commit into from
Feb 7, 2018
Merged

use standardUserDefaults instead of initWithSuiteName to support ios 7 #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Example/Messaging/Tests/FIRMessagingTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 1 addition & 3 deletions Firebase/Messaging/FIRMessaging.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion Firebase/Messaging/FIRMessaging_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ typedef NS_ENUM(int8_t, FIRMessagingNetworkStatus) {
};

FOUNDATION_EXPORT NSString *const kFIRMessagingUserDefaultsKeyAutoInitEnabled;
FOUNDATION_EXPORT NSString *const kFIRMessagingSuiteName;

@interface FIRMessagingRemoteMessage ()

Expand Down