From 384cebc7695f23549279740e350a742bd31e488b Mon Sep 17 00:00:00 2001
From: Sergey Yershov <yershov@corp.mail.ru>
Date: Fri, 25 Mar 2016 21:02:42 +0300
Subject: [PATCH] [ios] Fix OAuth on iOS7

---
 .../MWMAuthorizationWebViewLoginViewController.mm      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
index 853e285c13..14826f6310 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
@@ -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)