Marino Faggiana 7 жил өмнө
parent
commit
9d5965c5e6

+ 2 - 2
iOSClient/Library/SwiftWebVC/SwiftModalWebVC.swift

@@ -12,7 +12,7 @@ public protocol SwiftModalWebVCDelegate: class {
     func didStartLoading()
     func didStartLoading()
     func didReceiveServerRedirectForProvisionalNavigation(url: URL)
     func didReceiveServerRedirectForProvisionalNavigation(url: URL)
     func didFinishLoading(success: Bool, url: URL)
     func didFinishLoading(success: Bool, url: URL)
-    func loginDisappear()
+    func loginClose()
 }
 }
 
 
 public class SwiftModalWebVC: UINavigationController {
 public class SwiftModalWebVC: UINavigationController {
@@ -110,7 +110,7 @@ public class SwiftModalWebVC: UINavigationController {
     
     
     public override func viewDidDisappear(_ animated: Bool) {
     public override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
         super.viewDidDisappear(animated)
-        self.delegateWeb?.loginDisappear()
+        self.delegateWeb?.loginClose()
     }
     }
 }
 }
 
 

+ 1 - 1
iOSClient/Login/CCLogin.h

@@ -32,7 +32,7 @@
 @protocol CCLoginDelegate <NSObject>
 @protocol CCLoginDelegate <NSObject>
 
 
 - (void) loginSuccess:(NSInteger)loginType;
 - (void) loginSuccess:(NSInteger)loginType;
-- (void) loginDisappear;
+- (void) loginClose;
 
 
 @end
 @end
 
 

+ 2 - 2
iOSClient/Login/CCLogin.m

@@ -152,8 +152,8 @@
 {
 {
     [super viewDidDisappear:animated];
     [super viewDidDisappear:animated];
     
     
-    if ([self.delegate respondsToSelector:@selector(loginDisappear)])
-        [self.delegate loginDisappear];
+    if ([self.delegate respondsToSelector:@selector(loginClose)])
+        [self.delegate loginClose];
 }
 }
 
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField
 - (BOOL)textFieldShouldReturn:(UITextField *)textField

+ 3 - 3
iOSClient/Login/CCLoginWeb.swift

@@ -10,7 +10,7 @@ import UIKit
 
 
 @objc protocol CCLoginDelegateWeb: class {
 @objc protocol CCLoginDelegateWeb: class {
     func loginSuccess(_: NSInteger)
     func loginSuccess(_: NSInteger)
-    func loginDisappear()
+    func loginClose()
 }
 }
 
 
 public class CCLoginWeb: UIViewController {
 public class CCLoginWeb: UIViewController {
@@ -134,8 +134,8 @@ extension CCLoginWeb: SwiftModalWebVCDelegate {
         print("Finished loading. Success: \(success).")
         print("Finished loading. Success: \(success).")
     }
     }
     
     
-    public func loginDisappear() {
-        self.delegate?.loginDisappear()
+    public func loginClose() {
+        self.delegate?.loginClose()
     }
     }
 }
 }
 
 

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -939,7 +939,7 @@
     });
     });
 }
 }
 
 
-- (void)loginDisappear
+- (void)loginClose
 {
 {
     appDelegate.activeLogin = nil;
     appDelegate.activeLogin = nil;
     appDelegate.activeLoginWeb = nil;
     appDelegate.activeLoginWeb = nil;

+ 1 - 1
iOSClient/Main/CCMore.swift

@@ -392,7 +392,7 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLo
         appDelegate.selectedTabBarController(Int(k_tabBarApplicationIndexFile))
         appDelegate.selectedTabBarController(Int(k_tabBarApplicationIndexFile))
     }
     }
     
     
-    func loginDisappear() {
+    func loginClose() {
         appDelegate.activeLogin = nil
         appDelegate.activeLogin = nil
         appDelegate.activeLoginWeb = nil
         appDelegate.activeLoginWeb = nil
     }
     }

+ 1 - 1
iOSClient/Main/CCSplit.m

@@ -196,7 +196,7 @@
     [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"initializeMain" object:nil];
     [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"initializeMain" object:nil];
 }
 }
 
 
-- (void)loginDisappear
+- (void)loginClose
 {
 {
     appDelegate.activeLogin = nil;
     appDelegate.activeLogin = nil;
     appDelegate.activeLoginWeb = nil;
     appDelegate.activeLoginWeb = nil;

+ 1 - 1
iOSClient/Settings/CCManageAccount.m

@@ -195,7 +195,7 @@
     }
     }
 }
 }
 
 
-- (void)loginDisappear
+- (void)loginClose
 {
 {
     appDelegate.activeLogin = nil;
     appDelegate.activeLogin = nil;
     appDelegate.activeLoginWeb = nil;
     appDelegate.activeLoginWeb = nil;