Fixed bug related with show/not show pincode depend of the state of the ssoviewcontroller

Author: ggdiez

Owncloud iOs Client/AppDelegate.m

@@ -1699,7 +1699,7 @@ - (void)application:(UIApplication *)application handleEventsForBackgroundURLSes
 #pragma mark - Pass Code
 
 - (void)checkIfIsNecesaryShowPassCode {
-    if ([ManageAppSettingsDB isPasscode] || k_is_passcode_forced) {
+    if (([ManageAppSettingsDB isPasscode] || k_is_passcode_forced) && (_isPasscodeVisible == false) && ([PresentedViewUtils isSSOViewControllerPresentedAndLoading:self.window] == false)) {
         dispatch_async(dispatch_get_main_queue(), ^{
 
             KKPasscodeViewController* vc = [[KKPasscodeViewController alloc] initWithNibName:nil bundle:nil];
@@ -1726,7 +1726,7 @@ - (void)checkIfIsNecesaryShowPassCode {
             } else {
                 oc.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
                 oc.modalPresentationStyle = UIModalPresentationFormSheet;
-                [rootController presentViewController:oc animated:NO completion:nil];
+               [rootController presentViewController:oc animated:NO completion:nil];
             }
         });
     } else {        
@@ -1737,7 +1737,7 @@ - (void)checkIfIsNecesaryShowPassCode {
 
 - (void)checkIfIsNecesaryShowPassCodeWillResignActive {
 
-    if ([ManageAppSettingsDB isPasscode] || k_is_passcode_forced) {
+    if (([ManageAppSettingsDB isPasscode] || k_is_passcode_forced) && (_isPasscodeVisible == false) && ([PresentedViewUtils isSSOViewControllerPresentedAndLoading:self.window] == false)) {
         dispatch_async(dispatch_get_main_queue(), ^{
 
             KKPasscodeViewController* vc = [[KKPasscodeViewController alloc] initWithNibName:nil bundle:nil];

Owncloud iOs Client/Branding/Customization.h

@@ -26,7 +26,7 @@
 #define k_hide_url_server NO
 
 //Set a default url server. It must be obligatory if we hide the url server (#define k_hide_url_server YES)
-#define k_default_url_server @""
+#define k_default_url_server @"https://docker.oc.solidgear.es:63360/oc-shib/"
 
 //force override existing accounts with k_default_url_server. It must be obligatory if we change authentication type (k_is_sso_active)
 #define k_force_update_of_server_url NO
@@ -44,7 +44,7 @@
 #define k_is_oauth_active NO
 
 //Have SAML active
-#define k_is_sso_active NO
+#define k_is_sso_active YES
 
 //OAuth server
 #define k_oauth_login @""

Owncloud iOs Client/Login/SSO/SSOViewController.h

@@ -10,7 +10,7 @@
 //
 
 /*
- Copyright (C) 2016, ownCloud GmbH.
+ Copyright (C) 2017, ownCloud GmbH.
  This code is covered by the GNU Public License Version 3.
  For distribution utilizing Apple mechanisms please see https://owncloud.org/contribute/iOS-license-exception/
  You should have received a copy of this license
@@ -29,12 +29,11 @@
 
 @interface SSOViewController : UIViewController <UIWebViewDelegate, UIAlertViewDelegate, UITextFieldDelegate, NSURLConnectionDelegate, NSURLConnectionDataDelegate, ManageNetworkErrorsDelegate>
 
-
-
 @property (nonatomic, strong) IBOutlet UIWebView *webView;
 @property (nonatomic, strong) UIActivityIndicatorView *activity;
 @property (nonatomic, strong) NSString *ownCloudServerUrlString;
 @property (nonatomic, strong) NSString *urlString;
+@property (nonatomic) BOOL isLoading;
 @property (nonatomic,weak) __weak id<SSODelegate> delegate;
 
 #pragma mark - Properties for SAML server with 401 error. Like Microsoft NTLM

Owncloud iOs Client/Login/SSO/SSOViewController.m

@@ -9,7 +9,7 @@
 //
 
 /*
- Copyright (C) 2016, ownCloud GmbH.
+ Copyright (C) 2017, ownCloud GmbH.
  This code is covered by the GNU Public License Version 3.
  For distribution utilizing Apple mechanisms please see https://owncloud.org/contribute/iOS-license-exception/
  You should have received a copy of this license
@@ -242,6 +242,7 @@ - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
 
 - (void)webViewDidStartLoad:(UIWebView *)webView {
     DLog(@"_webViewDidStartLoad_: %@", webView.request.URL.absoluteString);
+    self.isLoading = true;
 
     [_webView endEditing:YES];
 
@@ -257,8 +258,8 @@ - (void)webViewDidStartLoad:(UIWebView *)webView {
 }
 
 -(void)webViewDidFinishLoad:(UIWebView *)webView {
-    
     DLog(@"_webViewDidFinishLoad_");
+    self.isLoading = false;
 
     [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(delay) object:nil];
 

Owncloud iOs Client/Utils/PresentedViewUtils.h

@@ -20,5 +20,6 @@
 
 + (UIViewController *) getPresentedViewControllerInWindow: (UIWindow *)window;
 + (BOOL) isSSOViewControllerPresentedInWindow: (UIWindow *)window withPassCodeVisible: (BOOL) isPasscodeVisible;
++ (BOOL) isSSOViewControllerPresentedAndLoading: (UIWindow *) window;
 
 @end

Owncloud iOs Client/Utils/PresentedViewUtils.m

@@ -18,8 +18,8 @@
 
 @implementation PresentedViewUtils
 
-+ (UIViewController *) getPresentedViewControllerInWindow: (UIWindow *)window {
-    UIViewController *presentedVC = window.rootViewController;
++ (UIViewController *) getPresentedViewControllerInViewController: (UIViewController *) viewController {
+    UIViewController *presentedVC = viewController;
 
     while (presentedVC.presentedViewController != nil) {
         presentedVC = presentedVC.presentedViewController;
@@ -28,6 +28,21 @@ + (UIViewController *) getPresentedViewControllerInWindow: (UIWindow *)window {
     return presentedVC;
 }
 
++ (UIViewController *) getPresentedViewControllerInWindow: (UIWindow *)window {
+    UIViewController *presentedVC = window.rootViewController;
+    
+    presentedVC = [self getPresentedViewControllerInViewController:presentedVC];
+    
+    if ([presentedVC isKindOfClass:[UINavigationController class]]){
+        UINavigationController *navigationVC = (UINavigationController *) presentedVC;
+        if (navigationVC.viewControllers[0] != nil) {
+            presentedVC = [self getPresentedViewControllerInViewController:navigationVC.viewControllers[0]];
+        }
+    }
+    
+    return presentedVC;
+}
+
 + (BOOL) isSSOViewControllerPresentedInWindow: (UIWindow *)window withPassCodeVisible: (BOOL) isPasscodeVisible{
 
     BOOL isSSOViewControllerPresented = false;
@@ -47,9 +62,24 @@ + (BOOL) isSSOViewControllerPresentedInWindow: (UIWindow *)window withPassCodeVi
             isSSOViewControllerPresented = true;
         }
     }
-    
     return isSSOViewControllerPresented;
 }
 
++ (BOOL) isSSOViewControllerPresentedAndLoading: (UIWindow *) window {
+    
+    BOOL isSSOViewControllerAndLoading = false;
+    
+    UIViewController *presentedVC = [self getPresentedViewControllerInWindow:window];
+    
+    if ([presentedVC isKindOfClass:[SSOViewController class]]) {
+        SSOViewController *SSOVC = (SSOViewController *) presentedVC;
+        if (SSOVC.isLoading == true) {
+            isSSOViewControllerAndLoading = true;
+        }
+    }
+    
+    return isSSOViewControllerAndLoading;
+    
+}
 
 @end