From 8cbb5c4d460a2102aa23396bcd626f8c6190b75e Mon Sep 17 00:00:00 2001 From: Dominik Pich Date: Thu, 31 Mar 2022 12:35:22 -0700 Subject: [PATCH] FLEXNetworkLib to SKFLEXNetworkLib Summary: rename FLEXNetworkLib to SKFLEXNetworkLib so it doesnt clash with Stock FLEX if embedded in the app too also 'fix' 3 warnings by adding explicit casts Reviewed By: lblasa Differential Revision: D35200011 fbshipit-source-id: 82bdecc5076b86958ea0cb80260584c012940045 --- .../SKFLEXNetworkObserver.h} | 6 +- .../SKFLEXNetworkObserver.mm} | 507 +++++++++--------- .../SKFLEXNetworkRecorder.h} | 18 +- .../SKFLEXNetworkRecorder.mm} | 73 +-- .../SKFLEXNetworkTransaction.h} | 18 +- .../SKFLEXNetworkTransaction.m} | 18 +- .../SKFLEXUtility.h} | 2 +- .../SKFLEXUtility.mm} | 6 +- .../SKIOSNetworkPlugin/SKIOSNetworkAdapter.mm | 8 +- 9 files changed, 331 insertions(+), 325 deletions(-) rename iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/{FLEXNetworkLib/FLEXNetworkObserver.h => SKFLEXNetworkLib/SKFLEXNetworkObserver.h} (89%) rename iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/{FLEXNetworkLib/FLEXNetworkObserver.mm => SKFLEXNetworkLib/SKFLEXNetworkObserver.mm} (78%) rename iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/{FLEXNetworkLib/FLEXNetworkRecorder.h => SKFLEXNetworkLib/SKFLEXNetworkRecorder.h} (88%) rename iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/{FLEXNetworkLib/FLEXNetworkRecorder.mm => SKFLEXNetworkLib/SKFLEXNetworkRecorder.mm} (80%) rename iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/{FLEXNetworkLib/FLEXNetworkTransaction.h => SKFLEXNetworkLib/SKFLEXNetworkTransaction.h} (86%) rename iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/{FLEXNetworkLib/FLEXNetworkTransaction.m => SKFLEXNetworkLib/SKFLEXNetworkTransaction.m} (90%) rename iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/{FLEXNetworkLib/FLEXUtility.h => SKFLEXNetworkLib/SKFLEXUtility.h} (98%) rename iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/{FLEXNetworkLib/FLEXUtility.mm => SKFLEXNetworkLib/SKFLEXUtility.mm} (97%) diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkObserver.h b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkObserver.h similarity index 89% rename from iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkObserver.h rename to iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkObserver.h index e6429cf41..783bad64a 100755 --- a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkObserver.h +++ b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkObserver.h @@ -38,13 +38,13 @@ #import FOUNDATION_EXTERN NSString* const - kFLEXNetworkObserverEnabledStateChangedNotification; + kSKFLEXNetworkObserverEnabledStateChangedNotification; /// This class swizzles NSURLConnection and NSURLSession delegate methods to /// observe events in the URL loading system. High level network events are sent -/// to the default FLEXNetworkRecorder instance which maintains the request +/// to the default SKFLEXNetworkRecorder instance which maintains the request /// history and caches response bodies. -@interface FLEXNetworkObserver : NSObject +@interface SKFLEXNetworkObserver : NSObject + (void)start; diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkObserver.mm b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkObserver.mm similarity index 78% rename from iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkObserver.mm rename to iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkObserver.mm index c06916cbf..6ce54f074 100644 --- a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkObserver.mm +++ b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkObserver.mm @@ -35,38 +35,38 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "FLEXNetworkObserver.h" +#import "SKFLEXNetworkObserver.h" #import #import #import -#import "FLEXNetworkRecorder.h" -#import "FLEXUtility.h" +#import "SKFLEXNetworkRecorder.h" +#import "SKFLEXUtility.h" -NSString* const kFLEXNetworkObserverEnabledStateChangedNotification = - @"kFLEXNetworkObserverEnabledStateChangedNotification"; -static NSString* const kFLEXNetworkObserverEnabledDefaultsKey = - @"com.flex.FLEXNetworkObserver.enableOnLaunch"; +NSString* const kSKFLEXNetworkObserverEnabledStateChangedNotification = + @"kSKFLEXNetworkObserverEnabledStateChangedNotification"; +static NSString* const kSKFLEXNetworkObserverEnabledDefaultsKey = + @"com.skflex.SKFLEXNetworkObserver.enableOnLaunch"; typedef void (^NSURLSessionAsyncCompletion)( id fileURLOrData, NSURLResponse* response, NSError* error); -@interface FLEXInternalRequestState : NSObject +@interface SKFLEXInternalRequestState : NSObject @property(nonatomic, copy) NSURLRequest* request; @property(nonatomic, strong) NSMutableData* dataAccumulator; @end -@implementation FLEXInternalRequestState +@implementation SKFLEXInternalRequestState @end -@interface FLEXNetworkObserver (NSURLConnectionHelpers) +@interface SKFLEXNetworkObserver (NSURLConnectionHelpers) - (void)connection:(NSURLConnection*)connection willSendRequest:(NSURLRequest*)request @@ -90,7 +90,7 @@ typedef void (^NSURLSessionAsyncCompletion)( @end -@interface FLEXNetworkObserver (NSURLSessionTaskHelpers) +@interface SKFLEXNetworkObserver (NSURLSessionTaskHelpers) - (void)URLSession:(NSURLSession*)session task:(NSURLSessionTask*)task @@ -132,16 +132,16 @@ typedef void (^NSURLSessionAsyncCompletion)( @end -@interface FLEXNetworkObserver () +@interface SKFLEXNetworkObserver () @property(nonatomic, strong) - NSMutableDictionary* + NSMutableDictionary* requestStatesForRequestIDs; @property(nonatomic, strong) dispatch_queue_t queue; @end -@implementation FLEXNetworkObserver +@implementation SKFLEXNetworkObserver #pragma mark - Public Methods @@ -152,7 +152,7 @@ typedef void (^NSURLSessionAsyncCompletion)( #pragma mark - Statics + (instancetype)sharedObserver { - static FLEXNetworkObserver* sharedObserver = nil; + static SKFLEXNetworkObserver* sharedObserver = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ sharedObserver = [[[self class] alloc] init]; @@ -237,7 +237,7 @@ typedef void (^NSURLSessionAsyncCompletion)( for (NSInteger classIndex = 0; classIndex < numClasses; ++classIndex) { Class className = classes[classIndex]; - if (className == [FLEXNetworkObserver class]) { + if (className == [SKFLEXNetworkObserver class]) { continue; } @@ -309,11 +309,11 @@ typedef void (^NSURLSessionAsyncCompletion)( dispatch_once(&onceToken, ^{ Class className = [NSURLConnection class]; SEL selector = @selector(cancel); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; Method originalCancel = class_getInstanceMethod(className, selector); void (^swizzleBlock)(NSURLConnection*) = ^(NSURLConnection* slf) { - [[FLEXNetworkObserver sharedObserver] connectionWillCancel:slf]; + [[SKFLEXNetworkObserver sharedObserver] connectionWillCancel:slf]; ((void (*)(id, SEL))objc_msgSend)(slf, swizzledSelector); }; @@ -349,7 +349,7 @@ typedef void (^NSURLSessionAsyncCompletion)( } SEL selector = @selector(resume); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; Method originalResume = class_getInstanceMethod(className, selector); @@ -362,7 +362,7 @@ typedef void (^NSURLSessionAsyncCompletion)( // request won't trigger a race to finalize the parser. [slf.currentRequest HTTPBody]; - [[FLEXNetworkObserver sharedObserver] URLSessionTaskWillResume:slf]; + [[SKFLEXNetworkObserver sharedObserver] URLSessionTaskWillResume:slf]; ((void (*)(id, SEL))objc_msgSend)(slf, swizzledSelector); }; @@ -382,7 +382,7 @@ typedef void (^NSURLSessionAsyncCompletion)( dispatch_once(&onceToken, ^{ Class className = objc_getMetaClass(class_getName([NSURLConnection class])); SEL selector = @selector(sendAsynchronousRequest:queue:completionHandler:); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; typedef void (^NSURLConnectionAsyncCompletion)( NSURLResponse* response, NSData* data, NSError* connectionError); @@ -397,28 +397,28 @@ typedef void (^NSURLSessionAsyncCompletion)( NSOperationQueue* queue, NSURLConnectionAsyncCompletion completion) { NSString* requestID = [self nextRequestID]; - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordRequestWillBeSentWithRequestID:requestID request:request redirectResponse:nil]; NSString* mechanism = [self mechanismFromClassMethod:selector onClass:className]; - [[FLEXNetworkRecorder defaultRecorder] recordMechanism:mechanism - forRequestID:requestID]; + [[SKFLEXNetworkRecorder defaultRecorder] recordMechanism:mechanism + forRequestID:requestID]; NSURLConnectionAsyncCompletion completionWrapper = ^( NSURLResponse* response, NSData* data, NSError* connectionError) { - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordResponseReceivedWithRequestID:requestID response:response]; - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordDataReceivedWithRequestID:requestID dataLength:[data length]]; if (connectionError) { - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordLoadingFailedWithRequestID:requestID error:connectionError]; } else { - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordLoadingFinishedWithRequestID:requestID responseBody:data]; } @@ -432,10 +432,10 @@ typedef void (^NSURLSessionAsyncCompletion)( slf, swizzledSelector, request, queue, completionWrapper); }; - [FLEXUtility replaceImplementationOfKnownSelector:selector - onClass:className - withBlock:asyncSwizzleBlock - swizzledSelector:swizzledSelector]; + [SKFLEXUtility replaceImplementationOfKnownSelector:selector + onClass:className + withBlock:asyncSwizzleBlock + swizzledSelector:swizzledSelector]; }); } @@ -444,7 +444,7 @@ typedef void (^NSURLSessionAsyncCompletion)( dispatch_once(&onceToken, ^{ Class className = objc_getMetaClass(class_getName([NSURLConnection class])); SEL selector = @selector(sendSynchronousRequest:returningResponse:error:); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; NSData* ( ^syncSwizzleBlock)(Class, NSURLRequest*, NSURLResponse**, NSError**) = @@ -455,31 +455,31 @@ typedef void (^NSURLSessionAsyncCompletion)( NSError** error) { NSData* data = nil; NSString* requestID = [self nextRequestID]; - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordRequestWillBeSentWithRequestID:requestID request:request redirectResponse:nil]; NSString* mechanism = [self mechanismFromClassMethod:selector onClass:className]; - [[FLEXNetworkRecorder defaultRecorder] recordMechanism:mechanism - forRequestID:requestID]; + [[SKFLEXNetworkRecorder defaultRecorder] recordMechanism:mechanism + forRequestID:requestID]; NSError* temporaryError = nil; NSURLResponse* temporaryResponse = nil; data = ((id(*)(id, SEL, id, NSURLResponse**, NSError**)) objc_msgSend)(slf, swizzledSelector, request, &temporaryResponse, &temporaryError); - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordResponseReceivedWithRequestID:requestID response:temporaryResponse]; - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordDataReceivedWithRequestID:requestID dataLength:[data length]]; if (temporaryError) { - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordLoadingFailedWithRequestID:requestID error:temporaryError]; } else { - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordLoadingFinishedWithRequestID:requestID responseBody:data]; } @@ -492,10 +492,10 @@ typedef void (^NSURLSessionAsyncCompletion)( return data; }; - [FLEXUtility replaceImplementationOfKnownSelector:selector - onClass:className - withBlock:syncSwizzleBlock - swizzledSelector:swizzledSelector]; + [SKFLEXUtility replaceImplementationOfKnownSelector:selector + onClass:className + withBlock:syncSwizzleBlock + swizzledSelector:swizzledSelector]; }); } @@ -518,10 +518,12 @@ typedef void (^NSURLSessionAsyncCompletion)( for (int selectorIndex = 0; selectorIndex < numSelectors; selectorIndex++) { SEL selector = selectors[selectorIndex]; - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = + [SKFLEXUtility swizzledSelectorForSelector:selector]; - if ([FLEXUtility instanceRespondsButDoesNotImplementSelector:selector - class:className]) { + if ([SKFLEXUtility + instanceRespondsButDoesNotImplementSelector:selector + class:className]) { // iOS 7 does not implement these methods on NSURLSession. We actually // want to swizzle __NSCFURLSession, which we can get from the class of // the shared session @@ -559,7 +561,7 @@ typedef void (^NSURLSessionAsyncCompletion)( return task; }; - [FLEXUtility + [SKFLEXUtility replaceImplementationOfKnownSelector:selector onClass:className withBlock:asyncDataOrDownloadSwizzleBlock @@ -585,10 +587,12 @@ typedef void (^NSURLSessionAsyncCompletion)( for (int selectorIndex = 0; selectorIndex < numSelectors; selectorIndex++) { SEL selector = selectors[selectorIndex]; - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = + [SKFLEXUtility swizzledSelectorForSelector:selector]; - if ([FLEXUtility instanceRespondsButDoesNotImplementSelector:selector - class:className]) { + if ([SKFLEXUtility + instanceRespondsButDoesNotImplementSelector:selector + class:className]) { // iOS 7 does not implement these methods on NSURLSession. We actually // want to swizzle __NSCFURLSession, which we can get from the class of // the shared session @@ -629,7 +633,7 @@ typedef void (^NSURLSessionAsyncCompletion)( return task; }; - [FLEXUtility + [SKFLEXUtility replaceImplementationOfKnownSelector:selector onClass:className withBlock:asyncUploadTaskSwizzleBlock @@ -650,9 +654,9 @@ typedef void (^NSURLSessionAsyncCompletion)( completion:(NSURLSessionAsyncCompletion)completion { NSURLSessionAsyncCompletion completionWrapper = ^(id fileURLOrData, NSURLResponse* response, NSError* error) { - [[FLEXNetworkRecorder defaultRecorder] recordMechanism:mechanism - forRequestID:requestID]; - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordMechanism:mechanism + forRequestID:requestID]; + [[SKFLEXNetworkRecorder defaultRecorder] recordResponseReceivedWithRequestID:requestID response:response]; NSData* data = nil; @@ -661,15 +665,15 @@ typedef void (^NSURLSessionAsyncCompletion)( } else if ([fileURLOrData isKindOfClass:[NSData class]]) { data = fileURLOrData; } - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordDataReceivedWithRequestID:requestID dataLength:[data length]]; if (error) { - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordLoadingFailedWithRequestID:requestID error:error]; } else { - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordLoadingFinishedWithRequestID:requestID responseBody:data]; } @@ -684,7 +688,7 @@ typedef void (^NSURLSessionAsyncCompletion)( + (void)injectWillSendRequestIntoDelegateClass:(Class)cls { SEL selector = @selector(connection:willSendRequest:redirectResponse:); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; Protocol* protocol = @protocol(NSURLConnectionDataDelegate); if (!protocol) { @@ -702,10 +706,10 @@ typedef void (^NSURLSessionAsyncCompletion)( NSURLConnection* connection, NSURLRequest* request, NSURLResponse* response) { - [[FLEXNetworkObserver sharedObserver] connection:connection - willSendRequest:request - redirectResponse:response - delegate:slf]; + [[SKFLEXNetworkObserver sharedObserver] connection:connection + willSendRequest:request + redirectResponse:response + delegate:slf]; return request; }; @@ -731,17 +735,17 @@ typedef void (^NSURLSessionAsyncCompletion)( return returnValue; }; - [FLEXUtility replaceImplementationOfSelector:selector - withSelector:swizzledSelector - forClass:cls - withMethodDescription:methodDescription - implementationBlock:implementationBlock - undefinedBlock:undefinedBlock]; + [SKFLEXUtility replaceImplementationOfSelector:selector + withSelector:swizzledSelector + forClass:cls + withMethodDescription:methodDescription + implementationBlock:implementationBlock + undefinedBlock:undefinedBlock]; } + (void)injectDidReceiveResponseIntoDelegateClass:(Class)cls { SEL selector = @selector(connection:didReceiveResponse:); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; Protocol* protocol = @protocol(NSURLConnectionDataDelegate); if (!protocol) { @@ -760,9 +764,9 @@ typedef void (^NSURLSessionAsyncCompletion)( ^(id slf, NSURLConnection* connection, NSURLResponse* response) { - [[FLEXNetworkObserver sharedObserver] connection:connection - didReceiveResponse:response - delegate:slf]; + [[SKFLEXNetworkObserver sharedObserver] connection:connection + didReceiveResponse:response + delegate:slf]; }; NSURLConnectionDidReceiveResponseBlock implementationBlock = @@ -780,17 +784,17 @@ typedef void (^NSURLSessionAsyncCompletion)( }]; }; - [FLEXUtility replaceImplementationOfSelector:selector - withSelector:swizzledSelector - forClass:cls - withMethodDescription:methodDescription - implementationBlock:implementationBlock - undefinedBlock:undefinedBlock]; + [SKFLEXUtility replaceImplementationOfSelector:selector + withSelector:swizzledSelector + forClass:cls + withMethodDescription:methodDescription + implementationBlock:implementationBlock + undefinedBlock:undefinedBlock]; } + (void)injectDidReceiveDataIntoDelegateClass:(Class)cls { SEL selector = @selector(connection:didReceiveData:); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; Protocol* protocol = @protocol(NSURLConnectionDataDelegate); if (!protocol) { @@ -809,9 +813,9 @@ typedef void (^NSURLSessionAsyncCompletion)( ^(id slf, NSURLConnection* connection, NSData* data) { - [[FLEXNetworkObserver sharedObserver] connection:connection - didReceiveData:data - delegate:slf]; + [[SKFLEXNetworkObserver sharedObserver] connection:connection + didReceiveData:data + delegate:slf]; }; NSURLConnectionDidReceiveDataBlock implementationBlock = @@ -829,17 +833,17 @@ typedef void (^NSURLSessionAsyncCompletion)( }]; }; - [FLEXUtility replaceImplementationOfSelector:selector - withSelector:swizzledSelector - forClass:cls - withMethodDescription:methodDescription - implementationBlock:implementationBlock - undefinedBlock:undefinedBlock]; + [SKFLEXUtility replaceImplementationOfSelector:selector + withSelector:swizzledSelector + forClass:cls + withMethodDescription:methodDescription + implementationBlock:implementationBlock + undefinedBlock:undefinedBlock]; } + (void)injectDidFinishLoadingIntoDelegateClass:(Class)cls { SEL selector = @selector(connectionDidFinishLoading:); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; Protocol* protocol = @protocol(NSURLConnectionDataDelegate); if (!protocol) { @@ -852,11 +856,12 @@ typedef void (^NSURLSessionAsyncCompletion)( typedef void (^NSURLConnectionDidFinishLoadingBlock)( id slf, NSURLConnection* connection); - NSURLConnectionDidFinishLoadingBlock undefinedBlock = ^( - id slf, NSURLConnection* connection) { - [[FLEXNetworkObserver sharedObserver] connectionDidFinishLoading:connection - delegate:slf]; - }; + NSURLConnectionDidFinishLoadingBlock undefinedBlock = + ^(id slf, NSURLConnection* connection) { + [[SKFLEXNetworkObserver sharedObserver] + connectionDidFinishLoading:connection + delegate:slf]; + }; NSURLConnectionDidFinishLoadingBlock implementationBlock = ^(id slf, NSURLConnection* connection) { @@ -871,17 +876,17 @@ typedef void (^NSURLSessionAsyncCompletion)( }]; }; - [FLEXUtility replaceImplementationOfSelector:selector - withSelector:swizzledSelector - forClass:cls - withMethodDescription:methodDescription - implementationBlock:implementationBlock - undefinedBlock:undefinedBlock]; + [SKFLEXUtility replaceImplementationOfSelector:selector + withSelector:swizzledSelector + forClass:cls + withMethodDescription:methodDescription + implementationBlock:implementationBlock + undefinedBlock:undefinedBlock]; } + (void)injectDidFailWithErrorIntoDelegateClass:(Class)cls { SEL selector = @selector(connection:didFailWithError:); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; Protocol* protocol = @protocol(NSURLConnectionDelegate); struct objc_method_description methodDescription = @@ -896,9 +901,9 @@ typedef void (^NSURLSessionAsyncCompletion)( ^(id slf, NSURLConnection* connection, NSError* error) { - [[FLEXNetworkObserver sharedObserver] connection:connection - didFailWithError:error - delegate:slf]; + [[SKFLEXNetworkObserver sharedObserver] connection:connection + didFailWithError:error + delegate:slf]; }; NSURLConnectionDidFailWithErrorBlock implementationBlock = @@ -916,19 +921,19 @@ typedef void (^NSURLSessionAsyncCompletion)( }]; }; - [FLEXUtility replaceImplementationOfSelector:selector - withSelector:swizzledSelector - forClass:cls - withMethodDescription:methodDescription - implementationBlock:implementationBlock - undefinedBlock:undefinedBlock]; + [SKFLEXUtility replaceImplementationOfSelector:selector + withSelector:swizzledSelector + forClass:cls + withMethodDescription:methodDescription + implementationBlock:implementationBlock + undefinedBlock:undefinedBlock]; } + (void)injectTaskWillPerformHTTPRedirectionIntoDelegateClass:(Class)cls { SEL selector = @selector (URLSession: task:willPerformHTTPRedirection:newRequest:completionHandler:); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; Protocol* protocol = @protocol(NSURLSessionTaskDelegate); @@ -950,12 +955,12 @@ typedef void (^NSURLSessionAsyncCompletion)( NSHTTPURLResponse* response, NSURLRequest* newRequest, void (^completionHandler)(NSURLRequest*)) { - [[FLEXNetworkObserver sharedObserver] URLSession:session - task:task - willPerformHTTPRedirection:response - newRequest:newRequest - completionHandler:completionHandler - delegate:slf]; + [[SKFLEXNetworkObserver sharedObserver] URLSession:session + task:task + willPerformHTTPRedirection:response + newRequest:newRequest + completionHandler:completionHandler + delegate:slf]; completionHandler(newRequest); }; @@ -969,12 +974,12 @@ typedef void (^NSURLSessionAsyncCompletion)( [self sniffWithoutDuplicationForObject:session selector:selector sniffingBlock:^{ - [[FLEXNetworkObserver sharedObserver] URLSession:session - task:task - willPerformHTTPRedirection:response - newRequest:newRequest - completionHandler:completionHandler - delegate:slf]; + [[SKFLEXNetworkObserver sharedObserver] URLSession:session + task:task + willPerformHTTPRedirection:response + newRequest:newRequest + completionHandler:completionHandler + delegate:slf]; } originalImplementationBlock:^{ ((id(*)( @@ -989,17 +994,17 @@ typedef void (^NSURLSessionAsyncCompletion)( }]; }; - [FLEXUtility replaceImplementationOfSelector:selector - withSelector:swizzledSelector - forClass:cls - withMethodDescription:methodDescription - implementationBlock:implementationBlock - undefinedBlock:undefinedBlock]; + [SKFLEXUtility replaceImplementationOfSelector:selector + withSelector:swizzledSelector + forClass:cls + withMethodDescription:methodDescription + implementationBlock:implementationBlock + undefinedBlock:undefinedBlock]; } + (void)injectTaskDidReceiveDataIntoDelegateClass:(Class)cls { SEL selector = @selector(URLSession:dataTask:didReceiveData:); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; Protocol* protocol = @protocol(NSURLSessionDataDelegate); @@ -1017,10 +1022,10 @@ typedef void (^NSURLSessionAsyncCompletion)( NSURLSession* session, NSURLSessionDataTask* dataTask, NSData* data) { - [[FLEXNetworkObserver sharedObserver] URLSession:session - dataTask:dataTask - didReceiveData:data - delegate:slf]; + [[SKFLEXNetworkObserver sharedObserver] URLSession:session + dataTask:dataTask + didReceiveData:data + delegate:slf]; }; NSURLSessionDidReceiveDataBlock implementationBlock = @@ -1039,17 +1044,17 @@ typedef void (^NSURLSessionAsyncCompletion)( }]; }; - [FLEXUtility replaceImplementationOfSelector:selector - withSelector:swizzledSelector - forClass:cls - withMethodDescription:methodDescription - implementationBlock:implementationBlock - undefinedBlock:undefinedBlock]; + [SKFLEXUtility replaceImplementationOfSelector:selector + withSelector:swizzledSelector + forClass:cls + withMethodDescription:methodDescription + implementationBlock:implementationBlock + undefinedBlock:undefinedBlock]; } + (void)injectDataTaskDidBecomeDownloadTaskIntoDelegateClass:(Class)cls { SEL selector = @selector(URLSession:dataTask:didBecomeDownloadTask:); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; Protocol* protocol = @protocol(NSURLSessionDataDelegate); @@ -1067,10 +1072,10 @@ typedef void (^NSURLSessionAsyncCompletion)( NSURLSession* session, NSURLSessionDataTask* dataTask, NSURLSessionDownloadTask* downloadTask) { - [[FLEXNetworkObserver sharedObserver] URLSession:session - dataTask:dataTask - didBecomeDownloadTask:downloadTask - delegate:slf]; + [[SKFLEXNetworkObserver sharedObserver] URLSession:session + dataTask:dataTask + didBecomeDownloadTask:downloadTask + delegate:slf]; }; NSURLSessionDidBecomeDownloadTaskBlock implementationBlock = @@ -1089,18 +1094,18 @@ typedef void (^NSURLSessionAsyncCompletion)( }]; }; - [FLEXUtility replaceImplementationOfSelector:selector - withSelector:swizzledSelector - forClass:cls - withMethodDescription:methodDescription - implementationBlock:implementationBlock - undefinedBlock:undefinedBlock]; + [SKFLEXUtility replaceImplementationOfSelector:selector + withSelector:swizzledSelector + forClass:cls + withMethodDescription:methodDescription + implementationBlock:implementationBlock + undefinedBlock:undefinedBlock]; } + (void)injectTaskDidReceiveResponseIntoDelegateClass:(Class)cls { SEL selector = @selector(URLSession: dataTask:didReceiveResponse:completionHandler:); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; Protocol* protocol = @protocol(NSURLSessionDataDelegate); @@ -1120,11 +1125,11 @@ typedef void (^NSURLSessionAsyncCompletion)( NSURLSessionDataTask* dataTask, NSURLResponse* response, void (^completionHandler)(NSURLSessionResponseDisposition disposition)) { - [[FLEXNetworkObserver sharedObserver] URLSession:session - dataTask:dataTask - didReceiveResponse:response - completionHandler:completionHandler - delegate:slf]; + [[SKFLEXNetworkObserver sharedObserver] URLSession:session + dataTask:dataTask + didReceiveResponse:response + completionHandler:completionHandler + delegate:slf]; completionHandler(NSURLSessionResponseAllow); }; @@ -1137,11 +1142,11 @@ typedef void (^NSURLSessionAsyncCompletion)( [self sniffWithoutDuplicationForObject:session selector:selector sniffingBlock:^{ - [[FLEXNetworkObserver sharedObserver] URLSession:session - dataTask:dataTask - didReceiveResponse:response - completionHandler:completionHandler - delegate:slf]; + [[SKFLEXNetworkObserver sharedObserver] URLSession:session + dataTask:dataTask + didReceiveResponse:response + completionHandler:completionHandler + delegate:slf]; } originalImplementationBlock:^{ ((void (*)( @@ -1156,17 +1161,17 @@ typedef void (^NSURLSessionAsyncCompletion)( }]; }; - [FLEXUtility replaceImplementationOfSelector:selector - withSelector:swizzledSelector - forClass:cls - withMethodDescription:methodDescription - implementationBlock:implementationBlock - undefinedBlock:undefinedBlock]; + [SKFLEXUtility replaceImplementationOfSelector:selector + withSelector:swizzledSelector + forClass:cls + withMethodDescription:methodDescription + implementationBlock:implementationBlock + undefinedBlock:undefinedBlock]; } + (void)injectTaskDidCompleteWithErrorIntoDelegateClass:(Class)cls { SEL selector = @selector(URLSession:task:didCompleteWithError:); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; Protocol* protocol = @protocol(NSURLSessionTaskDelegate); struct objc_method_description methodDescription = @@ -1183,10 +1188,10 @@ typedef void (^NSURLSessionAsyncCompletion)( NSURLSession* session, NSURLSessionTask* task, NSError* error) { - [[FLEXNetworkObserver sharedObserver] URLSession:session - task:task - didCompleteWithError:error - delegate:slf]; + [[SKFLEXNetworkObserver sharedObserver] URLSession:session + task:task + didCompleteWithError:error + delegate:slf]; }; NSURLSessionTaskDidCompleteWithErrorBlock implementationBlock = @@ -1205,18 +1210,18 @@ typedef void (^NSURLSessionAsyncCompletion)( }]; }; - [FLEXUtility replaceImplementationOfSelector:selector - withSelector:swizzledSelector - forClass:cls - withMethodDescription:methodDescription - implementationBlock:implementationBlock - undefinedBlock:undefinedBlock]; + [SKFLEXUtility replaceImplementationOfSelector:selector + withSelector:swizzledSelector + forClass:cls + withMethodDescription:methodDescription + implementationBlock:implementationBlock + undefinedBlock:undefinedBlock]; } // Used for overriding AFNetworking behavior + (void)injectRespondsToSelectorIntoDelegateClass:(Class)cls { SEL selector = @selector(respondsToSelector:); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; // Protocol *protocol = @protocol(NSURLSessionTaskDelegate); Method method = class_getInstanceMethod(cls, selector); @@ -1237,17 +1242,17 @@ typedef void (^NSURLSessionAsyncCompletion)( return ((BOOL(*)(id, SEL, SEL))objc_msgSend)(slf, swizzledSelector, sel); }; - [FLEXUtility replaceImplementationOfSelector:selector - withSelector:swizzledSelector - forClass:cls - withMethodDescription:methodDescription - implementationBlock:implementationBlock - undefinedBlock:undefinedBlock]; + [SKFLEXUtility replaceImplementationOfSelector:selector + withSelector:swizzledSelector + forClass:cls + withMethodDescription:methodDescription + implementationBlock:implementationBlock + undefinedBlock:undefinedBlock]; } + (void)injectDownloadTaskDidFinishDownloadingIntoDelegateClass:(Class)cls { SEL selector = @selector(URLSession:downloadTask:didFinishDownloadingToURL:); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; Protocol* protocol = @protocol(NSURLSessionDownloadDelegate); struct objc_method_description methodDescription = @@ -1265,11 +1270,11 @@ typedef void (^NSURLSessionAsyncCompletion)( NSURLSessionDownloadTask* task, NSURL* location) { NSData* data = [NSData dataWithContentsOfFile:location.relativePath]; - [[FLEXNetworkObserver sharedObserver] URLSession:session - task:task - didFinishDownloadingToURL:location - data:data - delegate:slf]; + [[SKFLEXNetworkObserver sharedObserver] URLSession:session + task:task + didFinishDownloadingToURL:location + data:data + delegate:slf]; }; NSURLSessionDownloadTaskDidFinishDownloadingBlock implementationBlock = @@ -1288,19 +1293,19 @@ typedef void (^NSURLSessionAsyncCompletion)( }]; }; - [FLEXUtility replaceImplementationOfSelector:selector - withSelector:swizzledSelector - forClass:cls - withMethodDescription:methodDescription - implementationBlock:implementationBlock - undefinedBlock:undefinedBlock]; + [SKFLEXUtility replaceImplementationOfSelector:selector + withSelector:swizzledSelector + forClass:cls + withMethodDescription:methodDescription + implementationBlock:implementationBlock + undefinedBlock:undefinedBlock]; } + (void)injectDownloadTaskDidWriteDataIntoDelegateClass:(Class)cls { SEL selector = @selector( URLSession: downloadTask:didWriteData:totalBytesWritten:totalBytesExpectedToWrite:); - SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; + SEL swizzledSelector = [SKFLEXUtility swizzledSelectorForSelector:selector]; Protocol* protocol = @protocol(NSURLSessionDownloadDelegate); struct objc_method_description methodDescription = @@ -1321,12 +1326,12 @@ typedef void (^NSURLSessionAsyncCompletion)( int64_t bytesWritten, int64_t totalBytesWritten, int64_t totalBytesExpectedToWrite) { - [[FLEXNetworkObserver sharedObserver] URLSession:session - downloadTask:task - didWriteData:bytesWritten - totalBytesWritten:totalBytesWritten - totalBytesExpectedToWrite:totalBytesExpectedToWrite - delegate:slf]; + [[SKFLEXNetworkObserver sharedObserver] URLSession:session + downloadTask:task + didWriteData:bytesWritten + totalBytesWritten:totalBytesWritten + totalBytesExpectedToWrite:totalBytesExpectedToWrite + delegate:slf]; }; NSURLSessionDownloadTaskDidWriteDataBlock implementationBlock = ^( @@ -1359,19 +1364,19 @@ typedef void (^NSURLSessionAsyncCompletion)( }]; }; - [FLEXUtility replaceImplementationOfSelector:selector - withSelector:swizzledSelector - forClass:cls - withMethodDescription:methodDescription - implementationBlock:implementationBlock - undefinedBlock:undefinedBlock]; + [SKFLEXUtility replaceImplementationOfSelector:selector + withSelector:swizzledSelector + forClass:cls + withMethodDescription:methodDescription + implementationBlock:implementationBlock + undefinedBlock:undefinedBlock]; } -static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; +static char const* const kSKFLEXRequestIDKey = "kSKFLEXRequestIDKey"; + (NSString*)requestIDForConnectionOrTask:(id)connectionOrTask { NSString* requestID = - objc_getAssociatedObject(connectionOrTask, kFLEXRequestIDKey); + objc_getAssociatedObject(connectionOrTask, kSKFLEXRequestIDKey); if (!requestID) { requestID = [self nextRequestID]; [self setRequestID:requestID forConnectionOrTask:connectionOrTask]; @@ -1384,7 +1389,7 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; if (connectionOrTask) { objc_setAssociatedObject( connectionOrTask, - kFLEXRequestIDKey, + kSKFLEXRequestIDKey, requestID, OBJC_ASSOCIATION_RETAIN_NONATOMIC); } @@ -1397,7 +1402,7 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; if (self) { self.requestStatesForRequestIDs = [NSMutableDictionary new]; self.queue = dispatch_queue_create( - "com.flex.FLEXNetworkObserver", DISPATCH_QUEUE_SERIAL); + "com.skflex.SKFLEXNetworkObserver", DISPATCH_QUEUE_SERIAL); } return self; } @@ -1408,11 +1413,11 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; dispatch_async(_queue, block); } -- (FLEXInternalRequestState*)requestStateForRequestID:(NSString*)requestID { - FLEXInternalRequestState* requestState = +- (SKFLEXInternalRequestState*)requestStateForRequestID:(NSString*)requestID { + SKFLEXInternalRequestState* requestState = self.requestStatesForRequestIDs[requestID]; if (!requestState) { - requestState = [FLEXInternalRequestState new]; + requestState = [SKFLEXInternalRequestState new]; [self.requestStatesForRequestIDs setObject:requestState forKey:requestID]; } return requestState; @@ -1424,7 +1429,7 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; @end -@implementation FLEXNetworkObserver (NSURLConnectionHelpers) +@implementation SKFLEXNetworkObserver (NSURLConnectionHelpers) - (void)connection:(NSURLConnection*)connection willSendRequest:(NSURLRequest*)request @@ -1433,17 +1438,17 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; [self performBlock:^{ NSString* requestID = [[self class] requestIDForConnectionOrTask:connection]; - FLEXInternalRequestState* requestState = + SKFLEXInternalRequestState* requestState = [self requestStateForRequestID:requestID]; requestState.request = request; - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordRequestWillBeSentWithRequestID:requestID request:request redirectResponse:response]; NSString* mechanism = [NSString stringWithFormat:@"NSURLConnection (delegate: %@)", [delegate class]]; - [[FLEXNetworkRecorder defaultRecorder] recordMechanism:mechanism - forRequestID:requestID]; + [[SKFLEXNetworkRecorder defaultRecorder] recordMechanism:mechanism + forRequestID:requestID]; }]; } @@ -1453,7 +1458,7 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; [self performBlock:^{ NSString* requestID = [[self class] requestIDForConnectionOrTask:connection]; - FLEXInternalRequestState* requestState = + SKFLEXInternalRequestState* requestState = [self requestStateForRequestID:requestID]; NSMutableData* dataAccumulator = nil; @@ -1465,7 +1470,7 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; } requestState.dataAccumulator = dataAccumulator; - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordResponseReceivedWithRequestID:requestID response:response]; }]; @@ -1479,10 +1484,10 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; [self performBlock:^{ NSString* requestID = [[self class] requestIDForConnectionOrTask:connection]; - FLEXInternalRequestState* requestState = + SKFLEXInternalRequestState* requestState = [self requestStateForRequestID:requestID]; [requestState.dataAccumulator appendData:data]; - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordDataReceivedWithRequestID:requestID dataLength:data.length]; }]; @@ -1493,9 +1498,9 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; [self performBlock:^{ NSString* requestID = [[self class] requestIDForConnectionOrTask:connection]; - FLEXInternalRequestState* requestState = + SKFLEXInternalRequestState* requestState = [self requestStateForRequestID:requestID]; - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordLoadingFinishedWithRequestID:requestID responseBody:requestState.dataAccumulator]; [self removeRequestStateForRequestID:requestID]; @@ -1508,7 +1513,7 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; [self performBlock:^{ NSString* requestID = [[self class] requestIDForConnectionOrTask:connection]; - FLEXInternalRequestState* requestState = + SKFLEXInternalRequestState* requestState = [self requestStateForRequestID:requestID]; // Cancellations can occur prior to the willSendRequest:... NSURLConnection @@ -1516,7 +1521,7 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; // record the failure if the recorder already knows about the request // through willSendRequest:... if (requestState.request) { - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordLoadingFailedWithRequestID:requestID error:error]; } @@ -1540,7 +1545,7 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; @end -@implementation FLEXNetworkObserver (NSURLSessionTaskHelpers) +@implementation SKFLEXNetworkObserver (NSURLSessionTaskHelpers) - (void)URLSession:(NSURLSession*)session task:(NSURLSessionTask*)task @@ -1550,7 +1555,7 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; delegate:(id)delegate { [self performBlock:^{ NSString* requestID = [[self class] requestIDForConnectionOrTask:task]; - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordRequestWillBeSentWithRequestID:requestID request:request redirectResponse:response]; @@ -1565,7 +1570,7 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; delegate:(id)delegate { [self performBlock:^{ NSString* requestID = [[self class] requestIDForConnectionOrTask:dataTask]; - FLEXInternalRequestState* requestState = + SKFLEXInternalRequestState* requestState = [self requestStateForRequestID:requestID]; NSMutableData* dataAccumulator = nil; @@ -1580,10 +1585,10 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; NSString* requestMechanism = [NSString stringWithFormat:@"NSURLSessionDataTask (delegate: %@)", [delegate class]]; - [[FLEXNetworkRecorder defaultRecorder] recordMechanism:requestMechanism - forRequestID:requestID]; + [[SKFLEXNetworkRecorder defaultRecorder] recordMechanism:requestMechanism + forRequestID:requestID]; - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordResponseReceivedWithRequestID:requestID response:response]; }]; @@ -1609,12 +1614,12 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; data = [data copy]; [self performBlock:^{ NSString* requestID = [[self class] requestIDForConnectionOrTask:dataTask]; - FLEXInternalRequestState* requestState = + SKFLEXInternalRequestState* requestState = [self requestStateForRequestID:requestID]; [requestState.dataAccumulator appendData:data]; - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordDataReceivedWithRequestID:requestID dataLength:data.length]; }]; @@ -1626,15 +1631,15 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; delegate:(id)delegate { [self performBlock:^{ NSString* requestID = [[self class] requestIDForConnectionOrTask:task]; - FLEXInternalRequestState* requestState = + SKFLEXInternalRequestState* requestState = [self requestStateForRequestID:requestID]; if (error) { - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordLoadingFailedWithRequestID:requestID error:error]; } else { - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordLoadingFinishedWithRequestID:requestID responseBody:requestState.dataAccumulator]; } @@ -1652,7 +1657,7 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; [self performBlock:^{ NSString* requestID = [[self class] requestIDForConnectionOrTask:downloadTask]; - FLEXInternalRequestState* requestState = + SKFLEXInternalRequestState* requestState = [self requestStateForRequestID:requestID]; if (!requestState.dataAccumulator) { @@ -1661,18 +1666,18 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; : 0; requestState.dataAccumulator = [[NSMutableData alloc] initWithCapacity:unsignedBytesExpectedToWrite]; - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordResponseReceivedWithRequestID:requestID response:downloadTask.response]; NSString* requestMechanism = [NSString stringWithFormat:@"NSURLSessionDownloadTask (delegate: %@)", [delegate class]]; - [[FLEXNetworkRecorder defaultRecorder] recordMechanism:requestMechanism - forRequestID:requestID]; + [[SKFLEXNetworkRecorder defaultRecorder] recordMechanism:requestMechanism + forRequestID:requestID]; } - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordDataReceivedWithRequestID:requestID dataLength:bytesWritten]; }]; @@ -1687,7 +1692,7 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; [self performBlock:^{ NSString* requestID = [[self class] requestIDForConnectionOrTask:downloadTask]; - FLEXInternalRequestState* requestState = + SKFLEXInternalRequestState* requestState = [self requestStateForRequestID:requestID]; [requestState.dataAccumulator appendData:data]; }]; @@ -1698,12 +1703,12 @@ static char const* const kFLEXRequestIDKey = "kFLEXRequestIDKey"; // first resume as the equivalent to connection:willSendRequest:... [self performBlock:^{ NSString* requestID = [[self class] requestIDForConnectionOrTask:task]; - FLEXInternalRequestState* requestState = + SKFLEXInternalRequestState* requestState = [self requestStateForRequestID:requestID]; if (!requestState.request) { requestState.request = task.currentRequest; - [[FLEXNetworkRecorder defaultRecorder] + [[SKFLEXNetworkRecorder defaultRecorder] recordRequestWillBeSentWithRequestID:requestID request:task.currentRequest redirectResponse:nil]; diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkRecorder.h b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkRecorder.h similarity index 88% rename from iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkRecorder.h rename to iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkRecorder.h index 9af03cb56..f446a1392 100755 --- a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkRecorder.h +++ b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkRecorder.h @@ -49,14 +49,14 @@ #import // Notifications posted when the record is updated -extern NSString* const kFLEXNetworkRecorderNewTransactionNotification; -extern NSString* const kFLEXNetworkRecorderTransactionUpdatedNotification; -extern NSString* const kFLEXNetworkRecorderUserInfoTransactionKey; -extern NSString* const kFLEXNetworkRecorderTransactionsClearedNotification; +extern NSString* const kSKFLEXNetworkRecorderNewTransactionNotification; +extern NSString* const kSKFLEXNetworkRecorderTransactionUpdatedNotification; +extern NSString* const kSKFLEXNetworkRecorderUserInfoTransactionKey; +extern NSString* const kSKFLEXNetworkRecorderTransactionsClearedNotification; -@class FLEXNetworkTransaction; +@class SKFLEXNetworkTransaction; -@interface FLEXNetworkRecorder : NSObject +@interface SKFLEXNetworkRecorder : NSObject /// In general, it only makes sense to have one recorder for the entire /// application. @@ -76,13 +76,13 @@ extern NSString* const kFLEXNetworkRecorderTransactionsClearedNotification; // Accessing recorded network activity -/// Array of FLEXNetworkTransaction objects ordered by start time with the +/// Array of SKFLEXNetworkTransaction objects ordered by start time with the /// newest first. -- (NSArray*)networkTransactions; +- (NSArray*)networkTransactions; /// The full response data IFF it hasn't been purged due to memory pressure. - (NSData*)cachedResponseBodyForTransaction: - (FLEXNetworkTransaction*)transaction; + (SKFLEXNetworkTransaction*)transaction; /// Dumps all network transactions and cached response bodies. - (void)clearRecordedActivity; diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkRecorder.mm b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkRecorder.mm similarity index 80% rename from iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkRecorder.mm rename to iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkRecorder.mm index 8247f37d4..a2db41b3c 100755 --- a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkRecorder.mm +++ b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkRecorder.mm @@ -44,43 +44,43 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -#import "FLEXNetworkRecorder.h" +#import "SKFLEXNetworkRecorder.h" -#import "FLEXNetworkTransaction.h" -#import "FLEXUtility.h" +#import "SKFLEXNetworkTransaction.h" +#import "SKFLEXUtility.h" -NSString* const kFLEXNetworkRecorderNewTransactionNotification = - @"kFLEXNetworkRecorderNewTransactionNotification"; -NSString* const kFLEXNetworkRecorderTransactionUpdatedNotification = - @"kFLEXNetworkRecorderTransactionUpdatedNotification"; -NSString* const kFLEXNetworkRecorderUserInfoTransactionKey = @"transaction"; -NSString* const kFLEXNetworkRecorderTransactionsClearedNotification = - @"kFLEXNetworkRecorderTransactionsClearedNotification"; +NSString* const kSKFLEXNetworkRecorderNewTransactionNotification = + @"kSKFLEXNetworkRecorderNewTransactionNotification"; +NSString* const kSKFLEXNetworkRecorderTransactionUpdatedNotification = + @"kSKFLEXNetworkRecorderTransactionUpdatedNotification"; +NSString* const kSKFLEXNetworkRecorderUserInfoTransactionKey = @"transaction"; +NSString* const kSKFLEXNetworkRecorderTransactionsClearedNotification = + @"kSKFLEXNetworkRecorderTransactionsClearedNotification"; -NSString* const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = - @"com.flex.responseCacheLimit"; +NSString* const kSKFLEXNetworkRecorderResponseCacheLimitDefaultsKey = + @"com.skflex.responseCacheLimit"; -@interface FLEXNetworkRecorder () +@interface SKFLEXNetworkRecorder () @property(nonatomic, strong) NSCache* responseCache; @property(nonatomic, strong) - NSMutableArray* orderedTransactions; + NSMutableArray* orderedTransactions; @property(nonatomic, strong) - NSMutableDictionary* + NSMutableDictionary* networkTransactionsForRequestIdentifiers; @property(nonatomic, strong) dispatch_queue_t queue; @property(nonatomic, strong) NSMutableDictionary* identifierDict; @end -@implementation FLEXNetworkRecorder +@implementation SKFLEXNetworkRecorder - (instancetype)init { self = [super init]; if (self) { _responseCache = [NSCache new]; NSUInteger responseCacheLimit = [[[NSUserDefaults standardUserDefaults] - objectForKey:kFLEXNetworkRecorderResponseCacheLimitDefaultsKey] + objectForKey:kSKFLEXNetworkRecorderResponseCacheLimitDefaultsKey] unsignedIntegerValue]; if (responseCacheLimit) { [_responseCache setTotalCostLimit:responseCacheLimit]; @@ -95,14 +95,14 @@ NSString* const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = // Serial queue used because we use mutable objects that are not thread safe _queue = dispatch_queue_create( - "com.flex.FLEXNetworkRecorder", DISPATCH_QUEUE_SERIAL); + "com.skflex.SKFLEXNetworkRecorder", DISPATCH_QUEUE_SERIAL); _identifierDict = [NSMutableDictionary dictionary]; } return self; } + (instancetype)defaultRecorder { - static FLEXNetworkRecorder* defaultRecorder = nil; + static SKFLEXNetworkRecorder* defaultRecorder = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ defaultRecorder = [[[self class] alloc] init]; @@ -124,11 +124,11 @@ NSString* const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = [self.responseCache setTotalCostLimit:responseCacheByteLimit]; [[NSUserDefaults standardUserDefaults] setObject:@(responseCacheByteLimit) - forKey:kFLEXNetworkRecorderResponseCacheLimitDefaultsKey]; + forKey:kSKFLEXNetworkRecorderResponseCacheLimitDefaultsKey]; } -- (NSArray*)networkTransactions { - __block NSArray* transactions = nil; +- (NSArray*)networkTransactions { + __block NSArray* transactions = nil; dispatch_sync(self.queue, ^{ transactions = [self.orderedTransactions copy]; }); @@ -136,7 +136,7 @@ NSString* const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = } - (NSData*)cachedResponseBodyForTransaction: - (FLEXNetworkTransaction*)transaction { + (SKFLEXNetworkTransaction*)transaction { return [self.responseCache objectForKey:transaction.requestID]; } @@ -167,12 +167,12 @@ NSString* const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = SKRequestInfo* info = [[SKRequestInfo alloc] initWithIdentifier:self.identifierDict[requestID].longLongValue - timestamp:[NSDate timestamp] + timestamp:(uint64_t)[NSDate timestamp] request:request data:request.HTTPBody]; [self.delegate didObserveRequest:info]; - FLEXNetworkTransaction* transaction = [FLEXNetworkTransaction new]; + SKFLEXNetworkTransaction* transaction = [SKFLEXNetworkTransaction new]; transaction.requestID = requestID; transaction.request = request; transaction.startTime = requestDate; @@ -180,7 +180,8 @@ NSString* const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = [self.orderedTransactions insertObject:transaction atIndex:0]; [self.networkTransactionsForRequestIdentifiers setObject:transaction forKey:requestID]; - transaction.transactionState = FLEXNetworkTransactionStateAwaitingResponse; + transaction.transactionState = + SKFLEXNetworkTransactionStateAwaitingResponse; }); } @@ -190,13 +191,13 @@ NSString* const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = NSDate* responseDate = [NSDate date]; dispatch_async(self.queue, ^{ - FLEXNetworkTransaction* transaction = + SKFLEXNetworkTransaction* transaction = self.networkTransactionsForRequestIdentifiers[requestID]; if (!transaction) { return; } transaction.response = response; - transaction.transactionState = FLEXNetworkTransactionStateReceivingData; + transaction.transactionState = SKFLEXNetworkTransactionStateReceivingData; transaction.latency = -[transaction.startTime timeIntervalSinceDate:responseDate]; }); @@ -206,7 +207,7 @@ NSString* const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = - (void)recordDataReceivedWithRequestID:(NSString*)requestID dataLength:(int64_t)dataLength { dispatch_async(self.queue, ^{ - FLEXNetworkTransaction* transaction = + SKFLEXNetworkTransaction* transaction = self.networkTransactionsForRequestIdentifiers[requestID]; if (!transaction) { return; @@ -220,17 +221,17 @@ NSString* const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = responseBody:(NSData*)responseBody { NSDate* finishedDate = [NSDate date]; dispatch_async(self.queue, ^{ - FLEXNetworkTransaction* transaction = + SKFLEXNetworkTransaction* transaction = self.networkTransactionsForRequestIdentifiers[requestID]; if (!transaction) { return; } - transaction.transactionState = FLEXNetworkTransactionStateFinished; + transaction.transactionState = SKFLEXNetworkTransactionStateFinished; transaction.duration = -[transaction.startTime timeIntervalSinceDate:finishedDate]; SKResponseInfo* responseInfo = [[SKResponseInfo alloc] initWithIndentifier:self.identifierDict[requestID].longLongValue - timestamp:[NSDate timestamp] + timestamp:(uint64_t)[NSDate timestamp] response:transaction.response data:responseBody]; self.identifierDict[requestID] = nil; // Clear the entry @@ -257,7 +258,7 @@ NSString* const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = - (void)recordLoadingFailedWithRequestID:(NSString*)requestID error:(NSError*)error { dispatch_async(self.queue, ^{ - FLEXNetworkTransaction* transaction = + SKFLEXNetworkTransaction* transaction = self.networkTransactionsForRequestIdentifiers[requestID]; if (!transaction) { return; @@ -265,12 +266,12 @@ NSString* const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = SKResponseInfo* responseInfo = [[SKResponseInfo alloc] initWithIndentifier:self.identifierDict[requestID].longLongValue - timestamp:[NSDate timestamp] + timestamp:(uint64_t)[NSDate timestamp] response:transaction.response data:nil]; self.identifierDict[requestID] = nil; // Clear the entry [self.delegate didObserveResponse:responseInfo]; - transaction.transactionState = FLEXNetworkTransactionStateFailed; + transaction.transactionState = SKFLEXNetworkTransactionStateFailed; transaction.duration = -[transaction.startTime timeIntervalSinceNow]; transaction.error = error; }); @@ -278,7 +279,7 @@ NSString* const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = - (void)recordMechanism:(NSString*)mechanism forRequestID:(NSString*)requestID { dispatch_async(self.queue, ^{ - FLEXNetworkTransaction* transaction = + SKFLEXNetworkTransaction* transaction = self.networkTransactionsForRequestIdentifiers[requestID]; if (!transaction) { return; diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkTransaction.h b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkTransaction.h similarity index 86% rename from iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkTransaction.h rename to iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkTransaction.h index 4ae9160d5..650bd1f73 100755 --- a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkTransaction.h +++ b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkTransaction.h @@ -46,22 +46,22 @@ #import -typedef NS_ENUM(NSInteger, FLEXNetworkTransactionState) { - FLEXNetworkTransactionStateUnstarted, - FLEXNetworkTransactionStateAwaitingResponse, - FLEXNetworkTransactionStateReceivingData, - FLEXNetworkTransactionStateFinished, - FLEXNetworkTransactionStateFailed +typedef NS_ENUM(NSInteger, SKFLEXNetworkTransactionState) { + SKFLEXNetworkTransactionStateUnstarted, + SKFLEXNetworkTransactionStateAwaitingResponse, + SKFLEXNetworkTransactionStateReceivingData, + SKFLEXNetworkTransactionStateFinished, + SKFLEXNetworkTransactionStateFailed }; -@interface FLEXNetworkTransaction : NSObject +@interface SKFLEXNetworkTransaction : NSObject @property(nonatomic, copy) NSString* requestID; @property(nonatomic, strong) NSURLRequest* request; @property(nonatomic, strong) NSURLResponse* response; @property(nonatomic, copy) NSString* requestMechanism; -@property(nonatomic, assign) FLEXNetworkTransactionState transactionState; +@property(nonatomic, assign) SKFLEXNetworkTransactionState transactionState; @property(nonatomic, strong) NSError* error; @property(nonatomic, strong) NSDate* startTime; @@ -74,6 +74,6 @@ typedef NS_ENUM(NSInteger, FLEXNetworkTransactionState) { @property(nonatomic, strong, readonly) NSData* cachedRequestBody; + (NSString*)readableStringFromTransactionState: - (FLEXNetworkTransactionState)state; + (SKFLEXNetworkTransactionState)state; @end diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkTransaction.m b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkTransaction.m similarity index 90% rename from iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkTransaction.m rename to iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkTransaction.m index fa5283d52..80f5cce87 100755 --- a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkTransaction.m +++ b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXNetworkTransaction.m @@ -44,15 +44,15 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -#import "FLEXNetworkTransaction.h" +#import "SKFLEXNetworkTransaction.h" -@interface FLEXNetworkTransaction () +@interface SKFLEXNetworkTransaction () @property(nonatomic, strong, readwrite) NSData* cachedRequestBody; @end -@implementation FLEXNetworkTransaction +@implementation SKFLEXNetworkTransaction - (NSString*)description { NSString* description = [super description]; @@ -94,26 +94,26 @@ } + (NSString*)readableStringFromTransactionState: - (FLEXNetworkTransactionState)state { + (SKFLEXNetworkTransactionState)state { NSString* readableString = nil; switch (state) { - case FLEXNetworkTransactionStateUnstarted: + case SKFLEXNetworkTransactionStateUnstarted: readableString = @"Unstarted"; break; - case FLEXNetworkTransactionStateAwaitingResponse: + case SKFLEXNetworkTransactionStateAwaitingResponse: readableString = @"Awaiting Response"; break; - case FLEXNetworkTransactionStateReceivingData: + case SKFLEXNetworkTransactionStateReceivingData: readableString = @"Receiving Data"; break; - case FLEXNetworkTransactionStateFinished: + case SKFLEXNetworkTransactionStateFinished: readableString = @"Finished"; break; - case FLEXNetworkTransactionStateFailed: + case SKFLEXNetworkTransactionStateFailed: readableString = @"Failed"; break; } diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXUtility.h b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXUtility.h similarity index 98% rename from iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXUtility.h rename to iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXUtility.h index bedf32deb..7c3758dda 100755 --- a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXUtility.h +++ b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXUtility.h @@ -62,7 +62,7 @@ @end -@interface FLEXUtility : NSObject +@interface SKFLEXUtility : NSObject // Swizzling utilities diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXUtility.mm b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXUtility.mm similarity index 97% rename from iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXUtility.mm rename to iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXUtility.mm index f70cc445f..c61cb5ef4 100755 --- a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXUtility.mm +++ b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKFLEXNetworkLib/SKFLEXUtility.mm @@ -44,7 +44,7 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -#import "FLEXUtility.h" +#import "SKFLEXUtility.h" #include #include @@ -54,11 +54,11 @@ #import -@implementation FLEXUtility +@implementation SKFLEXUtility + (SEL)swizzledSelectorForSelector:(SEL)selector { return NSSelectorFromString( - [NSString stringWithFormat:@"_flex_swizzle_%x_%@", + [NSString stringWithFormat:@"_skflex_swizzle_%x_%@", arc4random(), NSStringFromSelector(selector)]); } diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.mm b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.mm index d548a9c53..61e388fb4 100644 --- a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.mm +++ b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.mm @@ -8,8 +8,8 @@ #if FB_SONARKIT_ENABLED #import "SKIOSNetworkAdapter.h" -#import "FLEXNetworkLib/FLEXNetworkObserver.h" -#import "FLEXNetworkLib/FLEXNetworkRecorder.h" +#import "SKFLEXNetworkLib/SKFLEXNetworkObserver.h" +#import "SKFLEXNetworkLib/SKFLEXNetworkRecorder.h" @implementation SKIOSNetworkAdapter @synthesize delegate = _delegate; @@ -22,8 +22,8 @@ - (void)setDelegate:(id)delegate { _delegate = delegate; - [FLEXNetworkObserver start]; - [FLEXNetworkRecorder defaultRecorder].delegate = _delegate; + [SKFLEXNetworkObserver start]; + [SKFLEXNetworkRecorder defaultRecorder].delegate = _delegate; } @end