Skip to content

Commit 22e8912

Browse files
authored
Remove FIRCLSURLSession (#6212)
* Remove runtime checks for NSURLSession * Remove FIRCLSURLSession * fix style * Fix build * Update changelog * Fix deprecation warning
1 parent b84e42d commit 22e8912

21 files changed

+11
-1371
lines changed

Crashlytics/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Unreleased
2+
- [fixed] Fixed a compiler warning and removed unused networking code (#6210).
3+
14
# v4.3.1
25
- [fixed] Fixed a segmentation fault that could occur when writing crash contexts to disk (#6048).
36

Crashlytics/Crashlytics/Controllers/FIRCLSNetworkClient.m

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
#import "Crashlytics/Crashlytics/Components/FIRCLSApplication.h"
1818
#import "Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionToken.h"
19-
#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSession.h"
20-
#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionConfiguration.h"
2119
#import "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
2220
#import "Crashlytics/Crashlytics/Models/FIRCLSFileManager.h"
2321
#import "Crashlytics/Shared/FIRCLSByteUtility.h"
@@ -74,22 +72,13 @@ - (NSURLSession *)session {
7472

7573
NSURLSessionConfiguration *config = nil;
7674

77-
Class urlSessionClass;
78-
Class urlSessionConfigurationClass;
79-
#if FIRCLSURLSESSION_REQUIRED
80-
urlSessionClass = [FIRCLSURLSession class];
81-
urlSessionConfigurationClass = [FIRCLSURLSessionConfiguration class];
82-
#else
83-
urlSessionClass = [NSURLSession class];
84-
urlSessionConfigurationClass = [NSURLSessionConfiguration class];
85-
#endif
86-
8775
if (self.supportsBackgroundRequests) {
8876
NSString *sdkBundleID = FIRCLSApplicationGetSDKBundleID();
8977
NSString *backgroundConfigName =
9078
[sdkBundleID stringByAppendingString:FIRCLSNetworkClientBackgroundIdentifierSuffix];
9179

92-
config = [urlSessionConfigurationClass backgroundSessionConfiguration:backgroundConfigName];
80+
config = [NSURLSessionConfiguration
81+
backgroundSessionConfigurationWithIdentifier:backgroundConfigName];
9382
#if TARGET_OS_IPHONE
9483
[config setSessionSendsLaunchEvents:NO];
9584
#endif
@@ -98,12 +87,12 @@ - (NSURLSession *)session {
9887
if (!config) {
9988
// take this code path if we don't support background requests OR if we failed to create a
10089
// background configuration
101-
config = [urlSessionConfigurationClass defaultSessionConfiguration];
90+
config = [NSURLSessionConfiguration defaultSessionConfiguration];
10291
}
10392

104-
_session = [urlSessionClass sessionWithConfiguration:config
105-
delegate:self
106-
delegateQueue:self.operationQueue];
93+
_session = [NSURLSession sessionWithConfiguration:config
94+
delegate:self
95+
delegateQueue:self.operationQueue];
10796

10897
if (!_session || !config) {
10998
FIRCLSErrorLog(@"Failed to initialize");
@@ -112,22 +101,8 @@ - (NSURLSession *)session {
112101
return _session;
113102
}
114103

115-
#if FIRCLSURLSESSION_REQUIRED
116-
- (BOOL)NSURLSessionAvailable {
117-
if ([[FIRCLSURLSession class] respondsToSelector:@selector(NSURLSessionShouldBeUsed)]) {
118-
return [FIRCLSURLSession NSURLSessionShouldBeUsed];
119-
}
120-
121-
return NSClassFromString(@"NSURLSession") != nil;
122-
}
123-
#endif
124-
125104
- (BOOL)supportsBackgroundRequests {
126-
return !FIRCLSApplicationIsExtension()
127-
#if FIRCLSURLSESSION_REQUIRED
128-
&& [self NSURLSessionAvailable]
129-
#endif
130-
&& self.canUseBackgroundSession;
105+
return !FIRCLSApplicationIsExtension() && self.canUseBackgroundSession;
131106
}
132107

133108
- (void)attemptToReconnectBackgroundSessionWithCompletionBlock:(void (^)(void))completionBlock {

Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSession.h

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)