From f47de92117af74db0904f2f18072f13e6b7206a5 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Thu, 17 Jan 2019 07:24:05 -0800 Subject: [PATCH] Build sample app through BUCK Summary: This diff adds capabilty to build sample app through BUCK. Reviewed By: passy Differential Revision: D13697307 fbshipit-source-id: d7008bb4709b13384f65051631b365a0eceddfff --- .../SKIOSNetworkPlugin/SKIOSNetworkAdapter.mm | 4 ++-- .../FKUserDefaultsSwizzleUtility.m | 10 +++++----- iOS/Sample/Info.plist | 2 ++ iOS/Sample/NetworkViewController.m | 6 +++--- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.mm b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/SKIOSNetworkAdapter.mm index e96098d1b..4850e8d37 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 "FLEXNetworkObserver.h" -#import "FLEXNetworkRecorder.h" +#import "FLEXNetworkLib/FLEXNetworkObserver.h" +#import "FLEXNetworkLib/FLEXNetworkRecorder.h" @implementation SKIOSNetworkAdapter @synthesize delegate = _delegate; diff --git a/iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsSwizzleUtility.m b/iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsSwizzleUtility.m index 8e5611871..a95d2c1ce 100644 --- a/iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsSwizzleUtility.m +++ b/iOS/Plugins/FlipperKitUserDefaultsPlugin/FKUserDefaultsSwizzleUtility.m @@ -41,21 +41,21 @@ [[self sharedInstance] swizzleSelector:selector class:aClass block:block]; } -- (void)swizzleSelector:(SEL)selector class:(Class)aClass block:(void (^)(NSInvocation * _Nonnull))block { +- (void)swizzleSelector:(SEL)selector class:(Class)aClass block:(void (^)(NSInvocation * _Nonnull))blk { if (![self.swizzledClasses containsObject:aClass]) { SEL fwdSel = @selector(forwardInvocation:); Method m = class_getInstanceMethod(aClass, fwdSel); __block IMP orig; __weak typeof(self) weakSelf = self; - IMP imp = imp_implementationWithBlock(^(id self, NSInvocation *invocation) { + IMP imp = imp_implementationWithBlock(^(id this, NSInvocation *invocation) { NSString * selStr = NSStringFromSelector([invocation selector]); void (^block)(NSInvocation *) = weakSelf.swizzledBlocks[aClass][selStr]; - if (block != nil) { + if (blk != nil) { NSString *originalStr = [@"comfacebookFlipperKit_" stringByAppendingString:selStr]; [invocation setSelector:NSSelectorFromString(originalStr)]; block(invocation); } else { - ((void (*)(id, SEL, NSInvocation *))orig)(self, fwdSel, invocation); + ((void (*)(id, SEL, NSInvocation *))orig)(this, fwdSel, invocation); } }); orig = method_setImplementation(m, imp); @@ -66,7 +66,7 @@ classDict = [NSMutableDictionary dictionary]; self.swizzledBlocks[(id)aClass] = classDict; } - classDict[NSStringFromSelector(selector)] = block; + classDict[NSStringFromSelector(selector)] = blk; Method m = class_getInstanceMethod(aClass, selector); NSString *newSelStr = [@"comfacebookFlipperKit_" stringByAppendingString:NSStringFromSelector(selector)]; SEL newSel = NSSelectorFromString(newSelStr); diff --git a/iOS/Sample/Info.plist b/iOS/Sample/Info.plist index c12df3b8a..37484cc22 100644 --- a/iOS/Sample/Info.plist +++ b/iOS/Sample/Info.plist @@ -4,6 +4,8 @@ CFBundleDevelopmentRegion en + CFBundleDisplayName + Sample CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/iOS/Sample/NetworkViewController.m b/iOS/Sample/NetworkViewController.m index c64f7a205..9e2235af9 100644 --- a/iOS/Sample/NetworkViewController.m +++ b/iOS/Sample/NetworkViewController.m @@ -42,14 +42,14 @@ [urlRequest setHTTPBody:postData]; [urlRequest setHTTPMethod:@"POST"]; __weak NetworkViewController *weakSelf = self; - [[[NSURLSession sharedSession] dataTaskWithRequest:urlRequest completionHandler:^(NSData *_Nullable data, NSURLResponse *_Nullable response, NSError *_Nullable error) { + [[[NSURLSession sharedSession] dataTaskWithRequest:urlRequest completionHandler:^(NSData *_Nullable data, NSURLResponse *_Nullable response, NSError *_Nullable dataTaskError) { - if (error || !data) { + if (dataTaskError || !data) { UIAlertController *alertController = [weakSelf alertControllerForMessage:@"Received error in POST API response"]; [weakSelf presentViewController:alertController animated:true completion:nil]; return; } - NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error]; + NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:&dataTaskError]; NSLog(@"MSG-POST: %@", dict[@"msg"]); UIAlertController *alertController = [weakSelf alertControllerForMessage:@"Received response from POST API"];