Merge pull request #203 from pennlabs/development

Development

Author: joshdoman

PennMobile/GSR-Booking/Controllers/GSRWebviewLoginController.swift

@@ -48,18 +48,18 @@ class GSRWebviewLoginController: UIViewController, WKUIDelegate, WKNavigationDel
         if url.absoluteString == "https://apps.wharton.upenn.edu/gsr/" {
             let cookieStore = webView.configuration.websiteDataStore.httpCookieStore
             cookieStore.getAllCookies { (cookies) in
-                for cookie in cookies {
-                    if cookie.name == "sessionid" {
-                        DispatchQueue.main.async {
+                DispatchQueue.main.async {
+                    for cookie in cookies {
+                        if cookie.name == "sessionid" {
                             UserDefaults.standard.set(sessionID: cookie.value)
                             decisionHandler(.cancel)
                             self.dismiss(animated: true, completion: nil)
                             self.completion?()
                             return
                         }
                     }
+                    decisionHandler(.allow)
                 }
-                decisionHandler(.allow)
             }
         } else {
             decisionHandler(.allow)

PennMobile/GSR-Booking/Networking/WhartonGSRNetworkManager.swift

@@ -41,19 +41,23 @@ class WhartonGSRNetworkManager: NSObject, Requestable {
                             //data recieved and parsed successfully
                             if let dict = json {
                                 let json = JSON(dict)
-                                if json["error"].string != nil {
+                                do {
+                                    let rooms = try self.parseAvailabilityJSON(json)
+                                    if !rooms.isEmpty {
+                                        callback(rooms)
+                                        return
+                                    }
+                                } catch NetworkingError.authenticationError {
+                                    // Clear session ID if no longer valid
                                     UserDefaults.standard.clearSessionID()
-                                    self.getAvailabilityWithoutSessionID(date: date, callback: callback)
-                                } else {
-                                    let rooms = try? self.parseAvailabilityJSON(json)
-                                    callback(rooms)
+                                } catch {
                                 }
                             }
-                            return
                         }
                     }
                 }
-                callback(nil)
+                // Unless a valid set of rooms is returns, ping the server
+                self.getAvailabilityWithoutSessionID(date: date, callback: callback)
             }
 
         })
@@ -179,6 +183,9 @@ class WhartonGSRNetworkManager: NSObject, Requestable {
 
 extension WhartonGSRNetworkManager {
     func parseAvailabilityJSON(_ json: JSON) throws -> [GSRRoom] {
+        guard json["error"].string == nil else {
+            throw NetworkingError.authenticationError
+        }
         let timesJSONArray = json["times"].arrayValue.flatMap { $0.arrayValue }
         let timesArray = try timesJSONArray.map { (json) -> GSRTimeSlot in
             return try GSRTimeSlot(json: json)

PennMobile/General/Generics/StatusBar.swift

@@ -18,6 +18,7 @@ class StatusBar: UIView {
     enum statusBarText : String {
         case noInternet = "No Internet Connection"
         case apiError = "Penn servers are temporarily down.\nPlease try again later."
+        case laundryDown = "Penn's laundry servers are currently not updating.\nWe hope this will be fixed shortly."
     }
 
     public required init?(coder aDecoder: NSCoder) {

PennMobile/General/Networking + Analytics/Networking.swift

@@ -21,6 +21,7 @@ public enum Method {
 
 enum NetworkingError: String, LocalizedError {
     case jsonError = "JSON error"
+    case authenticationError = "Unable to authenticate"
     case other
     var localizedDescription: String { return NSLocalizedString(self.rawValue, comment: "") }
 }

PennMobile/Laundry/Controllers/LaundryTableViewController.swift

@@ -26,6 +26,8 @@ class LaundryTableViewController: GenericTableViewController, IndicatorEnabled,
         tableView.allowsSelection = false
 
         tableView.tableFooterView = getFooterViewForTable()
+        // header view to make space for the error bar
+        tableView.tableHeaderView = getHeaderViewForTable()
 
         rooms = LaundryRoom.getPreferences()
 
@@ -34,8 +36,6 @@ class LaundryTableViewController: GenericTableViewController, IndicatorEnabled,
 
         // initialize navigation bar
 
-
-        
         // Start indicator if there are cells that need to be loaded
         if !rooms.isEmpty {
             showActivity()
@@ -52,6 +52,7 @@ class LaundryTableViewController: GenericTableViewController, IndicatorEnabled,
 
     override func viewDidAppear(_ animated: Bool) {
         setupNavBar()
+        self.navigationVC?.addPermanentStatusBar(text: .laundryDown)
         super.viewDidAppear(animated)
     }
 
@@ -66,6 +67,12 @@ class LaundryTableViewController: GenericTableViewController, IndicatorEnabled,
         return v
     }
 
+    fileprivate func getHeaderViewForTable() -> UIView {
+        let v = UIView(frame: CGRect(x: 0.0, y: 0.0, width: self.view.frame.width, height: 70.0))
+        v.backgroundColor = UIColor.clear
+        return v
+    }
+    
     private func setupNavBar() {
         self.tabBarController?.title = "Laundry"
         tabBarController?.navigationItem.leftBarButtonItem = nil

PennMobile/Setup + Navigation/AppDelegate.swift

@@ -24,10 +24,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         if UserDefaults.standard.isNewAppVersion() {
             UserDefaults.standard.setAppVersion()
-            LaundryAPIService.instance.clearDirectory()
-            if let ids = UserDefaults.standard.getLaundryPreferences() {
-                UserDBManager.shared.saveLaundryPreferences(for: ids)
-            }
         }
 
         DatabaseManager.shared.dryRun = true

PennMobile/Setup + Navigation/HomeNavigationController.swift

@@ -25,6 +25,16 @@ class HomeNavigationController: UINavigationController {
         animateBarDown()
     }
 
+    func addPermanentStatusBar(text: StatusBar.statusBarText) {
+        bar?.removeFromSuperview()
+        bar = StatusBar(text: text)
+        setupBar(text: text)
+        guard bar != nil else { return }
+        UIView.animate(withDuration: 0.4) {
+            self.bar!.transform = CGAffineTransform(translationX: 0, y: CGFloat(self.bar!.height))
+        }
+    }
+    
     fileprivate func animateBarDown() {
         guard bar != nil else { return }
         bar!.isHidden = false

PennMobile/Supporting_Files/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.5</string>
+	<string>3.5.1</string>
 	<key>CFBundleVersion</key>
-	<string>4651</string>
+	<string>4653</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>