Skip to content

Commit 6f603aa

Browse files
authored
[Core] Remove Options.deepLinkURLScheme (#15006)
1 parent 72d1121 commit 6f603aa

File tree

7 files changed

+7
-29
lines changed

7 files changed

+7
-29
lines changed

FirebaseCore/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Unreleased
2+
- [removed] **Breaking change**: Removed the `Options.deepLinkURLScheme`
3+
property. This API was exclusively used by the Dynamic Links SDK, which
4+
has been removed.
5+
16
# Firebase 11.15.0
27
- [fixed] Remove c99 as the required C language standard. (#14950)
38
- [deprecated] Deprecated the `Options.deepLinkURLScheme` property. This

FirebaseCore/Sources/FIROptions.m

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ - (id)copyWithZone:(NSZone *)zone {
160160
FIROptions *newOptions = [(FIROptions *)[[self class] allocWithZone:zone]
161161
initInternalWithOptionsDictionary:self.optionsDictionary];
162162
if (newOptions) {
163-
newOptions->_deepLinkURLScheme = self->_deepLinkURLScheme;
164163
newOptions.appGroupID = self.appGroupID;
165164
newOptions.editingLocked = self.isEditingLocked;
166165
newOptions.usingOptionsFromDefaultPlist = self.usingOptionsFromDefaultPlist;
@@ -315,11 +314,6 @@ - (void)setStorageBucket:(NSString *)storageBucket {
315314
_optionsDictionary[kFIRStorageBucket] = [storageBucket copy];
316315
}
317316

318-
- (void)setDeepLinkURLScheme:(NSString *)deepLinkURLScheme {
319-
[self checkEditingLocked];
320-
_deepLinkURLScheme = [deepLinkURLScheme copy];
321-
}
322-
323317
- (NSString *)bundleID {
324318
return self.optionsDictionary[kFIRBundleID];
325319
}
@@ -357,11 +351,6 @@ - (BOOL)isEqualToOptions:(FIROptions *)options {
357351

358352
// Validate extra properties not contained in the dictionary. Only validate it if one of the
359353
// objects has the property set.
360-
if ((options->_deepLinkURLScheme != nil || self->_deepLinkURLScheme != nil) &&
361-
![options->_deepLinkURLScheme isEqualToString:self->_deepLinkURLScheme]) {
362-
return NO;
363-
}
364-
365354
if ((options.appGroupID != nil || self.appGroupID != nil) &&
366355
![options.appGroupID isEqualToString:self.appGroupID]) {
367356
return NO;
@@ -384,7 +373,7 @@ - (NSUInteger)hash {
384373
// Note: `self.analyticsOptionsDictionary` was left out here since it solely relies on the
385374
// contents of the main bundle's `Info.plist`. We should avoid reading that file and the contents
386375
// should be identical.
387-
return self.optionsDictionary.hash ^ self->_deepLinkURLScheme.hash ^ self.appGroupID.hash;
376+
return self.optionsDictionary.hash ^ self.appGroupID.hash;
388377
}
389378

390379
#pragma mark - Internal instance methods

FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,6 @@ NS_SWIFT_NAME(FirebaseOptions)
8080
*/
8181
@property(nonatomic, copy, nullable) NSString *databaseURL;
8282

83-
/**
84-
* The URL scheme used to set up Durable Deep Link service.
85-
*/
86-
@property(nonatomic, copy, nullable) NSString *deepLinkURLScheme DEPRECATED_ATTRIBUTE;
87-
8883
/**
8984
* The Google Cloud Storage bucket name, e.g. @"abc-xyz-123.storage.firebase.com".
9085
*/

FirebaseInAppMessaging/Tests/Integration/FunctionalTestApp/App/InAppMessaging-Example-iOS/AppDelegate.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ - (BOOL)application:(UIApplication *)application
3434
NSLog(@"application started");
3535

3636
[FIRInAppMessaging disableAutoBootstrapWithFIRApp];
37-
[FIROptions defaultOptions].deepLinkURLScheme = @"fiam-testing";
3837
[FIRApp configure];
3938

4039
FIRIAMSDKSettings *sdkSetting = [[FIRIAMSDKSettings alloc] init];

SharedTestUtilities/FIROptionsMock.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ extern NSString *const kGoogleAppID;
2727
extern NSString *const kDatabaseURL;
2828
extern NSString *const kStorageBucket;
2929

30-
extern NSString *const kDeepLinkURLScheme;
31-
extern NSString *const kNewDeepLinkURLScheme;
32-
3330
extern NSString *const kBundleID;
3431
extern NSString *const kProjectID;
3532

SharedTestUtilities/FIROptionsMock.m

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
NSString *const kDatabaseURL = @"https://abc-xyz-123.firebaseio.com";
2626
NSString *const kStorageBucket = @"project-id-123.storage.firebase.com";
2727

28-
NSString *const kDeepLinkURLScheme = @"comgoogledeeplinkurl";
29-
NSString *const kNewDeepLinkURLScheme = @"newdeeplinkurlfortest";
30-
3128
NSString *const kBundleID = @"com.google.FirebaseSDKTests";
3229
NSString *const kProjectID = @"abc-xyz-123";
3330

docs/FirebaseOptionsPerProduct.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Summarize which Firebase Options fields (and GoogleService-Info.plist attributes
1111
| **projectID** | || | | | || ||| || |||| |
1212
| **googleAppID** ||| || ||| | | |||| ||||
1313
| **databaseURL** | | | | | | || | | | | | | | | | |
14-
| **deepLinkURLScheme** | | | | | | | || | | | | | | | | |
1514
| **storageBucket** | | | | | | | | | | | | | | | | ||
1615

1716

@@ -26,7 +25,6 @@ to GoogleService-Info.plist attributes.
2625
* *projectID*: The Project ID from the Firebase console
2726
* *googleAppID*: The Google App ID that is used to uniquely identify an instance of an app
2827
* *databaseURL*: The realtime database root URL
29-
* *deepLinkURLScheme*: The URL scheme used to set up Durable Deep Link service
3028
* *storageBucket*: The Google Cloud Storage bucket name
3129

3230
## Questions
@@ -36,10 +34,8 @@ to GoogleService-Info.plist attributes.
3634
* *gcmSenderID* is the second subfield of *googleAppID*. Can it be eliminated?
3735
* *bundleID* seems to have three purposes: Performance SDK uses it. Messaging back end uses it. Core
3836
will generate an error message if it doesn't match the actual bundleID. Anything else?
39-
* Why isn't *deepLinkURLScheme* set from the GoogleService-Info.plist field `REVERSED_CLIENT_ID` like
40-
other Firebase Options? The client code is required to explicitly set it.
4137
* Is there a better way to manage the fields that are only used by one product? *clientID*, *databaseURL*,
42-
*deepLinkURLScheme*, and *storageBucket*.
38+
and *storageBucket*.
4339

4440
## Unused FirebaseOptions
4541
Proposal: Deprecate these in the SDK and stop generating them for GoogleService-Info.plist.

0 commit comments

Comments
 (0)