Skip to content

Commit

Permalink
Spark Device Setup name, pod update to SDK 0.2.1, change initWithAuth…
Browse files Browse the repository at this point in the history
…enticationOnly to have BOOL parameter
  • Loading branch information
idokleinman committed Apr 22, 2015
1 parent 50bd971 commit 90a9c0a
Show file tree
Hide file tree
Showing 13 changed files with 632 additions and 571 deletions.
12 changes: 6 additions & 6 deletions Classes/User/SparkSetupMainController.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ typedef NS_ENUM(NSInteger, SparkSetupMainControllerResult) {
SparkSetupMainControllerResultSuccess=1,
SparkSetupMainControllerResultFailure,
SparkSetupMainControllerResultUserCancel,
SparkSetupMainControllerResultLoggedIn, // relevant to initAuthentication() only
SparkSetupMainControllerResultLoggedIn, // relevant to initWithAuthenticationOnly:YES only

};

Expand All @@ -39,12 +39,10 @@ extern NSString *const kSparkSetupDidFinishDeviceKey;
@end


@interface SparkSetupMainController : UIViewController// UINavigationController
@interface SparkSetupMainController : UIViewController

// Viewcontroller displaying the modal setup UI control
@property (nonatomic, weak) id<SparkSetupMainControllerDelegate> delegate;
//@property (nonatomic, strong) SparkSetupCustomization *customization;


/**
* Entry point for invoking Spark Soft AP setup wizard, use by calling this on your viewController:
Expand All @@ -58,13 +56,15 @@ extern NSString *const kSparkSetupDidFinishDeviceKey;

/**
* Entry point for invoking Spark Cloud authentication (login/signup/password recovery screens) only, use by calling this on your viewController:
* SparkSetupMainController *setupController = [[SparkSetupMainController alloc] initAuthentication];
* SparkSetupMainController *setupController = [[SparkSetupMainController alloc] initWithAuthenticationOnly:YES];
* [self presentViewController:setupController animated:YES completion:nil];
* After user has successfully logged in or signed up, control will be return to the calling app. If an active user session already exists control will be returned immediately
*
* @param yesOrNo YES will invoke Authentication wizard only, NO will invoke whole Device Setup process (will skip authentication if user session is active, same as calling -init)
*
* @return An inititalized SparkSetupMainController instance ready to be presented.
*/
-(instancetype)initWithAuthenticationOnly;
-(instancetype)initWithAuthenticationOnly:(BOOL)yesOrNo;

/**
* Open setup wizard in Signup screen with a pre-filled activation code from a URL scheme which was used to open the app
Expand Down
6 changes: 3 additions & 3 deletions Classes/User/SparkSetupMainController.m
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ +(UIStoryboard *)getSetupStoryboard

-(instancetype)init
{
SparkSetupMainController* mainVC = [super init]; // super init is not actually required
SparkSetupMainController* mainVC = [super init]; // super init is not actually required, but supress the warning
self.authenticationOnly = NO;

@try {
Expand All @@ -62,10 +62,10 @@ -(instancetype)init
}


-(instancetype)initWithAuthenticationOnly
-(instancetype)initWithAuthenticationOnly:(BOOL)yesOrNo;
{
SparkSetupMainController* mainVC = [self init];
self.authenticationOnly = YES;
self.authenticationOnly = yesOrNo;
return mainVC;
}

Expand Down
12 changes: 6 additions & 6 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ PODS:
- AFNetworking/UIKit (2.5.3):
- AFNetworking/NSURLConnection
- AFNetworking/NSURLSession
- Spark-SDK (0.2.0):
- Spark-SDK/Helpers (= 0.2.0)
- Spark-SDK/SDK (= 0.2.0)
- Spark-SDK/Helpers (0.2.0)
- Spark-SDK/SDK (0.2.0):
- Spark-SDK (0.2.1):
- Spark-SDK/Helpers (= 0.2.1)
- Spark-SDK/SDK (= 0.2.1)
- Spark-SDK/Helpers (0.2.1)
- Spark-SDK/SDK (0.2.1):
- AFNetworking
- Spark-SDK/Helpers

Expand All @@ -33,6 +33,6 @@ DEPENDENCIES:

SPEC CHECKSUMS:
AFNetworking: e1d86c2a96bb5d2e7408da36149806706ee122fe
Spark-SDK: 22e227ac86cc465f3a713bdc252543aead61499d
Spark-SDK: dee94fbbe67732cda3563b1aec80c556434d3842

COCOAPODS: 0.36.4
12 changes: 6 additions & 6 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

960 changes: 480 additions & 480 deletions Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

27 changes: 6 additions & 21 deletions Pods/Spark-SDK/Pod/Classes/SDK/SparkCloud.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 22 additions & 10 deletions Pods/Spark-SDK/Pod/Classes/SDK/SparkCloud.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 13 additions & 3 deletions Pods/Spark-SDK/Pod/Classes/SDK/SparkDevice.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 90a9c0a

Please sign in to comment.