AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #2549 from syershov/fix-oauth-ios7

Browse source 
[ios] Fix OAuth on iOS7
This commit is contained in:
Vladimir Byko-Ianko 2016-03-25 21:07:19 +03:00
commit 5f0d4c7799
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
View file

@ -1,3 +1,4 @@
#import "Common.h"
#import "MWMAlertViewController.h"
#import "MWMAuthorizationCommon.h"
#import "MWMAuthorizationWebViewLoginViewController.h"
@ -16,12 +17,17 @@ NSString * const kVerifierKey = @"oauth_verifier";
BOOL checkURLHasVerifierKey(NSString * urlString)
{
return [urlString containsString:kVerifierKey];
return isIOS7 ? [urlString rangeOfString:kVerifierKey].location != NSNotFound :
[urlString containsString:kVerifierKey];
}
BOOL checkURLNeedsReload(NSString * urlString)
{
return [urlString hasSuffix:@"/"] || [urlString containsString:@"/welcome"];
BOOL const hasSlashSuffix = [urlString hasSuffix:@"/"];
if (!isIOS7)
return hasSlashSuffix || [urlString containsString:@"/welcome"];
return hasSlashSuffix || ([urlString rangeOfString:@"/welcome"].location != NSNotFound);
}
NSString * getVerifier(NSString * urlString)