Merge pull request #37 from ParsePlatform/nlutsenko.warnings

nlutsenko · nlutsenko · commit 9c4bb7c26f73 · 2016-01-06T20:31:34.000-08:00
Fix warnings and update to Xcode 7.2
diff --git a/ParseFacebookUtils.xcodeproj/project.pbxproj b/ParseFacebookUtils.xcodeproj/project.pbxproj
@@ -439,7 +439,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = PF;
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 0720;
 				ORGANIZATIONNAME = "Parse, LLC";
 				TargetAttributes = {
 					813A25561AC0F3E2007F54F3 = {
diff --git a/ParseFacebookUtils.xcodeproj/xcshareddata/xcschemes/ParseFacebookUtils-iOS.xcscheme b/ParseFacebookUtils.xcodeproj/xcshareddata/xcschemes/ParseFacebookUtils-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ParseFacebookUtils/Internal/PFFacebookAuthenticationProvider.m b/ParseFacebookUtils/Internal/PFFacebookAuthenticationProvider.m
@@ -114,6 +114,7 @@ - (BFTask *)authenticateAsync {
         }
     }
     [self.session openWithBehavior:behavior
+                fromViewController:nil
                  completionHandler:^(FBSession *callingSession, FBSessionState status, NSError *openError) {
                      if (called) {
                          if ((status & FBSessionStateOpenTokenExtended) == FBSessionStateOpenTokenExtended &&
@@ -235,6 +236,7 @@ - (BOOL)restoreAuthenticationWithAuthData:(nullable NSDictionary<NSString *, NSS
 
                 if (rawSession.state == FBSessionStateCreatedTokenLoaded) {
                     [rawSession openWithBehavior:FBSessionLoginBehaviorWithNoFallbackToWebView
+                              fromViewController:nil
                                completionHandler:^(FBSession *callingSession, FBSessionState status, NSError *error) {
                                    if (!called) {
                                        if (callingSession.isOpen && self.currentOperationId == scopedOperationId) {
diff --git a/ParseFacebookUtils/Internal/PFReceptionist.m b/ParseFacebookUtils/Internal/PFReceptionist.m
@@ -31,12 +31,12 @@ @implementation PFReceptionist {
     NSThread *_affinitizedThread;
 }
 
-- (instancetype)initWithTarget:(NSObject *)newTarget thread:(NSThread *)thread {
-    if (!newTarget) {
+- (instancetype)initWithTarget:(id)target thread:(NSThread *)thread {
+    if (!target) {
         return nil;
     }
 
-    _target = newTarget;
+    _target = target;
     _affinitizedThread = thread;
 
     return self;
diff --git a/Tests/Unit/FacebookAuthenticationProviderTests.m b/Tests/Unit/FacebookAuthenticationProviderTests.m
@@ -93,12 +93,13 @@ - (void)testAuthenticateSuccess {
 
     OCMStub([mockedSession valueForKey:@"self"]).andReturnWeak(mockedSession);
     OCMStub([[mockedSession ignoringNonObjectArgs] openWithBehavior:0
+                                                 fromViewController:nil
                                                   completionHandler:OCMOCK_ANY]).andDo(^(NSInvocation *invocation) {
         __unsafe_unretained FBSession *theSession = nil;
         __unsafe_unretained FBSessionStateHandler handler = nil;
 
         [invocation getArgument:&theSession atIndex:0];
-        [invocation getArgument:&handler atIndex:3];
+        [invocation getArgument:&handler atIndex:4];
 
         [provider.tokenCache setAccessToken:@"token"];
         [provider.tokenCache setExpirationDate:[NSDate dateWithTimeIntervalSince1970:1337]];
@@ -162,12 +163,13 @@ - (void)testAuthenticateIncompleteCachedSession {
 
     OCMStub([mockedSession valueForKey:@"self"]).andReturnWeak(mockedSession);
     OCMStub([[mockedSession ignoringNonObjectArgs] openWithBehavior:0
+                                                 fromViewController:nil
                                                   completionHandler:OCMOCK_ANY]).andDo(^(NSInvocation *invocation) {
         __unsafe_unretained FBSession *theSession = nil;
         __unsafe_unretained FBSessionStateHandler handler = nil;
 
         [invocation getArgument:&theSession atIndex:0];
-        [invocation getArgument:&handler atIndex:3];
+        [invocation getArgument:&handler atIndex:4];
 
         [provider.tokenCache setAccessToken:@"token"];
         [provider.tokenCache setExpirationDate:[NSDate dateWithTimeIntervalSince1970:1337]];
@@ -238,12 +240,13 @@ - (void)testTokenExtension {
 
     OCMStub([mockedSession valueForKey:@"self"]).andReturnWeak(mockedSession);
     OCMStub([[mockedSession ignoringNonObjectArgs] openWithBehavior:0
+                                                 fromViewController:nil
                                                   completionHandler:OCMOCK_ANY]).andDo(^(NSInvocation *invocation) {
         __unsafe_unretained FBSession *theSession = nil;
         __unsafe_unretained FBSessionStateHandler handler = nil;
 
         [invocation getArgument:&theSession atIndex:0];
-        [invocation getArgument:&handler atIndex:3];
+        [invocation getArgument:&handler atIndex:4];
 
         [provider.tokenCache setAccessToken:@"token"];
         [provider.tokenCache setExpirationDate:[NSDate dateWithTimeIntervalSince1970:1337]];

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@ - (BFTask *)authenticateAsync {`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`	`[self.session openWithBehavior:behavior`
	`117`	`+ fromViewController:nil`
`117`	`118`	`completionHandler:^(FBSession callingSession, FBSessionState status, NSError openError) {`
`118`	`119`	`if (called) {`
`119`	`120`	`if ((status & FBSessionStateOpenTokenExtended) == FBSessionStateOpenTokenExtended &&`
`@@ -235,6 +236,7 @@ - (BOOL)restoreAuthenticationWithAuthData:(nullable NSDictionary<NSString *, NSS`
`235`	`236`
`236`	`237`	`if (rawSession.state == FBSessionStateCreatedTokenLoaded) {`
`237`	`238`	`[rawSession openWithBehavior:FBSessionLoginBehaviorWithNoFallbackToWebView`
	`239`	`+ fromViewController:nil`
`238`	`240`	`completionHandler:^(FBSession callingSession, FBSessionState status, NSError error) {`
`239`	`241`	`if (!called) {`
`240`	`242`	`if (callingSession.isOpen && self.currentOperationId == scopedOperationId) {`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,12 @@ @implementation PFReceptionist {`
`31`	`31`	`NSThread *_affinitizedThread;`
`32`	`32`	`}`
`33`	`33`
`34`		`-- (instancetype)initWithTarget:(NSObject )newTarget thread:(NSThread )thread {`
`35`		`- if (!newTarget) {`
	`34`	`+- (instancetype)initWithTarget:(id)target thread:(NSThread *)thread {`
	`35`	`+ if (!target) {`
`36`	`36`	`return nil;`
`37`	`37`	`}`
`38`	`38`
`39`		`- _target = newTarget;`
	`39`	`+ _target = target;`
`40`	`40`	`_affinitizedThread = thread;`
`41`	`41`
`42`	`42`	`return self;`