Resolved issue with intervals skipping repeats after the first

deb761 · Nov 9, 2017 · 41d12b0 · 41d12b0
1 parent ae52f99
commit 41d12b0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/Trainer/Info.plist b/Trainer/Info.plist
@@ -2,16 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSLocationAlwaysUsageDescription</key>
-	<string>Location is used to determine distance traveled</string>
-	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>Location is used to determine distance traveled</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Location is used to determine distance traveled</string>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>location</string>
-	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
@@ -27,9 +17,19 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>5</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>Location is used to determine distance traveled</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>Location is used to determine distance traveled</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>Location is used to determine distance traveled</string>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>location</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

diff --git a/Trainer/TrackWorkout.swift b/Trainer/TrackWorkout.swift
@@ -128,6 +128,7 @@ class TrackWorkout {
         running = true
         phaseNum = 0
         currentPhase = phases[phaseNum]
+        time = 0.0
 
         if let time = at {
             startTime = time
@@ -167,32 +168,29 @@ class TrackWorkout {
         timeStamp = now
         currentPhase = phases[phaseNum]
         var phaseChanged:Bool = false
-        while running {
+        //while running {
             currentPhase!.addDistance(distance: distance)
             if !currentPhase!.ended {
-                break
+                return
             }
             if phaseNum + 1 < phases.count {
                 phaseNum += 1
                 currentPhase = phases[phaseNum]
                 if let endTime = currentPhase!.endTime {
+                    currentPhase!.start()
                     if endTime.timeIntervalSinceNow > 0.0 {
-                        currentPhase!.startAt(Date())
-                        updateEndTime()
+                         updateEndTime()
                     }
                 }
-                else {
-                    currentPhase!.start()
-                }
                 phaseChanged = true
             }
             else {
                 // workout is over
                 running = false
                 delegate.processComplete()
-                break
+                //break
             }
-        }
+        //}
         if phaseChanged {
             delegate.processPhaseChange()
         }