marinofaggiana 3 年之前
父节点
当前提交
d5a9914a61
共有 3 个文件被更改,包括 43 次插入2 次删除
  1. 13 1
      iOSClient/AppDelegate.swift
  2. 12 0
      iOSClient/Login/NCLogin.swift
  3. 18 1
      iOSClient/Security/NCViewCertificateDetails.swift

+ 13 - 1
iOSClient/AppDelegate.swift

@@ -29,7 +29,7 @@ import LocalAuthentication
 import Firebase
 import Firebase
 
 
 @UIApplicationMain
 @UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate, TOPasscodeViewControllerDelegate, NCAccountRequestDelegate {
+class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate, TOPasscodeViewControllerDelegate, NCAccountRequestDelegate, NCViewCertificateDetailsDelegate {
 
 
     var backgroundSessionCompletionHandler: (() -> Void)?
     var backgroundSessionCompletionHandler: (() -> Void)?
     var window: UIWindow?
     var window: UIWindow?
@@ -518,6 +518,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         }
         }
     }
     }
     
     
+    func viewCertificateDetailsDismiss() {
+        self.startTimerErrorNetworking()
+    }
+    
     @objc func startTimerErrorNetworking() {
     @objc func startTimerErrorNetworking() {
         timerErrorNetworking = Timer.scheduledTimer(timeInterval: 3, target: self, selector: #selector(checkErrorNetworking), userInfo: nil, repeats: true)
         timerErrorNetworking = Timer.scheduledTimer(timeInterval: 3, target: self, selector: #selector(checkErrorNetworking), userInfo: nil, repeats: true)
     }
     }
@@ -546,6 +550,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                 self.startTimerErrorNetworking()
                 self.startTimerErrorNetworking()
             }))
             }))
             
             
+            alertController.addAction(UIAlertAction(title: NSLocalizedString("_certificate_details_", comment: ""), style: .default, handler: { action in
+                if let navigationController = UIStoryboard(name: "NCViewCertificateDetails", bundle: nil).instantiateInitialViewController() as? UINavigationController {
+                    let viewController = navigationController.topViewController as! NCViewCertificateDetails
+                    viewController.delegate = self
+                    self.window?.rootViewController?.present(navigationController, animated: true)
+                }
+            }))
+            
             window?.rootViewController?.present(alertController, animated: true, completion: {
             window?.rootViewController?.present(alertController, animated: true, completion: {
                 self.timerErrorNetworking?.invalidate()
                 self.timerErrorNetworking?.invalidate()
             })
             })

+ 12 - 0
iOSClient/Login/NCLogin.swift

@@ -361,6 +361,12 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
                         self.appDelegate.startTimerErrorNetworking()
                         self.appDelegate.startTimerErrorNetworking()
                     }))
                     }))
                     
                     
+                    alertController.addAction(UIAlertAction(title: NSLocalizedString("_certificate_details_", comment: ""), style: .default, handler: { action in
+                        if let navigationController = UIStoryboard(name: "NCViewCertificateDetails", bundle: nil).instantiateInitialViewController() {
+                            self.present(navigationController, animated: true)
+                        }
+                    }))
+                    
                     self.present(alertController, animated: true, completion: {
                     self.present(alertController, animated: true, completion: {
                         self.appDelegate.timerErrorNetworking?.invalidate()
                         self.appDelegate.timerErrorNetworking?.invalidate()
                     })
                     })
@@ -435,6 +441,12 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
                 self.appDelegate.startTimerErrorNetworking()
                 self.appDelegate.startTimerErrorNetworking()
             }))
             }))
             
             
+            alertController.addAction(UIAlertAction(title: NSLocalizedString("_certificate_details_", comment: ""), style: .default, handler: { action in
+                if let navigationController = UIStoryboard(name: "NCViewCertificateDetails", bundle: nil).instantiateInitialViewController() {
+                    self.present(navigationController, animated: true)
+                }
+            }))
+            
             self.present(alertController, animated: true, completion: {
             self.present(alertController, animated: true, completion: {
                 self.appDelegate.timerErrorNetworking?.invalidate()
                 self.appDelegate.timerErrorNetworking?.invalidate()
             })
             })

+ 18 - 1
iOSClient/Security/NCViewCertificateDetails.swift

@@ -23,10 +23,21 @@
 
 
 import UIKit
 import UIKit
 
 
-class NCViewCertificateDetails: UIViewController {
+public protocol NCViewCertificateDetailsDelegate {
+    func viewCertificateDetailsDismiss()
+}
+
+// optional func
+public extension NCViewCertificateDetailsDelegate {
+    func viewCertificateDetailsDismiss() {}
+}
+
+class NCViewCertificateDetails: UIViewController  {
 
 
     @IBOutlet weak var buttonCancel: UIBarButtonItem!
     @IBOutlet weak var buttonCancel: UIBarButtonItem!
     @IBOutlet weak var scrollView: UIScrollView!
     @IBOutlet weak var scrollView: UIScrollView!
+    
+    public var delegate: NCViewCertificateDetailsDelegate?
 
 
     // MARK: - View Life Cycle
     // MARK: - View Life Cycle
 
 
@@ -53,6 +64,12 @@ class NCViewCertificateDetails: UIViewController {
         }
         }
     }
     }
     
     
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        
+        self.delegate?.viewCertificateDetailsDismiss()
+    }
+    
     // MARK: ACTION
     // MARK: ACTION
     
     
     @IBAction func actionCancel(_ sender: UIBarButtonItem) {
     @IBAction func actionCancel(_ sender: UIBarButtonItem) {