From 4726a730e3ef9e7d3a69dcd7f07a3b49e3af6ab1 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 17 Jun 2024 06:53:26 -0700 Subject: [PATCH] [Messaging] Rename initWithFileName internal method (#13139) --- FirebaseMessaging/CHANGELOG.md | 4 ++++ .../Sources/Token/FIRMessagingBackupExcludedPlist.h | 2 +- .../Sources/Token/FIRMessagingBackupExcludedPlist.m | 2 +- FirebaseMessaging/Sources/Token/FIRMessagingCheckinStore.m | 4 ++-- .../Tests/UnitTests/FIRMessagingBackupExcludedPlistTest.m | 4 ++-- .../Tests/UnitTests/FIRMessagingCheckinStoreTest.m | 4 ++-- .../Tests/UnitTests/FIRMessagingTokenStoreTest.m | 4 ++-- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/FirebaseMessaging/CHANGELOG.md b/FirebaseMessaging/CHANGELOG.md index c718a756697..29aa94a6057 100644 --- a/FirebaseMessaging/CHANGELOG.md +++ b/FirebaseMessaging/CHANGELOG.md @@ -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). diff --git a/FirebaseMessaging/Sources/Token/FIRMessagingBackupExcludedPlist.h b/FirebaseMessaging/Sources/Token/FIRMessagingBackupExcludedPlist.h index 8ea043690b2..800654b0f9b 100644 --- a/FirebaseMessaging/Sources/Token/FIRMessagingBackupExcludedPlist.h +++ b/FirebaseMessaging/Sources/Token/FIRMessagingBackupExcludedPlist.h @@ -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 diff --git a/FirebaseMessaging/Sources/Token/FIRMessagingBackupExcludedPlist.m b/FirebaseMessaging/Sources/Token/FIRMessagingBackupExcludedPlist.m index ed509a88df4..812230b2154 100644 --- a/FirebaseMessaging/Sources/Token/FIRMessagingBackupExcludedPlist.m +++ b/FirebaseMessaging/Sources/Token/FIRMessagingBackupExcludedPlist.m @@ -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]; diff --git a/FirebaseMessaging/Sources/Token/FIRMessagingCheckinStore.m b/FirebaseMessaging/Sources/Token/FIRMessagingCheckinStore.m index 5088f6c6aee..a9facf84b15 100644 --- a/FirebaseMessaging/Sources/Token/FIRMessagingCheckinStore.m +++ b/FirebaseMessaging/Sources/Token/FIRMessagingCheckinStore.m @@ -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]; } diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingBackupExcludedPlistTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingBackupExcludedPlistTest.m index d0d77ff7007..c7da644004e 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingBackupExcludedPlistTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingBackupExcludedPlistTest.m @@ -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 { diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingCheckinStoreTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingCheckinStoreTest.m index 12e16aa2c4c..094c7075aa8 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingCheckinStoreTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingCheckinStoreTest.m @@ -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; } diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenStoreTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenStoreTest.m index 97834f41f84..3afe323865d 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenStoreTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenStoreTest.m @@ -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];