jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply clang-format

Browse Source 
Reviewed By: igorsugak

Differential Revision: D28477074

fbshipit-source-id: f15dfc45b9fb30c661ebe2899cd882676d0fdf2a
This commit is contained in:
Andres Suarez
2021-05-20 21:22:47 -07:00
committed by Facebook GitHub Bot
parent bf32eca8fc
commit 39172f6413
2 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkObserver.mm
View File

@@ -430,8 +430,8 @@ typedef void (^NSURLSessionAsyncCompletion)(
SEL selector = @selector(sendSynchronousRequest:returningResponse:error:); SEL selector = @selector(sendSynchronousRequest:returningResponse:error:);
SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector];
NSData* (^syncSwizzleBlock)( NSData* (
Class, NSURLRequest*, NSURLResponse**, NSError**) = ^syncSwizzleBlock)(Class, NSURLRequest*, NSURLResponse**, NSError**) =
^NSData*( ^NSData*(
Class slf, Class slf,
NSURLRequest* request, NSURLRequest* request,
@@ -449,8 +449,9 @@ typedef void (^NSURLSessionAsyncCompletion)(
forRequestID:requestID]; forRequestID:requestID];
NSError* temporaryError = nil; NSError* temporaryError = nil;
NSURLResponse* temporaryResponse = nil; NSURLResponse* temporaryResponse = nil;
data = ((id(*)(id, SEL, id, NSURLResponse**, NSError**))objc_msgSend)( data =
slf, swizzledSelector, request, &temporaryResponse, &temporaryError); ((id(*)(id, SEL, id, NSURLResponse**, NSError**))
objc_msgSend)(slf, swizzledSelector, request, &temporaryResponse, &temporaryError);
[[FLEXNetworkRecorder defaultRecorder] [[FLEXNetworkRecorder defaultRecorder]
recordResponseReceivedWithRequestID:requestID recordResponseReceivedWithRequestID:requestID
response:temporaryResponse]; response:temporaryResponse];
@@ -511,8 +512,8 @@ typedef void (^NSURLSessionAsyncCompletion)(
className = [[NSURLSession sharedSession] class]; className = [[NSURLSession sharedSession] class];
} }
NSURLSessionTask* (^asyncDataOrDownloadSwizzleBlock)( NSURLSessionTask* (
Class, id, NSURLSessionAsyncCompletion) = ^asyncDataOrDownloadSwizzleBlock)(Class, id, NSURLSessionAsyncCompletion) =
^NSURLSessionTask*( ^NSURLSessionTask*(
Class slf, id argument, NSURLSessionAsyncCompletion completion) { Class slf, id argument, NSURLSessionAsyncCompletion completion) {
NSURLSessionTask* task = nil; NSURLSessionTask* task = nil;
@@ -528,12 +529,16 @@ typedef void (^NSURLSessionAsyncCompletion)(
[self asyncCompletionWrapperForRequestID:requestID [self asyncCompletionWrapperForRequestID:requestID
mechanism:mechanism mechanism:mechanism
completion:completion]; completion:completion];
task = ((id(*)(id, SEL, id, id))objc_msgSend)( task = ((id(*)(
slf, swizzledSelector, argument, completionWrapper); id,
SEL,
id,
id))objc_msgSend)(slf, swizzledSelector, argument, completionWrapper);
[self setRequestID:requestID forConnectionOrTask:task]; [self setRequestID:requestID forConnectionOrTask:task];
} else { } else {
task = ((id(*)(id, SEL, id, id))objc_msgSend)( task =
slf, swizzledSelector, argument, completion); ((id(*)(id, SEL, id, id))
objc_msgSend)(slf, swizzledSelector, argument, completion);
} }
return task; return task;
}; };
@@ -574,8 +579,8 @@ typedef void (^NSURLSessionAsyncCompletion)(
className = [[NSURLSession sharedSession] class]; className = [[NSURLSession sharedSession] class];
} }
NSURLSessionUploadTask* (^asyncUploadTaskSwizzleBlock)( NSURLSessionUploadTask* (
Class, NSURLRequest*, id, NSURLSessionAsyncCompletion) = ^asyncUploadTaskSwizzleBlock)(Class, NSURLRequest*, id, NSURLSessionAsyncCompletion) =
^NSURLSessionUploadTask*( ^NSURLSessionUploadTask*(
Class slf, Class slf,
NSURLRequest* request, NSURLRequest* request,
@@ -590,12 +595,20 @@ typedef void (^NSURLSessionAsyncCompletion)(
[self asyncCompletionWrapperForRequestID:requestID [self asyncCompletionWrapperForRequestID:requestID
mechanism:mechanism mechanism:mechanism
completion:completion]; completion:completion];
task = ((id(*)(id, SEL, id, id, id))objc_msgSend)( task = ((id(*)(
slf, swizzledSelector, request, argument, completionWrapper); id,
SEL,
id,
id,
id))objc_msgSend)(slf, swizzledSelector, request, argument, completionWrapper);
[self setRequestID:requestID forConnectionOrTask:task]; [self setRequestID:requestID forConnectionOrTask:task];
} else { } else {
task = ((id(*)(id, SEL, id, id, id))objc_msgSend)( task = ((id(*)(
slf, swizzledSelector, request, argument, completion); id,
SEL,
id,
id,
id))objc_msgSend)(slf, swizzledSelector, request, argument, completion);
} }
return task; return task;
}; };
@@ -665,11 +678,8 @@ typedef void (^NSURLSessionAsyncCompletion)(
struct objc_method_description methodDescription = struct objc_method_description methodDescription =
protocol_getMethodDescription(protocol, selector, NO, YES); protocol_getMethodDescription(protocol, selector, NO, YES);
typedef NSURLRequest* (^NSURLConnectionWillSendRequestBlock)( typedef NSURLRequest* (
id<NSURLConnectionDelegate> slf, ^NSURLConnectionWillSendRequestBlock)(id<NSURLConnectionDelegate> slf, NSURLConnection* connection, NSURLRequest* request, NSURLResponse* response);
NSURLConnection* connection,
NSURLRequest* request,
NSURLResponse* response);
NSURLConnectionWillSendRequestBlock undefinedBlock = ^NSURLRequest*( NSURLConnectionWillSendRequestBlock undefinedBlock = ^NSURLRequest*(
id<NSURLConnectionDelegate> slf, id<NSURLConnectionDelegate> slf,
@@ -695,8 +705,12 @@ typedef void (^NSURLSessionAsyncCompletion)(
undefinedBlock(slf, connection, request, response); undefinedBlock(slf, connection, request, response);
} }
originalImplementationBlock:^{ originalImplementationBlock:^{
returnValue = ((id(*)(id, SEL, id, id, id))objc_msgSend)( returnValue = ((id(*)(
slf, swizzledSelector, connection, request, response); id,
SEL,
id,
id,
id))objc_msgSend)(slf, swizzledSelector, connection, request, response);
}]; }];
return returnValue; return returnValue;
}; };

8
xplat/Flipper/FlipperConnectionManagerImpl.cpp
View File

@@ -362,10 +362,10 @@ void FlipperConnectionManagerImpl::requestSignedCertFromFlipper() {
int medium = certProvider_ != nullptr int medium = certProvider_ != nullptr
? certProvider_->getCertificateExchangeMedium() ? certProvider_->getCertificateExchangeMedium()
: FlipperCertificateExchangeMedium::FS_ACCESS; : FlipperCertificateExchangeMedium::FS_ACCESS;
folly::dynamic message = folly::dynamic message = folly::dynamic::object("method", "signCertificate")(
folly::dynamic::object("method", "signCertificate")("csr", csr.c_str())( "csr", csr.c_str())(
"destination", contextStore_->getCertificateDirectoryPath().c_str())( "destination",
"medium", medium); contextStore_->getCertificateDirectoryPath().c_str())("medium", medium);
auto gettingCert = flipperState_->start("Getting cert from desktop"); auto gettingCert = flipperState_->start("Getting cert from desktop");
flipperEventBase_->add([this, message, gettingCert]() { flipperEventBase_->add([this, message, gettingCert]() {