Skip to content

we no longer need to check the plist count for older version of library #5211

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

Merged
merged 1 commit into from
Mar 26, 2020
Merged

we no longer need to check the plist count for older version of library #5211

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
13 changes: 0 additions & 13 deletions Firebase/InstanceID/FIRInstanceIDCheckinStore.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@
NSString *const kFIRInstanceIDLegacyCheckinKeychainAccount = @"com.google.iid.checkin-account";
NSString *const kFIRInstanceIDLegacyCheckinKeychainService = @"com.google.iid.checkin-service";

// Checkin plist used to have the deviceID and secret stored in them and that's why they
// had 6 items in it. Since the deviceID and secret have been moved to the keychain
// there would only be 4 items.
static const NSInteger kOldCheckinPlistCount = 6;

@interface FIRInstanceIDCheckinStore ()

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

[checkinPreferences updateWithCheckinPlistContents:checkinPlistContents];
Expand Down