Skip to content

Commit 13863ee

Browse files
charlotteliangryanwilson
authored andcommitted
we no longer need to check the plist count for older version of library (#5211)
1 parent 0c9cd0e commit 13863ee

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

Firebase/InstanceID/FIRInstanceIDCheckinStore.m

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@
3232
NSString *const kFIRInstanceIDLegacyCheckinKeychainAccount = @"com.google.iid.checkin-account";
3333
NSString *const kFIRInstanceIDLegacyCheckinKeychainService = @"com.google.iid.checkin-service";
3434

35-
// Checkin plist used to have the deviceID and secret stored in them and that's why they
36-
// had 6 items in it. Since the deviceID and secret have been moved to the keychain
37-
// there would only be 4 items.
38-
static const NSInteger kOldCheckinPlistCount = 6;
39-
4035
@interface FIRInstanceIDCheckinStore ()
4136

4237
@property(nonatomic, readwrite, strong) FIRInstanceIDBackupExcludedPlist *plist;
@@ -200,14 +195,6 @@ - (FIRInstanceIDCheckinPreferences *)cachedCheckinPreferences {
200195
// Couldn't find checkin credentials in keychain nor plist
201196
return nil;
202197
}
203-
} else if (kOldCheckinPlistCount == checkinPlistContents.count) {
204-
// same check as above but just to be extra sure that we cover all upgrade cases properly.
205-
// TODO(chliangGoogle): Remove this case, after verifying it's not needed
206-
if ([plistDeviceAuthID length] && [plistSecretToken length]) {
207-
checkinPreferences =
208-
[[FIRInstanceIDCheckinPreferences alloc] initWithDeviceID:plistDeviceAuthID
209-
secretToken:plistSecretToken];
210-
}
211198
}
212199

213200
[checkinPreferences updateWithCheckinPlistContents:checkinPlistContents];

0 commit comments

Comments
 (0)