Skip to content

Commit 9a56d95

Browse files
author
Paul King
committed
SPFATT-4135 - Update Local firebase-ios-sdk
1 parent 888f0b6 commit 9a56d95

3 files changed

Lines changed: 22 additions & 15 deletions

File tree

FirebaseMessaging.podspec

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'FirebaseMessaging'
3-
s.version = '10.23.0'
3+
s.version = '10.23.2'
44
s.summary = 'Firebase Messaging'
55

66
s.description = <<-DESC
@@ -11,26 +11,26 @@ device, and it is completely free.
1111
DESC
1212

1313
s.homepage = 'https://firebase.google.com'
14-
s.license = { :type => 'Apache-2.0', :file => 'LICENSE' }
14+
# s.license = { :type => 'Apache-2.0', :file => 'LICENSE' }
1515
s.authors = 'Google, Inc.'
1616

1717
s.source = {
18-
:git => 'https://github.com/firebase/firebase-ios-sdk.git',
19-
:tag => 'CocoaPods-' + s.version.to_s
18+
:git => 'https://github.com/smithmicro/firebase-ios-sdk.git',
19+
:tag => s.version.to_s
2020
}
2121
s.social_media_url = 'https://twitter.com/Firebase'
2222

2323
ios_deployment_target = '11.0'
2424
osx_deployment_target = '10.13'
2525
tvos_deployment_target = '12.0'
26-
watchos_deployment_target = '6.0'
26+
# watchos_deployment_target = '6.0'
2727

2828
s.swift_version = '5.3'
2929

3030
s.ios.deployment_target = ios_deployment_target
3131
s.osx.deployment_target = osx_deployment_target
3232
s.tvos.deployment_target = tvos_deployment_target
33-
s.watchos.deployment_target = watchos_deployment_target
33+
# s.watchos.deployment_target = watchos_deployment_target
3434

3535
s.cocoapods_version = '>= 1.12.0'
3636
s.prefix_header_file = false

FirebaseMessaging/Sources/Token/FIRMessagingAPNSInfo.m

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,17 @@ - (id)copyWithZone:(NSZone *)zone {
6868
return clone;
6969
}
7070

71-
#pragma mark - NSCoding
72-
71+
#pragma mark - NSSecureCoding
7372
+ (BOOL)supportsSecureCoding {
7473
return YES;
7574
}
7675

76+
- (BOOL)requiresSecureCoding {
77+
return YES;
78+
}
79+
7780
- (nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
78-
id deviceToken = [aDecoder decodeObjectForKey:kFIRInstanceIDAPNSInfoTokenKey];
81+
id deviceToken = [aDecoder decodeObjectOfClass:NSData.self forKey:kFIRInstanceIDAPNSInfoTokenKey];
7982
if (![deviceToken isKindOfClass:[NSData class]]) {
8083
return nil;
8184
}

FirebaseMessaging/Sources/Token/FIRMessagingTokenInfo.m

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,33 +139,37 @@ + (BOOL)supportsSecureCoding {
139139
return YES;
140140
}
141141

142+
- (BOOL)requiresSecureCoding {
143+
return YES;
144+
}
145+
142146
- (nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
143147
BOOL needsMigration = NO;
144148
// These value cannot be nil
145149

146-
id authorizedEntity = [aDecoder decodeObjectForKey:kFIRInstanceIDAuthorizedEntityKey];
150+
id authorizedEntity = [aDecoder decodeObjectOfClass:NSString.self forKey:kFIRInstanceIDAuthorizedEntityKey];
147151
if (![authorizedEntity isKindOfClass:[NSString class]]) {
148152
return nil;
149153
}
150154

151-
id scope = [aDecoder decodeObjectForKey:kFIRInstanceIDScopeKey];
155+
id scope = [aDecoder decodeObjectOfClass:NSString.self forKey:kFIRInstanceIDScopeKey];
152156
if (![scope isKindOfClass:[NSString class]]) {
153157
return nil;
154158
}
155159

156-
id token = [aDecoder decodeObjectForKey:kFIRInstanceIDTokenKey];
160+
id token = [aDecoder decodeObjectOfClass:NSString.self forKey:kFIRInstanceIDTokenKey];
157161
if (![token isKindOfClass:[NSString class]]) {
158162
return nil;
159163
}
160164

161165
// These values are nullable, so only fail the decode if the type does not match
162166

163-
id appVersion = [aDecoder decodeObjectForKey:kFIRInstanceIDAppVersionKey];
167+
id appVersion = [aDecoder decodeObjectOfClass:NSString.self forKey:kFIRInstanceIDAppVersionKey];
164168
if (appVersion && ![appVersion isKindOfClass:[NSString class]]) {
165169
return nil;
166170
}
167171

168-
id firebaseAppID = [aDecoder decodeObjectForKey:kFIRInstanceIDFirebaseAppIDKey];
172+
id firebaseAppID = [aDecoder decodeObjectOfClass:NSString.self forKey:kFIRInstanceIDFirebaseAppIDKey];
169173
if (firebaseAppID && ![firebaseAppID isKindOfClass:[NSString class]]) {
170174
return nil;
171175
}
@@ -194,7 +198,7 @@ - (nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
194198
}
195199
}
196200

197-
id cacheTime = [aDecoder decodeObjectForKey:kFIRInstanceIDCacheTimeKey];
201+
id cacheTime = [aDecoder decodeObjectOfClass:NSDate.self forKey:kFIRInstanceIDCacheTimeKey];
198202
if (cacheTime && ![cacheTime isKindOfClass:[NSDate class]]) {
199203
return nil;
200204
}

0 commit comments

Comments
 (0)