Fixed countdown cancel action

- Count down cancel button can now abort automatic calling and texting
- Fixed issue with automatic double texting
- Fixed issue with null emergency contact list upon automatic

Author: NathanAdiam

iosApp/VC/Controllers/CountdownViewController.swift

@@ -12,6 +12,8 @@ import SwiftUI
 class CountdownViewController: UIViewController {
 
     private var countdownTimer: Timer?
+    public var cancelPressed = false
+    public var notificationSent = false
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -62,9 +64,8 @@ class CountdownViewController: UIViewController {
         countDownLabel.centerXAnchor.constraint(equalTo: alertController.view.centerXAnchor).isActive = true
         countDownLabel.centerYAnchor.constraint(equalTo: alertController.view.centerYAnchor, constant: 60).isActive = true
 
-        var cancelPressed = false
         let cancelAction = UIAlertAction(title: "Cancel", style: .cancel) { [weak self] _ in
-            cancelPressed = true
+            self?.cancelPressed = true
             self?.dismiss(animated: true, completion: nil)
         }
         alertController.addAction(cancelAction)
@@ -78,21 +79,30 @@ class CountdownViewController: UIViewController {
             // Change to text color to red
             if countdownSeconds <= 3 {
                 if let titleString = countDownTitle as? NSString {
-                           let attributes: [NSAttributedString.Key: Any] = [
-                               .foregroundColor: UIColor.red,
-                               .font: UIFont.boldSystemFont(ofSize: 30)
-                           ]
-                           let attributedTitle = NSAttributedString(string: titleString as String, attributes: attributes)
-                           alertController.setValue(attributedTitle, forKey: "attributedTitle")
-                       }
+                    let attributes: [NSAttributedString.Key: Any] = [
+                        .foregroundColor: UIColor.red,
+                        .font: UIFont.boldSystemFont(ofSize: 30)
+                    ]
+                    let attributedTitle = NSAttributedString(string: titleString as String, attributes: attributes)
+                    alertController.setValue(attributedTitle, forKey: "attributedTitle")
+                }
                 countDownLabel.textColor = .red
             }
-            if countdownSeconds == 0 {
+            
+            // Exit loop
+            if self.cancelPressed {
+                countdownSeconds = 0
+                timer.invalidate()
+            }
+            
+            // Notify Emergency Contacts
+            else if countdownSeconds == 0 {
                 timer.invalidate()
-                if !cancelPressed {
+                if !self.cancelPressed && !self.notificationSent {
                     let vcContact = VCContactsViewController()
                     vcContact.textMessageWithTwilio()
                     vcContact.callWithTwilio()
+                    self.notificationSent = true
                 }
                 self.dismiss(animated: true, completion: nil)
             }

iosApp/VC/Controllers/VCContactsViewController.swift

@@ -375,6 +375,7 @@ class VCContactsViewController: UIViewController, UITableViewDataSource, CNConta
                 request.httpMethod = "POST"
                 request.addValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
                 request.addValue("Basic " + "\(accountSID):\(authToken)".data(using: .utf8)!.base64EncodedString(), forHTTPHeaderField: "Authorization")
+                self.getContacts()
 
                 for contact in EmergencyContactList {
                     if let toNumber = contact.contactPhoneNumber {

iosApp/VC/Controllers/VCHomeViewController.swift

@@ -83,9 +83,11 @@ final class VCHomeViewController: UIViewController, BluetoothManagerDelegate {
         dataFromAdafruit.font = UIFont.systemFont(ofSize: 18)
         dataFromAdafruit.textColor = UIColor.blue
 
-        // delay 3 secs after receiving data for testing
-        DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
-            self.countdownViewController.showCountdownUI()
+        // Check cancel isn't pressed from previous runs 
+        if countdownViewController.cancelPressed || countdownViewController.notificationSent {
+            countdownViewController.cancelPressed = false
+            countdownViewController.notificationSent = false
         }
+        countdownViewController.showCountdownUI()
     }
 }

iosApp/VC/Controllers/VCTestingViewController.swift

@@ -11,7 +11,7 @@ import MobileCoreServices
 
 /// Controller to view and change the application's settings
 final class VCTestingViewController: UIViewController {
-    var countdownViewController = CountdownViewController()
+    private var countdownViewController = CountdownViewController()
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -68,6 +68,10 @@ final class VCTestingViewController: UIViewController {
     }
 
     @objc func countdownButtonTapped() {
+        if countdownViewController.cancelPressed || countdownViewController.notificationSent {
+            countdownViewController.cancelPressed = false
+            countdownViewController.notificationSent = false
+        }
         countdownViewController.showCountdownUI()
     }
 }