giuseppenuc/PNObject
1
0 Fork 0
Code Issues Pull Requests 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:
giuseppenuc committed 2017-01-03 22:21:32 +01:00
2 parents 99ad2b456b 9aa1e8b380
commit 72d6135f67
3 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

PNObject/Classes/PNClasses/PNUser.h
+2 -2
View File
@@ -78,7 +78,7 @@
* @param failure <#failure description#> * @param failure <#failure description#>
*/ */
+ (void) socialLoginFromViewController:(UIViewController* _Nullable) viewController + (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; failure:(nullable void (^)(NSError * _Nonnull error))failure;
@@ -87,7 +87,7 @@
+ (void) socialUserFromViewController:(UIViewController* _Nullable) viewController + (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; failure:(nullable void (^)(NSError * _Nonnull error))failure;
/** /**
PNObject/Classes/PNClasses/PNUser.m
+3 -3
View File
@@ -182,7 +182,7 @@ static bool isFirstAccess = YES;
} }
- (void) registerWithBlockProgress:(nullable void (^)(NSProgress * _Nonnull uploadProgress)) uploadProgress - (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 { failure:(nullable void (^)(NSError * _Nonnull error))failure {
[[self class] POSTWithEndpointAction:@"registration/register" parameters:[self JSONFormObject] [[self class] POSTWithEndpointAction:@"registration/register" parameters:[self JSONFormObject]
@@ -204,7 +204,7 @@ static bool isFirstAccess = YES;
+ (void) socialLoginFromViewController:(UIViewController* _Nullable) viewController + (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 { failure:(nullable void (^)(NSError * _Nonnull error))failure {
if (!viewController) { if (!viewController) {
@@ -284,7 +284,7 @@ static bool isFirstAccess = YES;
} }
+ (void) socialUserFromViewController:(UIViewController* _Nullable) viewController + (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 { failure:(nullable void (^)(NSError * _Nonnull error))failure {
if (!viewController) { if (!viewController) {
PNObject/Classes/PNObject.m
+1 -1
View File
@@ -13,7 +13,7 @@
#import "PNObjectConstants.h" #import "PNObjectConstants.h"
#import "PNObject+Protected.h" #import "PNObject+Protected.h"
#import "objc/runtime.h" #import "objc/runtime.h"
#import "PNObject+PNObjectConnection.m" #import "PNObject+PNObjectConnection.h"
#import <RZDataBinding/RZDataBinding.h> #import <RZDataBinding/RZDataBinding.h>
#import "HTTPStatusCodes.h" #import "HTTPStatusCodes.h"