diff options
| author | M.Stephen <truestyle2005@163.com> | 2019-12-13 17:42:52 +0800 |
|---|---|---|
| committer | M.Stephen <truestyle2005@163.com> | 2019-12-13 17:42:52 +0800 |
| commit | aabc7e9afbd872fcba0467c1ab002c2004edb6e5 (patch) | |
| tree | 70d6718db86c96ff8dac55e962fcae4d6cd4bb3b | |
| parent | 84af0971afb648e0c9567d43b00a83c28fa4ef5b (diff) | |
| download | qtlocation-mapboxgl-upstream/stephen-remove-ios-codes.tar.gz | |
| -rw-r--r-- | platform/darwin/include/mbgl/interface/native_apple_interface.h | 6 | ||||
| -rw-r--r-- | platform/darwin/src/http_file_source.mm | 3 | ||||
| -rw-r--r-- | platform/darwin/src/native_apple_interface.m | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/platform/darwin/include/mbgl/interface/native_apple_interface.h b/platform/darwin/include/mbgl/interface/native_apple_interface.h index 59e5d5431f..d4d207462d 100644 --- a/platform/darwin/include/mbgl/interface/native_apple_interface.h +++ b/platform/darwin/include/mbgl/interface/native_apple_interface.h @@ -36,12 +36,6 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) NSURLSessionConfiguration *sessionConfiguration; -/* - For testing. Since we get a `nil` return when SDK is modualar, we use this for testing network. - Same as `[MGLNetworkConfiguration defaultSessionConfiguration]` in `MGLNetworkConfiguration.m`. - */ -@property (nonatomic, readonly) NSURLSessionConfiguration *testSessionConfiguration; - - (void)startDownloadEvent:(NSString *)event type:(NSString *)type; - (void)cancelDownloadEventForResponse:(NSURLResponse *)response; diff --git a/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm index a5f0f8dbb7..6f68111203 100644 --- a/platform/darwin/src/http_file_source.mm +++ b/platform/darwin/src/http_file_source.mm @@ -84,9 +84,6 @@ public: Impl() { @autoreleasepool { NSURLSessionConfiguration *sessionConfig = MGLNativeNetworkManager.sharedManager.sessionConfiguration; - if (!sessionConfig) { - sessionConfig = MGLNativeNetworkManager.sharedManager.testSessionConfiguration; - } session = [NSURLSession sessionWithConfiguration:sessionConfig]; userAgent = getUserAgent(); diff --git a/platform/darwin/src/native_apple_interface.m b/platform/darwin/src/native_apple_interface.m index 7401681e56..07dce0d5b0 100644 --- a/platform/darwin/src/native_apple_interface.m +++ b/platform/darwin/src/native_apple_interface.m @@ -17,7 +17,9 @@ static MGLNativeNetworkManager *instance = nil; if (_delegate && [_delegate respondsToSelector:@selector(sessionConfiguration)]) { return [_delegate sessionConfiguration]; } - return nil; + // For testing. Since we get a `nil` return when SDK is modualar, we use this for testing requests. + // Same as `[MGLNetworkConfiguration defaultSessionConfiguration]` in `MGLNetworkConfiguration.m`. + return [self testSessionConfiguration]; } - (NSURLSessionConfiguration *)testSessionConfiguration { |