Skip to content

Commit 4726a73

Browse files
authored
[Messaging] Rename initWithFileName internal method (#13139)
1 parent cabd3b2 commit 4726a73

File tree

7 files changed

+14
-10
lines changed

7 files changed

+14
-10
lines changed

FirebaseMessaging/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 10.29.0
2+
- [fixed] Renamed "initWithFileName" internal method that was causing submission issues for some
3+
users. (#13134).
4+
15
# 10.27.0
26
- [fixed] Fixed bug preventing Messaging from working with a custom sqlite3
37
dependency (#12900).

FirebaseMessaging/Sources/Token/FIRMessagingBackupExcludedPlist.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
*
4040
* @return Helper which allows to read write data to a backup excluded plist.
4141
*/
42-
- (instancetype)initWithFileName:(NSString *)fileName subDirectory:(NSString *)subDirectory;
42+
- (instancetype)initWithPlistFile:(NSString *)fileName subDirectory:(NSString *)subDirectory;
4343

4444
/**
4545
* Write dictionary data to the backup excluded plist file. If the file does not exist

FirebaseMessaging/Sources/Token/FIRMessagingBackupExcludedPlist.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ @interface FIRMessagingBackupExcludedPlist ()
2828

2929
@implementation FIRMessagingBackupExcludedPlist
3030

31-
- (instancetype)initWithFileName:(NSString *)fileName subDirectory:(NSString *)subDirectory {
31+
- (instancetype)initWithPlistFile:(NSString *)fileName subDirectory:(NSString *)subDirectory {
3232
self = [super init];
3333
if (self) {
3434
_fileName = [fileName copy];

FirebaseMessaging/Sources/Token/FIRMessagingCheckinStore.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ - (instancetype)init {
4848
self = [super init];
4949
if (self) {
5050
_plist = [[FIRMessagingBackupExcludedPlist alloc]
51-
initWithFileName:kCheckinFileName
52-
subDirectory:kFIRMessagingInstanceIDSubDirectoryName];
51+
initWithPlistFile:kCheckinFileName
52+
subDirectory:kFIRMessagingInstanceIDSubDirectoryName];
5353
_keychain =
5454
[[FIRMessagingAuthKeychain alloc] initWithIdentifier:kFIRMessagingCheckinKeychainGeneric];
5555
}

FirebaseMessaging/Tests/UnitTests/FIRMessagingBackupExcludedPlistTest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ @implementation FIRMessagingBackupExcludedPlistTest
4444
- (void)setUp {
4545
[super setUp];
4646
[FIRMessaging createSubDirectory:kSubDirectoryName];
47-
self.plist = [[FIRMessagingBackupExcludedPlist alloc] initWithFileName:kTestPlistFileName
48-
subDirectory:kSubDirectoryName];
47+
self.plist = [[FIRMessagingBackupExcludedPlist alloc] initWithPlistFile:kTestPlistFileName
48+
subDirectory:kSubDirectoryName];
4949
}
5050

5151
- (void)tearDown {

FirebaseMessaging/Tests/UnitTests/FIRMessagingCheckinStoreTest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ - (void)setUp {
6767
[super setUp];
6868
[FIRMessaging createSubDirectory:kSubDirectoryName];
6969
self.checkinStore = [[FIRMessagingCheckinStore alloc] init];
70-
self.plist = [[FIRMessagingBackupExcludedPlist alloc] initWithFileName:kFakeCheckinPlistName
71-
subDirectory:kSubDirectoryName];
70+
self.plist = [[FIRMessagingBackupExcludedPlist alloc] initWithPlistFile:kFakeCheckinPlistName
71+
subDirectory:kSubDirectoryName];
7272
self.checkinStore.plist = self.plist;
7373
}
7474

FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenStoreTest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ - (void)setUp {
7676
[FIRMessaging createSubDirectory:kSubDirectoryName];
7777

7878
self.checkinPlist =
79-
[[FIRMessagingBackupExcludedPlist alloc] initWithFileName:kFakeCheckinPlistName
80-
subDirectory:kSubDirectoryName];
79+
[[FIRMessagingBackupExcludedPlist alloc] initWithPlistFile:kFakeCheckinPlistName
80+
subDirectory:kSubDirectoryName];
8181

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

0 commit comments

Comments
 (0)