Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge f457c1a into cabd3b2
Browse files Browse the repository at this point in the history
paulb777 authored Jun 15, 2024

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
2 parents cabd3b2 + f457c1a commit ced9dc8
Showing 7 changed files with 14 additions and 10 deletions.
4 changes: 4 additions & 0 deletions FirebaseMessaging/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 10.29.0
- [fixed] Renamed "initWithFileName" internal method that was causing submission issues for some
users. (#13134).

# 10.27.0
- [fixed] Fixed bug preventing Messaging from working with a custom sqlite3
dependency (#12900).
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@
*
* @return Helper which allows to read write data to a backup excluded plist.
*/
- (instancetype)initWithFileName:(NSString *)fileName subDirectory:(NSString *)subDirectory;
- (instancetype)initWithPlistFile:(NSString *)fileName subDirectory:(NSString *)subDirectory;

/**
* Write dictionary data to the backup excluded plist file. If the file does not exist
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ @interface FIRMessagingBackupExcludedPlist ()

@implementation FIRMessagingBackupExcludedPlist

- (instancetype)initWithFileName:(NSString *)fileName subDirectory:(NSString *)subDirectory {
- (instancetype)initWithPlistFile:(NSString *)fileName subDirectory:(NSString *)subDirectory {
self = [super init];
if (self) {
_fileName = [fileName copy];
4 changes: 2 additions & 2 deletions FirebaseMessaging/Sources/Token/FIRMessagingCheckinStore.m
Original file line number Diff line number Diff line change
@@ -48,8 +48,8 @@ - (instancetype)init {
self = [super init];
if (self) {
_plist = [[FIRMessagingBackupExcludedPlist alloc]
initWithFileName:kCheckinFileName
subDirectory:kFIRMessagingInstanceIDSubDirectoryName];
initWithPlistFile:kCheckinFileName
subDirectory:kFIRMessagingInstanceIDSubDirectoryName];
_keychain =
[[FIRMessagingAuthKeychain alloc] initWithIdentifier:kFIRMessagingCheckinKeychainGeneric];
}
Original file line number Diff line number Diff line change
@@ -44,8 +44,8 @@ @implementation FIRMessagingBackupExcludedPlistTest
- (void)setUp {
[super setUp];
[FIRMessaging createSubDirectory:kSubDirectoryName];
self.plist = [[FIRMessagingBackupExcludedPlist alloc] initWithFileName:kTestPlistFileName
subDirectory:kSubDirectoryName];
self.plist = [[FIRMessagingBackupExcludedPlist alloc] initWithPlistFile:kTestPlistFileName
subDirectory:kSubDirectoryName];
}

- (void)tearDown {
Original file line number Diff line number Diff line change
@@ -67,8 +67,8 @@ - (void)setUp {
[super setUp];
[FIRMessaging createSubDirectory:kSubDirectoryName];
self.checkinStore = [[FIRMessagingCheckinStore alloc] init];
self.plist = [[FIRMessagingBackupExcludedPlist alloc] initWithFileName:kFakeCheckinPlistName
subDirectory:kSubDirectoryName];
self.plist = [[FIRMessagingBackupExcludedPlist alloc] initWithPlistFile:kFakeCheckinPlistName
subDirectory:kSubDirectoryName];
self.checkinStore.plist = self.plist;
}

Original file line number Diff line number Diff line change
@@ -76,8 +76,8 @@ - (void)setUp {
[FIRMessaging createSubDirectory:kSubDirectoryName];

self.checkinPlist =
[[FIRMessagingBackupExcludedPlist alloc] initWithFileName:kFakeCheckinPlistName
subDirectory:kSubDirectoryName];
[[FIRMessagingBackupExcludedPlist alloc] initWithPlistFile:kFakeCheckinPlistName
subDirectory:kSubDirectoryName];

// checkin store
FIRMessagingFakeKeychain *fakeKeychain = [[FIRMessagingFakeKeychain alloc] init];

0 comments on commit ced9dc8

Please sign in to comment.