mod login

iOSClient/Brand/Intro/CCIntro.m

@@ -113,21 +113,18 @@
     [buttonLogin addTarget:self action:@selector(login:) forControlEvents:UIControlEventTouchDown];
     
     [buttonView addSubview:buttonLogin];
-
-    if (![NCBrandOptions sharedInstance].disable_linkLoginProvider) {
-        
-        UIButton *buttonSignUp = [UIButton buttonWithType:UIButtonTypeRoundedRect];
-        buttonSignUp.frame = CGRectMake(50.0, 60.0, width - 100.0, 40.0);
-        buttonSignUp.layer.cornerRadius = 3;
-        buttonSignUp.clipsToBounds = YES;
-        [buttonSignUp setTitle:[NSLocalizedStringFromTable(@"_sign_up_", @"Intro", nil) uppercaseString] forState:UIControlStateNormal];
-        buttonSignUp.titleLabel.font = [UIFont systemFontOfSize:14];
-        [buttonSignUp setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-        buttonSignUp.backgroundColor = [UIColor colorWithRed:25.0/255.0 green:89.0/255.0 blue:141.0/255.0 alpha:1.000];
-        [buttonSignUp addTarget:self action:@selector(signUp:) forControlEvents:UIControlEventTouchDown];
+    
+    UIButton *buttonSignUp = [UIButton buttonWithType:UIButtonTypeRoundedRect];
+    buttonSignUp.frame = CGRectMake(50.0, 60.0, width - 100.0, 40.0);
+    buttonSignUp.layer.cornerRadius = 3;
+    buttonSignUp.clipsToBounds = YES;
+    [buttonSignUp setTitle:[NSLocalizedStringFromTable(@"_sign_up_", @"Intro", nil) uppercaseString] forState:UIControlStateNormal];
+    buttonSignUp.titleLabel.font = [UIFont systemFontOfSize:14];
+    [buttonSignUp setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    buttonSignUp.backgroundColor = [UIColor colorWithRed:25.0/255.0 green:89.0/255.0 blue:141.0/255.0 alpha:1.000];
+    [buttonSignUp addTarget:self action:@selector(signUp:) forControlEvents:UIControlEventTouchDown];
         
-        [buttonView addSubview:buttonSignUp];
-    }
+    [buttonView addSubview:buttonSignUp];
     
     // Pages
     

iOSClient/Brand/NCBrand.swift

@@ -99,7 +99,6 @@ class NCBrandColor: NSObject {
     @objc public let use_storeLocalAutoUploadAll:       Bool = false
     
     @objc public let disable_intro:                     Bool = false
-    @objc public let disable_linkLoginProvider:         Bool = false                                                 // Issue with Apple for the "SIGN UP WITH PRTOVIDER" ?
     @objc public let disable_request_login_url:         Bool = false
     @objc public let disable_multiaccount:              Bool = false
     @objc public let disable_manage_account:            Bool = false

iOSClient/Login/CCLogin.h

@@ -51,8 +51,6 @@
 
 @property (nonatomic, weak) IBOutlet UIImageView *loadingBaseUrl;
 
-@property (nonatomic, weak) IBOutlet UILabel *preferredProviders;
-
 @property (nonatomic, weak) IBOutlet UIButton *login;
 @property (nonatomic, weak) IBOutlet UIButton *annulla;
 @property (nonatomic, weak) IBOutlet UIButton *toggleVisiblePassword;

iOSClient/Login/CCLogin.m

@@ -94,29 +94,16 @@
     [self.loginTypeView setTitle:NSLocalizedString(@"_traditional_login_", nil) forState:UIControlStateNormal];
     [self.loginTypeView setTitleColor:[UIColor lightGrayColor] forState:UIControlStateNormal];
 
-    // Preferred providers
-    self.preferredProviders.text = NSLocalizedString([NCBrandOptions sharedInstance].textLoginProvider, nil);
-    self.preferredProviders.textColor = [UIColor whiteColor];
-    self.preferredProviders.userInteractionEnabled = YES;
-    if ([NCBrandOptions sharedInstance].disable_linkLoginProvider) {
-        self.preferredProviders.hidden = YES;
-    }
-    
-    UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(loginPreferredProviders)];
-    [self.preferredProviders addGestureRecognizer:tapGesture];
-    
+   
     if (self.view.frame.size.width == ([[UIScreen mainScreen] bounds].size.width*([[UIScreen mainScreen] bounds].size.width<[[UIScreen mainScreen] bounds].size.height))+([[UIScreen mainScreen] bounds].size.height*([[UIScreen mainScreen] bounds].size.width>[[UIScreen mainScreen] bounds].size.height))) {
         
         // Portrait
-        if ([NCBrandOptions sharedInstance].disable_linkLoginProvider == NO)
-            self.preferredProviders.hidden = NO;
         self.loginTypeView.hidden = NO;
         
     } else {
         
         // Landscape
         if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) {
-            self.preferredProviders.hidden = YES;
             self.loginTypeView.hidden = YES;
         }
     }
@@ -189,15 +176,12 @@
         if (self.view.frame.size.width == ([[UIScreen mainScreen] bounds].size.width*([[UIScreen mainScreen] bounds].size.width<[[UIScreen mainScreen] bounds].size.height))+([[UIScreen mainScreen] bounds].size.height*([[UIScreen mainScreen] bounds].size.width>[[UIScreen mainScreen] bounds].size.height))) {
             
             // Portrait
-            if ([NCBrandOptions sharedInstance].disable_linkLoginProvider == NO)
-                self.preferredProviders.hidden = NO;
             self.loginTypeView.hidden = NO;
             
         } else {
             
             // Landscape
             if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) {
-                self.preferredProviders.hidden = YES;
                 self.loginTypeView.hidden = YES;
             }
         }
@@ -324,17 +308,6 @@
 #pragma mark == Action ==
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)loginPreferredProviders
-{
-//    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:[NCBrandOptions sharedInstance].linkLoginProvider]];
-    appDelegate.activeLoginWeb = [CCLoginWeb new];
-    appDelegate.activeLoginWeb.loginType = _loginType;
-    appDelegate.activeLoginWeb.delegate = self;
-    appDelegate.activeLoginWeb.urlBase = [[NCBrandOptions sharedInstance] loginPreferredProviders];
-        
-    [appDelegate.activeLoginWeb presentModalWithDefaultTheme:self];
-}
-
 - (IBAction)handlebaseUrlchange:(id)sender
 {
     if ([self.baseUrl.text length] > 0 && !_user.hidden && !_password.hidden)

iOSClient/Login/CCLogin.storyboard

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -132,19 +131,9 @@
                                     <action selector="handleLoginTypeView:" destination="yj9-jo-WIn" eventType="touchUpInside" id="V2I-Nr-nOu"/>
                                 </connections>
                             </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Don't have a server yet? Choose one of the providers." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uJf-zK-g43" userLabel="choseProvider">
-                                <rect key="frame" x="0.0" y="558" width="375" height="51"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="51" id="h7p-oO-gAz"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="uJf-zK-g43" firstAttribute="leading" secondItem="Bv6-g3-l0M" secondAttribute="leading" id="10n-Pa-zTJ"/>
                             <constraint firstItem="fhk-o9-J0l" firstAttribute="leading" secondItem="oF7-f3-D2I" secondAttribute="leading" id="11w-VB-cde"/>
                             <constraint firstItem="fhk-o9-J0l" firstAttribute="top" secondItem="7q8-rl-x2M" secondAttribute="top" id="1oU-Kw-Rqv"/>
                             <constraint firstItem="1Gf-Bw-Nim" firstAttribute="leading" secondItem="Bv6-g3-l0M" secondAttribute="leadingMargin" constant="34" id="6Be-V2-eJc"/>
@@ -158,7 +147,6 @@
                             <constraint firstItem="jU7-Iw-XfU" firstAttribute="leading" secondItem="Bv6-g3-l0M" secondAttribute="leadingMargin" constant="34" id="M0m-7h-EkY"/>
                             <constraint firstItem="7q8-rl-x2M" firstAttribute="top" secondItem="4OF-5u-Hd1" secondAttribute="bottom" constant="19" id="M5y-ed-Z9b"/>
                             <constraint firstAttribute="trailingMargin" secondItem="jU7-Iw-XfU" secondAttribute="trailing" constant="36" id="MTe-8y-Opp"/>
-                            <constraint firstItem="uJf-zK-g43" firstAttribute="centerX" secondItem="HQd-pF-3cE" secondAttribute="centerX" id="N78-2h-Lwt"/>
                             <constraint firstItem="olW-Hc-7Im" firstAttribute="top" secondItem="owR-PS-F32" secondAttribute="bottom" constant="20" id="Qt9-M8-OxJ"/>
                             <constraint firstItem="oF7-f3-D2I" firstAttribute="leading" secondItem="szn-G7-5sK" secondAttribute="trailing" constant="15" id="RcH-mj-4ft"/>
                             <constraint firstItem="s9o-RX-XeS" firstAttribute="leading" secondItem="Bv6-g3-l0M" secondAttribute="leadingMargin" constant="-9" id="Ux8-ff-mhP"/>
@@ -168,7 +156,6 @@
                             <constraint firstItem="bSU-bn-DlO" firstAttribute="top" secondItem="3IQ-ds-9vR" secondAttribute="bottom" id="cZA-Wa-mfi"/>
                             <constraint firstItem="1Gf-Bw-Nim" firstAttribute="centerY" secondItem="4OF-5u-Hd1" secondAttribute="centerY" constant="-0.5" id="eTj-tc-QFV"/>
                             <constraint firstItem="szn-G7-5sK" firstAttribute="leading" secondItem="Bv6-g3-l0M" secondAttribute="leadingMargin" constant="34" id="fG7-68-kpN"/>
-                            <constraint firstItem="owR-PS-F32" firstAttribute="top" secondItem="uJf-zK-g43" secondAttribute="bottom" constant="8" id="feR-WL-eLg"/>
                             <constraint firstItem="jU7-Iw-XfU" firstAttribute="top" secondItem="1Gf-Bw-Nim" secondAttribute="bottom" id="iHp-sz-2Uh"/>
                             <constraint firstItem="HQd-pF-3cE" firstAttribute="leading" secondItem="Bv6-g3-l0M" secondAttribute="leading" id="iQ3-zj-YND"/>
                             <constraint firstAttribute="trailingMargin" secondItem="oF7-f3-D2I" secondAttribute="trailing" constant="-4" id="kTO-mX-qTR"/>
@@ -195,7 +182,6 @@
                         <outlet property="login" destination="HQd-pF-3cE" id="dpI-ns-Ivh"/>
                         <outlet property="loginTypeView" destination="owR-PS-F32" id="Rdw-tW-R0G"/>
                         <outlet property="password" destination="jU7-Iw-XfU" id="OWi-V0-Eij"/>
-                        <outlet property="preferredProviders" destination="uJf-zK-g43" id="YM3-4E-s8w"/>
                         <outlet property="toggleVisiblePassword" destination="fhk-o9-J0l" id="aco-hl-Ban"/>
                         <outlet property="user" destination="1Gf-Bw-Nim" id="BUW-sz-I3f"/>
                     </connections>