Merge branch 'version/2.0_bug_fix' into 'master'

iOS RainMaker App v2.0.1. See merge request app-frameworks/esp-rainmaker-ios!7
espressif · Jun 12, 2020 · d41c6a5 · d41c6a5
2 parents 56f5a40 + dfa0b96
commit d41c6a5
Show file tree

Hide file tree

Showing 23 changed files with 266 additions and 573 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1 @@
-ESPRainMaker/Pods
+ESPRainMaker/Pods
diff --git a/ESPRainMaker/ESPRainMaker.xcodeproj/project.pbxproj b/ESPRainMaker/ESPRainMaker.xcodeproj/project.pbxproj
diff --git a/ESPRainMaker/ESPRainMaker/AWSCognito/DeviceAssociation.swift b/ESPRainMaker/ESPRainMaker/AWSCognito/DeviceAssociation.swift
@@ -20,8 +20,19 @@ import ESPProvision
 import Foundation
 import SwiftProtobuf
 
+enum AssociationError: Error {
+    case runtimeError(String)
+
+    var description: String {
+        switch self {
+        case let .runtimeError(message):
+            return message
+        }
+    }
+}
+
 protocol DeviceAssociationProtocol {
-    func deviceAssociationFinishedWith(success: Bool, nodeID: String?)
+    func deviceAssociationFinishedWith(success: Bool, nodeID: String?, error: AssociationError?)
 }
 
 class DeviceAssociation {
@@ -51,16 +62,16 @@ class DeviceAssociation {
             if let data = payloadData {
                 device.sendData(path: Constants.associationPath, data: data) { response, error in
                     guard error == nil, response != nil else {
-                        self.delegate?.deviceAssociationFinishedWith(success: false, nodeID: nil)
+                        self.delegate?.deviceAssociationFinishedWith(success: false, nodeID: nil, error: AssociationError.runtimeError(error!.localizedDescription))
                         return
                     }
                     self.processResponse(responseData: response!)
                 }
             } else {
-                delegate?.deviceAssociationFinishedWith(success: false, nodeID: nil)
+                delegate?.deviceAssociationFinishedWith(success: false, nodeID: nil, error: AssociationError.runtimeError("Unable to fetch request payload."))
             }
         } catch {
-            delegate?.deviceAssociationFinishedWith(success: false, nodeID: nil)
+            delegate?.deviceAssociationFinishedWith(success: false, nodeID: nil, error: AssociationError.runtimeError("Unable to fetch request payload."))
         }
     }
 
@@ -70,16 +81,15 @@ class DeviceAssociation {
     /// - Parameters:
     ///   - responseData: Response recieved from device after sending mapping payload
     func processResponse(responseData: Data) {
-        let decryptedResponse = (device.securityLayer.decrypt(data: responseData))!
         do {
-            let response = try Rainmaker_RMakerConfigPayload(serializedData: decryptedResponse)
+            let response = try Rainmaker_RMakerConfigPayload(serializedData: responseData)
             if response.respSetUserMapping.status == .success {
-                delegate?.deviceAssociationFinishedWith(success: true, nodeID: response.respSetUserMapping.nodeID)
+                delegate?.deviceAssociationFinishedWith(success: true, nodeID: response.respSetUserMapping.nodeID, error: nil)
             } else {
-                delegate?.deviceAssociationFinishedWith(success: false, nodeID: nil)
+                delegate?.deviceAssociationFinishedWith(success: false, nodeID: nil, error: AssociationError.runtimeError("User node mapping failed."))
             }
         } catch {
-            delegate?.deviceAssociationFinishedWith(success: false, nodeID: nil)
+            delegate?.deviceAssociationFinishedWith(success: false, nodeID: nil, error: AssociationError.runtimeError(error.localizedDescription))
         }
     }
 
@@ -93,6 +103,6 @@ class DeviceAssociation {
         var payload = Rainmaker_RMakerConfigPayload()
         payload.msg = Rainmaker_RMakerConfigMsgType.typeCmdSetUserMapping
         payload.cmdSetUserMapping = configRequest
-        return try device.securityLayer.encrypt(data: payload.serializedData())
+        return try payload.serializedData()
     }
 }
diff --git a/ESPRainMaker/ESPRainMaker/Base.lproj/Login.storyboard b/ESPRainMaker/ESPRainMaker/Base.lproj/Login.storyboard
diff --git a/ESPRainMaker/ESPRainMaker/Base.lproj/Main.storyboard b/ESPRainMaker/ESPRainMaker/Base.lproj/Main.storyboard
diff --git a/ESPRainMaker/ESPRainMaker/ESPRainMaker-Bridging-Header.h b/ESPRainMaker/ESPRainMaker/ESPRainMaker-Bridging-Header.h
@@ -17,3 +17,4 @@
 
 #import <CommonCrypto/CommonDigest.h>
 #import "AESDecryptor.h"
+#import "GitVersion.h"
diff --git a/ESPRainMaker/ESPRainMaker/Interface/DocumentViewController.swift b/ESPRainMaker/ESPRainMaker/Interface/DocumentViewController.swift
@@ -22,14 +22,38 @@ import WebKit
 class DocumentViewController: UIViewController {
     var documentLink: String!
     @IBOutlet var webView: WKWebView!
+    @IBOutlet var backButton: UIButton!
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        webView.navigationDelegate = self
         webView.load(URLRequest(url: URL(string: documentLink)!))
         // Do any additional setup after loading the view.
     }
 
+    @IBAction func backButtonPressed(_: Any) {
+        webView.goBack()
+    }
+
     @IBAction func closeWebView(_: Any) {
         dismiss(animated: true, completion: nil)
     }
 }
+
+extension DocumentViewController: WKNavigationDelegate {
+    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
+        if navigationAction.navigationType == .linkActivated {
+            guard let url = navigationAction.request.url else { return }
+            webView.load(URLRequest(url: url))
+        }
+        decisionHandler(.allow)
+    }
+
+    func webView(_ webView: WKWebView, didFinish _: WKNavigation!) {
+        if webView.canGoBack {
+            backButton.isHidden = false
+        } else {
+            backButton.isHidden = true
+        }
+    }
+}
diff --git a/ESPRainMaker/ESPRainMaker/Interface/Node Addition/ClaimViewController.swift b/ESPRainMaker/ESPRainMaker/Interface/Node Addition/ClaimViewController.swift
@@ -72,7 +72,7 @@ class ClaimViewController: UIViewController {
             case let .failedToConnect(error):
                 DispatchQueue.main.async {
                     let action = UIAlertAction(title: "Retry", style: .default, handler: nil)
-                    self.showAlert(error: error.description, action: action)
+                    self.showAlert(error: error.description + "\nCheck if POP is correct.", action: action)
                 }
             default:
                 DispatchQueue.main.async {

diff --git a/ESPRainMaker/ESPRainMaker/Interface/Node Addition/ProvisionViewController.swift b/ESPRainMaker/ESPRainMaker/Interface/Node Addition/ProvisionViewController.swift
@@ -97,9 +97,10 @@ class ProvisionViewController: UIViewController {
         device.scanWifiList { wifiList, _ in
             DispatchQueue.main.async {
                 self.tableView.isHidden = false
+                self.headerView.isHidden = false
                 Utility.hideLoader(view: self.view)
-                if wifiList != nil {
-                    self.wifiDetailList = wifiList!
+                if let list = wifiList {
+                    self.wifiDetailList = list.sorted { $0.rssi > $1.rssi }
                 }
                 self.tableView.reloadData()
             }
@@ -333,16 +334,23 @@ extension ProvisionViewController: UITableViewDataSource {
 }
 
 extension ProvisionViewController: DeviceAssociationProtocol {
-    func deviceAssociationFinishedWith(success: Bool, nodeID: String?) {
+    func deviceAssociationFinishedWith(success: Bool, nodeID: String?, error: AssociationError?) {
         User.shared.currentAssociationInfo!.associationInfoDelievered = success
         DispatchQueue.main.async {
             Utility.hideLoader(view: self.view)
-        }
-        if success {
-            if let deviceSecret = nodeID {
-                User.shared.currentAssociationInfo!.nodeID = deviceSecret
+            if success {
+                if let deviceSecret = nodeID {
+                    User.shared.currentAssociationInfo!.nodeID = deviceSecret
+                }
+                self.showStatusScreen()
+            } else {
+                let alertController = UIAlertController(title: "Error", message: error?.description, preferredStyle: .alert)
+                let action = UIAlertAction(title: "Ok", style: .default) { _ in
+                    self.navigationController?.popToRootViewController(animated: false)
+                }
+                alertController.addAction(action)
+                self.present(alertController, animated: true, completion: nil)
             }
-            showStatusScreen()
         }
     }
 }
diff --git a/ESPRainMaker/ESPRainMaker/Interface/Node Addition/SuccessViewController.swift b/ESPRainMaker/ESPRainMaker/Interface/Node Addition/SuccessViewController.swift
@@ -66,9 +66,20 @@ class SuccessViewController: UIViewController {
         espDevice.provision(ssid: ssid, passPhrase: passphrase) { status in
             switch status {
             case .success:
-                self.step2applyConfigurations()
+                self.step3SendRequestToAddDevice()
             case let .failure(error):
-                self.step1FailedWithMessage(message: error.description)
+                switch error {
+                case .configurationError:
+                    self.step1FailedWithMessage(message: "Failed to apply network configuration to device")
+                case .sessionError:
+                    self.step1FailedWithMessage(message: "Session is not established")
+                case .wifiStatusDisconnected:
+                    self.step3SendRequestToAddDevice()
+                default:
+                    self.step2FailedWithMessage(error: error)
+                }
+            case .configApplied:
+                self.step2applyConfigurations()
             }
         }
     }
@@ -81,19 +92,20 @@ class SuccessViewController: UIViewController {
             self.step2Image.isHidden = true
             self.step2Indicator.isHidden = false
             self.step2Indicator.startAnimating()
-            self.step2Indicator.stopAnimating()
-            self.step2Image.image = UIImage(named: "checkbox_checked")
-            self.step2Image.isHidden = false
-            self.step3SendRequestToAddDevice()
         }
     }
 
     private func step3SendRequestToAddDevice() {
-        step3Image.isHidden = true
-        step3Indicator.isHidden = false
-        step3Indicator.startAnimating()
-        count = 5
-        sendRequestToAddDevice()
+        DispatchQueue.main.async {
+            self.step2Indicator.stopAnimating()
+            self.step2Image.image = UIImage(named: "checkbox_checked")
+            self.step2Image.isHidden = false
+            self.step3Image.isHidden = true
+            self.step3Indicator.isHidden = false
+            self.step3Indicator.startAnimating()
+            self.count = 5
+            self.sendRequestToAddDevice()
+        }
     }
 
     private func step4ConfirmNodeAssociation(requestID: String) {
@@ -150,12 +162,21 @@ class SuccessViewController: UIViewController {
         }
     }
 
-    func step2FailedWithMessage(message: String) {
+    func step2FailedWithMessage(error: ESPProvisionError) {
         DispatchQueue.main.async {
             self.step2Indicator.stopAnimating()
             self.step2Image.image = UIImage(named: "error_icon")
             self.step2Image.isHidden = false
-            self.step2ErrorLabel.text = message
+            var errorMessage = ""
+            switch error {
+            case .wifiStatusUnknownError, .wifiStatusDisconnected, .wifiStatusNetworkNotFound, .wifiStatusAuthenticationError:
+                errorMessage = error.description
+            case .wifiStatusError:
+                errorMessage = "Unable to fetch Wi-Fi state."
+            default:
+                errorMessage = "Unknown error."
+            }
+            self.step2ErrorLabel.text = errorMessage
             self.step2ErrorLabel.isHidden = false
             self.provisionFinsihedWithStatus(message: "Reset your board to factory defaults and retry.")
         }

diff --git a/ESPRainMaker/ESPRainMaker/Interface/Settings/SettingsPageViewController.swift b/ESPRainMaker/ESPRainMaker/Interface/Settings/SettingsPageViewController.swift
@@ -34,7 +34,7 @@ class SettingsPageViewController: UIViewController {
 
         emailLabel.text = User.shared.userInfo.email
         NotificationCenter.default.addObserver(self, selector: #selector(updateUIView), name: Notification.Name(Constants.uiViewUpdateNotification), object: nil)
-        appVersionLabel.text = "App Version - v" + Constants.appVersion
+        appVersionLabel.text = "App Version - v" + Constants.appVersion + " (\(GIT_SHA_VERSION))"
     }
 
     override func viewDidLayoutSubviews() {

diff --git a/ESPRainMaker/ESPRainMaker/Interface/User Management/SignInViewController.swift b/ESPRainMaker/ESPRainMaker/Interface/User Management/SignInViewController.swift
@@ -27,7 +27,9 @@ class SignInViewController: UIViewController, AWSCognitoAuthDelegate {
     @IBOutlet var checkBox: UIButton!
     @IBOutlet var signInTopSpace: NSLayoutConstraint!
     @IBOutlet var signUpTopView: NSLayoutConstraint!
+    @IBOutlet var signInButton: PrimaryButton!
     @IBOutlet var username: UITextField!
+    @IBOutlet var signUpButton: PrimaryButton!
     @IBOutlet var password: UITextField!
     @IBOutlet var topView: UIView!
     @IBOutlet var signUpView: UIView!
@@ -36,6 +38,7 @@ class SignInViewController: UIViewController, AWSCognitoAuthDelegate {
     @IBOutlet var githubLoginButton: UIButton!
     @IBOutlet var googleLoginButton: UIButton!
     @IBOutlet var appleLoginButton: UIButton!
+    @IBOutlet var appVersionLabel: UILabel!
     //    let passwordButtonRightView = UIButton(frame: CGRect(x: 0, y: 0, width: 22.0, height: 16.0))
 
     var pool: AWSCognitoIdentityUserPool?
@@ -80,7 +83,6 @@ class SignInViewController: UIViewController, AWSCognitoAuthDelegate {
         googleLoginButton.layer.shadowOpacity = 0.5
         googleLoginButton.layer.masksToBounds = false
 
-//        appleLoginButton.layer.backgroundColor = UIColor.lightGray.cgColor
         appleLoginButton.layer.shadowColor = UIColor.lightGray.cgColor
         appleLoginButton.layer.shadowOffset = CGSize(width: 0.5, height: 1.0)
         appleLoginButton.layer.shadowRadius = 0.5
@@ -142,6 +144,7 @@ class SignInViewController: UIViewController, AWSCognitoAuthDelegate {
             // Fallback on earlier versions
         }
         segmentControl.addUnderlineForSelectedSegment()
+        appVersionLabel.text = "App Version - v" + Constants.appVersion + " (\(GIT_SHA_VERSION))"
     }
 
     override func viewDidLayoutSubviews() {
@@ -253,6 +256,7 @@ class SignInViewController: UIViewController, AWSCognitoAuthDelegate {
 
     @IBAction func signInPressed(_: AnyObject) {
         dismissKeyboard()
+        signInButton.isEnabled = false
         if Utility.isConnected(view: view) {
             guard let usernameValue = username.text, !usernameValue.isEmpty, let password = password.text, !password.isEmpty else {
                 let alertController = UIAlertController(title: "Missing information",
@@ -261,6 +265,7 @@ class SignInViewController: UIViewController, AWSCognitoAuthDelegate {
                 let retryAction = UIAlertAction(title: "Retry", style: .default, handler: nil)
                 alertController.addAction(retryAction)
                 present(alertController, animated: true, completion: nil)
+                signInButton.isEnabled = true
                 return
             }
             signIn(username: usernameValue, password: password)
@@ -320,6 +325,7 @@ class SignInViewController: UIViewController, AWSCognitoAuthDelegate {
                 present(alertController, animated: true, completion: nil)
                 return
             }
+            signUpButton.isEnabled = false
             Utility.showLoader(message: "", view: view)
 
             var attributes = [AWSCognitoIdentityUserAttributeType]()
@@ -336,6 +342,7 @@ class SignInViewController: UIViewController, AWSCognitoAuthDelegate {
                 guard let strongSelf = self else { return nil }
                 DispatchQueue.main.async {
                     Utility.hideLoader(view: strongSelf.view)
+                    strongSelf.signUpButton.isEnabled = true
                     if let error = task.error as NSError? {
                         let alertController = UIAlertController(title: error.userInfo["__type"] as? String,
                                                                 message: error.userInfo["message"] as? String,
@@ -471,6 +478,7 @@ extension SignInViewController: AWSCognitoIdentityPasswordAuthentication {
     public func didCompleteStepWithError(_ error: Error?) {
         DispatchQueue.main.async {
             Utility.hideLoader(view: self.view)
+            self.signInButton.isEnabled = true
             if let error = error as NSError? {
                 if error.code == 33 {
                     self.resendConfirmationCode()

diff --git a/ESPRainMaker/ESPRainMaker/Models/Attribute.swift b/ESPRainMaker/ESPRainMaker/Models/Attribute.swift
@@ -18,39 +18,12 @@
 
 import Foundation
 
-class Attribute: Equatable {
+class Attribute {
     var name: String?
     var value: Any?
-
-    static func == (lhs: Attribute, rhs: Attribute) -> Bool {
-        let lhsValue = lhs.value as? String
-        let rhsValue = rhs.value as? String
-        return lhsValue == rhsValue && lhs.name == rhs.name
-    }
 }
 
 class Param: Attribute {
-    static func == (lhs: Param, rhs: Param) -> Bool {
-        if lhs.name == rhs.name {
-            if lhs.dataType == rhs.dataType {
-                if lhs.dataType?.lowercased() == "int" {
-                    let lhsValue = lhs.value as? Int
-                    let rhsValue = rhs.value as? Int
-                    return lhsValue == rhsValue
-                } else if lhs.dataType?.lowercased() == "float" {
-                    let lhsValue = lhs.value as? Float
-                    let rhsValue = rhs.value as? Float
-                    return lhsValue == rhsValue
-                } else {
-                    let lhsValue = lhs.value as? String
-                    let rhsValue = rhs.value as? String
-                    return lhsValue == rhsValue
-                }
-            }
-        }
-        return false
-    }
-
     var uiType: String?
     var properties: [String]?
     var bounds: [String: Any]?

diff --git a/ESPRainMaker/ESPRainMaker/Models/Device.swift b/ESPRainMaker/ESPRainMaker/Models/Device.swift
@@ -18,11 +18,7 @@
 
 import Foundation
 
-class Device: Equatable {
-    static func == (lhs: Device, rhs: Device) -> Bool {
-        return lhs.attributes == rhs.attributes && lhs.params == rhs.params && lhs.name == rhs.name
-    }
-
+class Device {
     var name: String?
     var type: String?
     var attributes: [Attribute]?

diff --git a/ESPRainMaker/ESPRainMaker/Resources/GitVersion.h b/ESPRainMaker/ESPRainMaker/Resources/GitVersion.h
@@ -0,0 +1,10 @@
+//
+//  GitVersion.h
+
+
+#ifndef GitVersion_h
+#define GitVersion_h
+
+#define GIT_SHA_VERSION @""
+
+#endif
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,3 +17,4 @@

		#import <CommonCrypto/CommonDigest.h>
		#import "AESDecryptor.h"
		#import "GitVersion.h"