-
Notifications
You must be signed in to change notification settings - Fork 602
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added isEnabled getters for OHHTTPStubs. #159
Merged
+71
−7
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
b0fac31
Added isEnabled getters for OHHTTPStubs.
jzucker2 6b760a5
Refactored isEnabled for thread safety
jzucker2 5a43e45
Use BOOL for enableState instead of NSNumber
jzucker2 e3ad6db
Simplify check for isEnabled in NSURLSessionConfiguration
jzucker2 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -149,9 +149,11 @@ +(void)removeAllStubs | |
|
||
#pragma mark > Disabling & Re-Enabling stubs | ||
|
||
static BOOL currentEnabledState = NO; | ||
|
||
+(void)setEnabled:(BOOL)enable | ||
{ | ||
static BOOL currentEnabledState = NO; | ||
currentEnabledState = NO; | ||
if (enable && !currentEnabledState) | ||
{ | ||
[NSURLProtocol registerClass:OHHTTPStubsProtocol.class]; | ||
|
@@ -163,6 +165,11 @@ +(void)setEnabled:(BOOL)enable | |
currentEnabledState = enable; | ||
} | ||
|
||
+ (BOOL)isEnabled | ||
{ | ||
return currentEnabledState; | ||
} | ||
|
||
#if defined(__IPHONE_7_0) || defined(__MAC_10_9) | ||
+ (void)setEnabled:(BOOL)enable forSessionConfiguration:(NSURLSessionConfiguration*)sessionConfig | ||
{ | ||
|
@@ -189,6 +196,31 @@ + (void)setEnabled:(BOOL)enable forSessionConfiguration:(NSURLSessionConfigurati | |
@"this method if the user is running iOS7+/OSX9+.", NSStringFromSelector(_cmd)); | ||
} | ||
} | ||
|
||
+ (BOOL)isEnabledForSessionConfiguration:(NSURLSessionConfiguration *)sessionConfig | ||
{ | ||
// Runtime check to make sure the API is available on this version | ||
if ( [sessionConfig respondsToSelector:@selector(protocolClasses)] | ||
&& [sessionConfig respondsToSelector:@selector(setProtocolClasses:)]) | ||
{ | ||
NSMutableArray * urlProtocolClasses = [NSMutableArray arrayWithArray:sessionConfig.protocolClasses]; | ||
Class protoCls = OHHTTPStubsProtocol.class; | ||
if ([urlProtocolClasses containsObject:protoCls]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not directly There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good point! |
||
{ | ||
return YES; | ||
} else | ||
{ | ||
return NO; | ||
} | ||
} | ||
else | ||
{ | ||
NSLog(@"[OHHTTPStubs] %@ is only available when running on iOS7+/OSX9+. " | ||
@"Use conditions like 'if ([NSURLSessionConfiguration class])' to only call " | ||
@"this method if the user is running iOS7+/OSX9+.", NSStringFromSelector(_cmd)); | ||
return NO; | ||
} | ||
} | ||
#endif | ||
|
||
#pragma mark > Debug Methods | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
global variables are not thread safe, so this is not an acceptable solution. You could instead add an
atomic
property on the shared instance for example.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the suggestion!