Convert remaining view controller transitions.

uw-it-aca · Jun 17, 2020 · f64806d · f64806d
1 parent 7783381
commit f64806d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 31 deletions.
diff --git a/myuw-ios/AppAuthController.swift b/myuw-ios/AppAuthController.swift
@@ -350,13 +350,6 @@ extension AppAuthController {
         os_log("showError", log: .ui, type: .info)
 
         // show the error controller
-        /*
-        let appDelegate = UIApplication.shared.delegate as! AppDelegate
-        let errorController = ErrorController()
-        let navController = UINavigationController(rootViewController: errorController)
-        appDelegate.window!.rootViewController = navController
-        */
-
         UIApplication.shared.delegate?.window!?.rootViewController = UINavigationController(rootViewController: ErrorController())
     }
 
@@ -365,14 +358,6 @@ extension AppAuthController {
         os_log("showApplication", log: .ui, type: .info)
 
         // MARK: transition to appController (tabs)
-        /*
-        let appController = ApplicationController()
-        let appDelegate = UIApplication.shared.delegate as! AppDelegate
-        // set the main controller as the root controller on app load
-        appDelegate.window!.rootViewController = appController
-        */
-
-        // root view controller
         UIApplication.shared.delegate?.window!?.rootViewController = ApplicationController()
     }
 

diff --git a/myuw-ios/WebViewController.swift b/myuw-ios/WebViewController.swift
@@ -119,9 +119,8 @@ class WebViewController: UIViewController, WKNavigationDelegate {
             sender.endRefreshing()
         }
         else {
-            let errorController = ErrorController()
-            let navController = UINavigationController(rootViewController: errorController)
-            appDelegate.window!.rootViewController = navController
+            // show error controller
+            UIApplication.shared.delegate?.window!?.rootViewController = UINavigationController(rootViewController: ErrorController())
         }
     }
 
@@ -134,12 +133,9 @@ class WebViewController: UIViewController, WKNavigationDelegate {
     {
         if(error.code == NSURLErrorNotConnectedToInternet) {
             os_log("HTTP request failed: %@", log: .webview, type: .error, error.localizedDescription)
-
+                        
             // show error controller
-            let appDelegate = UIApplication.shared.delegate as! AppDelegate
-            let errorController = ErrorController()
-            let navController = UINavigationController(rootViewController: errorController)
-            appDelegate.window!.rootViewController = navController
+            UIApplication.shared.delegate?.window!?.rootViewController = UINavigationController(rootViewController: ErrorController())
 
         }
     }
@@ -159,18 +155,14 @@ class WebViewController: UIViewController, WKNavigationDelegate {
 
         // if user signed out... then clear authstate
         if url!.absoluteString.contains("/logout/") {
-
-            // should we clear all cookies manually?
-
+
             // call the appAuth signout method
             let appAuthController = AppAuthController()
             appAuthController.signOut()
-            
+
             // show the appAuth controller
-            let navController = UINavigationController(rootViewController: appAuthController)
-            let appDelegate = UIApplication.shared.delegate as! AppDelegate
-            // set appAuth controller as rootViewController
-            appDelegate.window!.rootViewController = navController
+            UIApplication.shared.delegate?.window!?.rootViewController = UINavigationController(rootViewController: appAuthController)
+
         }
 
         // display all cookies in WKWebsiteDataStore