From b0c5a2f4581323128807b45ef1adc39daa1eb2d0 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <me@hydev.org>
Date: Wed, 27 Jan 2021 18:27:15 -0500
Subject: [PATCH] [O] CurrentAlarm should not be optional

---
 .../AlarmActivationViewController.swift       | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/ProjectClock/AlarmActivationViewController.swift b/ProjectClock/AlarmActivationViewController.swift
index 3a88067..f296bf4 100644
--- a/ProjectClock/AlarmActivationViewController.swift
+++ b/ProjectClock/AlarmActivationViewController.swift
@@ -14,7 +14,7 @@ import AVFoundation
 class AlarmActivationViewController: UIViewController
 {
     var timer: Timer?
-    var currentAlarm: Alarm?
+    var currentAlarm: Alarm
     
     // Puzzle outlets
     @IBOutlet weak var puzzleView: UIView!
@@ -39,7 +39,6 @@ class AlarmActivationViewController: UIViewController
     init?(coder: NSCoder, currentAlarm: Alarm)
     {
         self.currentAlarm = currentAlarm
-        //print(currentAlarm.wakeMethod)
         super.init(coder: coder)
     }
     
@@ -57,7 +56,7 @@ class AlarmActivationViewController: UIViewController
         
         // Set the time and date
         dateLabel.text = Date().str("MMM d, Y")
-        timeLabel.text = currentAlarm?.timeText
+        timeLabel.text = currentAlarm.timeText
         
         // Hide all inactive wakemethods
         puzzleView.hide()
@@ -76,7 +75,7 @@ class AlarmActivationViewController: UIViewController
      */
     @objc func playSound()
     {
-        AudioServicesPlayAlertSound(currentAlarm!.alarmTone)
+        AudioServicesPlayAlertSound(currentAlarm.alarmTone)
         AudioServicesPlayAlertSound(kSystemSoundID_Vibrate)
     }
     
@@ -85,24 +84,18 @@ class AlarmActivationViewController: UIViewController
      */
     func runAlarm()
     {
-        if let alarm = currentAlarm
+        
+        switch currentAlarm.wakeMethod.name
         {
-            switch alarm.wakeMethod.name
-            {
-            case "Factor":
-                initFactorProblem()
-                puzzleView.show()
-            case "RPS":
-                rpsView.show()
-            case "Shake":
-                shakeView.show()
-                shakeAction()
-                if regulate {
-                    endAlarm()
-                }
-            default:
-                print("Invalid alarm type")
-            }
+        case "Factor":
+            initFactorProblem()
+            puzzleView.show()
+        case "RPS":
+            rpsView.show()
+        case "Shake":
+            shakeView.show()
+        default:
+            print("Invalid alarm type")
         }
     }