Merge pull request #32 from ParsePlatform/nlutsenko.warnings

Fix analyzer and build warnings.
parse-community · Jun 28, 2016 · 339cbe3 · 339cbe3
2 parents 56d6ecc + e92ad9a
commit 339cbe3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ParseTwitterUtils/Internal/OAuthCore/PF_OAuthCore.m b/ParseTwitterUtils/Internal/OAuthCore/PF_OAuthCore.m
@@ -84,7 +84,9 @@ + (NSString *)authorizationHeaderFromConfiguration:(PFOAuthConfiguration *)confi
     // combine all parameters
     NSMutableDictionary *parameters = [oAuthAuthorizationParameters mutableCopy];
     [parameters addEntriesFromDictionary:additionalQueryParameters];
-    [parameters addEntriesFromDictionary:additionalBodyParameters];
+    if (additionalBodyParameters) {
+        [parameters addEntriesFromDictionary:additionalBodyParameters];
+    }
 
     NSArray *sortedKeys = [[parameters allKeys] sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2) {
         return [obj1 compare:obj2] ?: [parameters[obj1] compare:parameters[obj2]];

diff --git a/Tests/Unit/TwitterTests.m b/Tests/Unit/TwitterTests.m
@@ -643,7 +643,6 @@ - (void)testDeauthorizeLoggedOutAccount {
 - (void)testDeauthorizeLoggedInAccount {
     id mockedStore = PFStrictClassMock([ACAccountStore class]);
     id mockedURLSession = PFStrictClassMock([NSURLSession class]);
-    id mockedOperationQueue = PFStrictClassMock([NSOperationQueue class]);
 
     id mockedDialog = PFStrictProtocolMock(@protocol(PFOAuth1FlowDialogInterface));
     PF_Twitter *twitter = [[PF_Twitter alloc] initWithAccountStore:mockedStore urlSession:mockedURLSession dialogClass:mockedDialog];