- Fix HealthKit authorization request

piscoTech · piscoTech · commit 39b3b622bd5d · 2022-02-10T22:27:38.000+01:00
- Update tests
diff --git a/Gym Tracker Core/DataManager.swift b/Gym Tracker Core/DataManager.swift
@@ -252,7 +252,7 @@ final public class WCObject: Equatable {
 
 // MARK: - Delegate Protocol
 
-@objc public protocol DataManagerDelegate: class {
+@objc public protocol DataManagerDelegate: AnyObject {
 	
 	func refreshData()
 	func cancelAndDisableEdit()
diff --git a/Gym Tracker Tests/ExecuteWorkoutControllerTests.swift b/Gym Tracker Tests/ExecuteWorkoutControllerTests.swift
@@ -400,7 +400,6 @@ class ExecuteWorkoutControllerTests: XCTestCase {
 			assertCall { $0 == .workoutHasStarted }
 			assertCall { c in
 				if case DelegateCalls.startTimer(let d) = c {
-					let now = Date()
 					XCTAssertEqual(d.timeIntervalSince1970, Date().timeIntervalSince1970, accuracy: 2)
 					
 					return true
@@ -483,7 +482,7 @@ class ExecuteWorkoutControllerTests: XCTestCase {
 			}
 			assertCall { c in
 				if case DelegateCalls.setNextUpText(let str) = c {
-					assert(string: str, containsInOrder: [r.rest.getFormattedDuration()])
+					assert(string: str, containsInOrder: [r.rest.formattedDuration])
 					return true
 				}
 				return false
@@ -561,7 +560,7 @@ class ExecuteWorkoutControllerTests: XCTestCase {
 			}
 			assertCall { c in
 				if case DelegateCalls.setNextUpText(let str) = c {
-					assert(string: str, containsInOrder: [r.rest.getFormattedDuration()])
+					assert(string: str, containsInOrder: [r.rest.formattedDuration])
 					return true
 				}
 				return false
@@ -675,7 +674,7 @@ class ExecuteWorkoutControllerTests: XCTestCase {
 			}
 			assertCall { c in
 				if case DelegateCalls.setNextUpText(let str) = c {
-					assert(string: str, containsInOrder: [r.rest.getFormattedDuration()])
+					assert(string: str, containsInOrder: [r.rest.formattedDuration])
 					return true
 				}
 				return false
@@ -1075,7 +1074,7 @@ class ExecuteWorkoutControllerTests: XCTestCase {
 		}
 		assertCall { c in
 			if case DelegateCalls.setNextUpText(let str) = c {
-				assert(string: str, containsInOrder: [r.rest.getFormattedDuration()])
+				assert(string: str, containsInOrder: [r.rest.formattedDuration])
 				return true
 			}
 			return false
diff --git a/Gym Tracker Tests/WorkoutIteratorTests.swift b/Gym Tracker Tests/WorkoutIteratorTests.swift
@@ -285,7 +285,7 @@ class WorkoutIteratorTests: XCTestCase {
 				XCTAssertEqual(s1.rest, step3.rest)
 				
 				if let next = step3.nextUpInfo?.string {
-					assert(string: next, containsInOrder: [n.rest.getFormattedDuration()])
+					assert(string: next, containsInOrder: [n.rest.formattedDuration])
 				} else {
 					XCTFail("Unexpected nil")
 				}
@@ -325,7 +325,7 @@ class WorkoutIteratorTests: XCTestCase {
 				XCTAssertNil(step4.rest)
 				
 				if let next = step4.nextUpInfo?.string {
-					assert(string: next, containsInOrder: [n.rest.getFormattedDuration()])
+					assert(string: next, containsInOrder: [n.rest.formattedDuration])
 				} else {
 					XCTFail("Unexpected nil")
 				}
@@ -717,7 +717,7 @@ class WorkoutIteratorTests: XCTestCase {
 				XCTAssertNil(step6.rest)
 				
 				if let next = step6.nextUpInfo?.string {
-					assert(string: next, containsInOrder: [n.rest.getFormattedDuration()])
+					assert(string: next, containsInOrder: [n.rest.formattedDuration])
 				} else {
 					XCTFail("Unexpected nil")
 				}
@@ -1806,7 +1806,7 @@ class WorkoutIteratorTests: XCTestCase {
 				XCTAssertNil(step1.rest)
 				
 				if let next = step1.nextUpInfo?.string {
-					assert(string: next, containsInOrder: [n.rest.getFormattedDuration()])
+					assert(string: next, containsInOrder: [n.rest.formattedDuration])
 				} else {
 					XCTFail("Unexpected nil")
 				}
@@ -1846,7 +1846,7 @@ class WorkoutIteratorTests: XCTestCase {
 				XCTAssertNil(step2.rest)
 				
 				if let next = step2.nextUpInfo?.string {
-					assert(string: next, containsInOrder: [n.rest.getFormattedDuration()])
+					assert(string: next, containsInOrder: [n.rest.formattedDuration])
 				} else {
 					XCTFail("Unexpected nil")
 				}
diff --git a/Gym Tracker iOS/AppDelegate.swift b/Gym Tracker iOS/AppDelegate.swift
@@ -223,7 +223,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 	
 	func authorizeHealthAccess() {
 		let req = {
-			healthStore.requestAuthorization(toShare: healthWriteData, read: healthReadData) { _, _ in }
+			DispatchQueue.main.async {
+				healthStore.requestAuthorization(toShare: healthWriteData, read: healthReadData) { _, _ in }
+			}
 		}
 		
 		if #available(iOS 12.0, *) {
diff --git a/Gym Tracker.xcodeproj/project.pbxproj b/Gym Tracker.xcodeproj/project.pbxproj
@@ -1133,7 +1133,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1000;
-				LastUpgradeCheck = 1200;
+				LastUpgradeCheck = 1320;
 				ORGANIZATIONNAME = "Marco Boschi";
 				TargetAttributes = {
 					7A2E10211FBDCC6F004767D7 = {
@@ -1684,7 +1684,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 23;
+				CURRENT_PROJECT_VERSION = 24;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1704,9 +1704,9 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEALTH_READ_DATA = "Monitor heart rate during workout and read data for creating a workout.";
 				HEALTH_WRITE_DATA = "Save completed gym workout.";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 3.1.4;
+				MARKETING_VERSION = 3.1.5;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1751,7 +1751,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 23;
+				CURRENT_PROJECT_VERSION = 24;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1765,9 +1765,9 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEALTH_READ_DATA = "Monitor heart rate during workout and read data for creating a workout.";
 				HEALTH_WRITE_DATA = "Save completed gym workout.";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 3.1.4;
+				MARKETING_VERSION = 3.1.5;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
diff --git a/Gym Tracker.xcodeproj/xcshareddata/xcschemes/Gym Tracker Core iOS.xcscheme b/Gym Tracker.xcodeproj/xcshareddata/xcschemes/Gym Tracker Core iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1320"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Gym Tracker.xcodeproj/xcshareddata/xcschemes/Gym Tracker Core watchOS.xcscheme b/Gym Tracker.xcodeproj/xcshareddata/xcschemes/Gym Tracker Core watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1320"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Gym Tracker.xcodeproj/xcshareddata/xcschemes/Gym Tracker Notifications.xcscheme b/Gym Tracker.xcodeproj/xcshareddata/xcschemes/Gym Tracker Notifications.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1320"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
diff --git a/Gym Tracker.xcodeproj/xcshareddata/xcschemes/Gym Tracker watchOS.xcscheme b/Gym Tracker.xcodeproj/xcshareddata/xcschemes/Gym Tracker watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1320"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Gym Tracker.xcodeproj/xcshareddata/xcschemes/Gym Tracker.xcscheme b/Gym Tracker.xcodeproj/xcshareddata/xcschemes/Gym Tracker.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1320"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/README.md b/README.md
@@ -11,11 +11,10 @@ At the end your workout is automatically saved inside the Health app, if you're
 
 Backup and restore your workouts using iCloud Drive or export and share them with your friends. Backups and exported workout are in XML format and easily accessible from inside the iCloud Drive folder and app, you can manually edit them and import them again, before import data is validated against this [XSD grammar](https://github.com/piscoTech/GymTracker/blob/master/Gym%20Tracker%20Core/workout.xsd).
 
-Support me by buying the app on the AppStore<br>
 [![Download on the AppStore](https://marcoboschi.altervista.org/img/app_store_en.svg)](https://itunes.apple.com/us/app/gym-tracker-gym-workout-tracker/id1224155362?ls=1&mt=8)
 
 ## Project Setup
-The framework `MBLibrary` referenced by this project is available [here](https://github.com/piscoTech/MBLibrary), version currently in use is [1.9](https://github.com/piscoTech/MBLibrary/releases/tag/v1.9(21)).
+The framework `MBLibrary` referenced by this project is available [here](https://github.com/piscoTech/MBLibrary), version currently in use is [1.9.1](https://github.com/piscoTech/MBLibrary/releases/tag/v1.9.1(22)).
 
 ## Customization
 General behaviour of the app can be configured via global and static variables:

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,6 @@ class ExecuteWorkoutControllerTests: XCTestCase {`
`400`	`400`	`assertCall { $0 == .workoutHasStarted }`
`401`	`401`	`assertCall { c in`
`402`	`402`	`if case DelegateCalls.startTimer(let d) = c {`
`403`		`- let now = Date()`
`404`	`403`	`XCTAssertEqual(d.timeIntervalSince1970, Date().timeIntervalSince1970, accuracy: 2)`
`405`	`404`
`406`	`405`	`return true`
`@@ -483,7 +482,7 @@ class ExecuteWorkoutControllerTests: XCTestCase {`
`483`	`482`	`}`
`484`	`483`	`assertCall { c in`
`485`	`484`	`if case DelegateCalls.setNextUpText(let str) = c {`
`486`		`- assert(string: str, containsInOrder: [r.rest.getFormattedDuration()])`
	`485`	`+ assert(string: str, containsInOrder: [r.rest.formattedDuration])`
`487`	`486`	`return true`
`488`	`487`	`}`
`489`	`488`	`return false`
`@@ -561,7 +560,7 @@ class ExecuteWorkoutControllerTests: XCTestCase {`
`561`	`560`	`}`
`562`	`561`	`assertCall { c in`
`563`	`562`	`if case DelegateCalls.setNextUpText(let str) = c {`
`564`		`- assert(string: str, containsInOrder: [r.rest.getFormattedDuration()])`
	`563`	`+ assert(string: str, containsInOrder: [r.rest.formattedDuration])`
`565`	`564`	`return true`
`566`	`565`	`}`
`567`	`566`	`return false`
`@@ -675,7 +674,7 @@ class ExecuteWorkoutControllerTests: XCTestCase {`
`675`	`674`	`}`
`676`	`675`	`assertCall { c in`
`677`	`676`	`if case DelegateCalls.setNextUpText(let str) = c {`
`678`		`- assert(string: str, containsInOrder: [r.rest.getFormattedDuration()])`
	`677`	`+ assert(string: str, containsInOrder: [r.rest.formattedDuration])`
`679`	`678`	`return true`
`680`	`679`	`}`
`681`	`680`	`return false`
`@@ -1075,7 +1074,7 @@ class ExecuteWorkoutControllerTests: XCTestCase {`
`1075`	`1074`	`}`
`1076`	`1075`	`assertCall { c in`
`1077`	`1076`	`if case DelegateCalls.setNextUpText(let str) = c {`
`1078`		`- assert(string: str, containsInOrder: [r.rest.getFormattedDuration()])`
	`1077`	`+ assert(string: str, containsInOrder: [r.rest.formattedDuration])`
`1079`	`1078`	`return true`
`1080`	`1079`	`}`
`1081`	`1080`	`return false`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {`
`223`	`223`
`224`	`224`	`func authorizeHealthAccess() {`
`225`	`225`	`let req = {`
`226`		`- healthStore.requestAuthorization(toShare: healthWriteData, read: healthReadData) { _, _ in }`
	`226`	`+ DispatchQueue.main.async {`
	`227`	`+ healthStore.requestAuthorization(toShare: healthWriteData, read: healthReadData) { _, _ in }`
	`228`	`+ }`
`227`	`229`	`}`
`228`	`230`
`229`	`231`	`if #available(iOS 12.0, *) {`