giuseppenuc/PNObject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-fix-warning' into develop

Browse Source 
* dev-fix-warning:
  no message

# Conflicts:
#	Example/Podfile.lock
#	Example/Pods/Local Podspecs/PNObject.podspec.json
#	Example/Pods/Manifest.lock
#	PNObject.podspec
#	PNObject/Classes/PNObjectConfig.h
This commit is contained in:
Giuseppe Nucifora 2017-01-03 22:21:32 +01:00
commit 72d6135f67
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PNObject/Classes/PNClasses/PNUser.h
View File

@ -78,7 +78,7 @@
* @param failure <#failure description#>
*/
+ (void) socialLoginFromViewController:(UIViewController* _Nullable) viewController
blockSuccess:(nullable void (^)(PNUser * _Nullable responseObject))success
blockSuccess:(nullable void (^)(PNUser * _Nullable user))success
failure:(nullable void (^)(NSError * _Nonnull error))failure;
@ -87,7 +87,7 @@
+ (void) socialUserFromViewController:(UIViewController* _Nullable) viewController
blockSuccess:(nullable void (^)(PNUser * _Nullable responseObject))success
blockSuccess:(nullable void (^)(PNUser * _Nullable user))success
failure:(nullable void (^)(NSError * _Nonnull error))failure;
/**

6
PNObject/Classes/PNClasses/PNUser.m
View File

@ -182,7 +182,7 @@ static bool isFirstAccess = YES;
}
- (void) registerWithBlockProgress:(nullable void (^)(NSProgress * _Nonnull uploadProgress)) uploadProgress
Success:(nullable void (^)(PNUser * _Nullable responseObject))success
Success:(nullable void (^)(PNUser * _Nullable user))success
failure:(nullable void (^)(NSError * _Nonnull error))failure {
[[self class] POSTWithEndpointAction:@"registration/register" parameters:[self JSONFormObject]
@ -204,7 +204,7 @@ static bool isFirstAccess = YES;
+ (void) socialLoginFromViewController:(UIViewController* _Nullable) viewController
blockSuccess:(nullable void (^)(PNUser * _Nullable responseObject))success
blockSuccess:(nullable void (^)(PNUser * _Nullable user))success
failure:(nullable void (^)(NSError * _Nonnull error))failure {
if (!viewController) {
@ -284,7 +284,7 @@ static bool isFirstAccess = YES;
}
+ (void) socialUserFromViewController:(UIViewController* _Nullable) viewController
blockSuccess:(nullable void (^)(PNUser * _Nullable responseObject))success
blockSuccess:(nullable void (^)(PNUser * _Nullable user))success
failure:(nullable void (^)(NSError * _Nonnull error))failure {
if (!viewController) {

2
PNObject/Classes/PNObject.m
View File

@ -13,7 +13,7 @@
#import "PNObjectConstants.h"
#import "PNObject+Protected.h"
#import "objc/runtime.h"
#import "PNObject+PNObjectConnection.m"
#import "PNObject+PNObjectConnection.h"
#import <RZDataBinding/RZDataBinding.h>
#import "HTTPStatusCodes.h"