- Fixed non-ASCII writes to PineTime -- non-ASCII writes to notifications return void (aka do nothing), and non-ASCII music app updates write an empty string instead to remove the "not playing" text from InfiniTime music app.

- Moved currentTime function from BLEManager extension to its own class.
- Added error handling for currentTime, as there was a TestFlight crash report from the current time being an unexpected nil value during setup. This should keep the app from crashing, but doesn't tell the user what's happening yet.

Author: xan-m

Infini-iOS.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 		263B20BC26CDF20400676BF0 /* BatteryChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 263B20BB26CDF20400676BF0 /* BatteryChart.swift */; };
 		263B20C526CEB46800676BF0 /* SwiftUICharts in Frameworks */ = {isa = PBXBuildFile; productRef = 263B20C426CEB46800676BF0 /* SwiftUICharts */; };
 		263B20C726CF07BB00676BF0 /* DFUProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 263B20C626CF07BB00676BF0 /* DFUProgressBar.swift */; };
+		2644261226DC093D009BD54A /* SetTime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2644261126DC093D009BD54A /* SetTime.swift */; };
 		264BFE4226BC51CE0050A223 /* Infini_iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 264BFE4126BC51CE0050A223 /* Infini_iOSApp.swift */; };
 		264BFE4426BC51CE0050A223 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 264BFE4326BC51CE0050A223 /* ContentView.swift */; };
 		264BFE4626BC51CF0050A223 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 264BFE4526BC51CF0050A223 /* Assets.xcassets */; };
@@ -65,6 +66,7 @@
 		263B20B926CDF13400676BF0 /* HeartChart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeartChart.swift; sourceTree = "<group>"; };
 		263B20BB26CDF20400676BF0 /* BatteryChart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BatteryChart.swift; sourceTree = "<group>"; };
 		263B20C626CF07BB00676BF0 /* DFUProgressBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DFUProgressBar.swift; sourceTree = "<group>"; };
+		2644261126DC093D009BD54A /* SetTime.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetTime.swift; sourceTree = "<group>"; };
 		264BFE3E26BC51CE0050A223 /* Infini-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Infini-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		264BFE4126BC51CE0050A223 /* Infini_iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Infini_iOSApp.swift; sourceTree = "<group>"; };
 		264BFE4326BC51CE0050A223 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -260,6 +262,7 @@
 				264BFE7326BC526C0050A223 /* BLEManager.swift */,
 				26D7816426C9EB3800BBF555 /* BLEDelegates.swift */,
 				26D7816626C9EC3100BBF555 /* BLEManagerExtensions.swift */,
+				2644261126DC093D009BD54A /* SetTime.swift */,
 			);
 			path = BLE;
 			sourceTree = "<group>";
@@ -449,6 +452,7 @@
 				26D7817326CAB27800BBF555 /* WatchNotificationsView.swift in Sources */,
 				26D7817526CAB79200BBF555 /* PhoneNotificationsView.swift in Sources */,
 				263B20BC26CDF20400676BF0 /* BatteryChart.swift in Sources */,
+				2644261226DC093D009BD54A /* SetTime.swift in Sources */,
 				263B20B526CD673900676BF0 /* StatusViewTabs.swift in Sources */,
 				26D7816E26CA003B00BBF555 /* SettingsFunctions.swift in Sources */,
 				26A6316326C4C6D6005AE404 /* BLEConnectView.swift in Sources */,

Infini-iOS/BLE/BLEDelegates.swift

@@ -86,7 +86,7 @@ extension BLEManager: CBPeripheralDelegate {
 
 		case timeCBUUID:
 			// convert string with hex value of time to actual hex data, then write to PineTime
-			peripheral.writeValue(currentTime().hexData, for: characteristic, type: .withResponse)
+			peripheral.writeValue(SetTime().currentTime().hexData /*currentTime().hexData*/, for: characteristic, type: .withResponse)
 
 		case firmwareCBUUID:
 			firmwareVersion = String(decoding: characteristic.value!, as: UTF8.self)

Infini-iOS/BLE/BLEManagerExtensions.swift

@@ -14,8 +14,14 @@ import SwiftUICharts
 extension BLEManager {
 
 	// this function converts string to ascii and writes to the selected characteristic. Used for notifications and music app
-	func writeASCIIToPineTime(message: String, characteristic: CBCharacteristic) {
-		let writeData = message.data(using: .ascii)!
+	func writeASCIIToPineTime(message: String, characteristic: CBCharacteristic) -> Void {
+		guard let writeData = message.data(using: .ascii) else {
+			if characteristic == musicChars.artist || characteristic == musicChars.track {
+				// TODO: for music app, this sends an empty string to not display anything if this is non-ascii. This string can be changed to a "cannot display song title" or whatever but that seems a lot more annoying than just displaying nothing.
+				infiniTime.writeValue("".data(using: .ascii)!, for: characteristic, type: .withResponse)
+			}
+			return
+		}
 		infiniTime.writeValue(writeData, for: characteristic, type: .withResponse)
 	}
 
@@ -40,45 +46,4 @@ extension BLEManager {
 		dateFormat.dateFormat = "H:mm:ss"
 		return LineChartDataPoint(value: data, xAxisLabel: "Time", description: dateFormat.string(from: Date()), date: Date())
 	}
-	
-	// this function pulls date from phone, shuffles it into the correct order, and then hex-encodes it to a format that InfiniTime can understand
-	func currentTime() -> String {
-		let now = Date() // current time
-		
-		// formatting setup for the date, not including the year because we have to reformat the year hex to match what the PT expects
-		let dateFormatter = DateFormatter()
-		dateFormatter.dateFormat = "MM dd H m s e SSSS"
-		
-		// prepare formatting for year
-		let yearFormatter = DateFormatter()
-		yearFormatter.dateFormat = "y"
-		let yearString = yearFormatter.string(from: now)
-		let intYear = Int(yearString)
-		
-		// convert year string to hex-encoded string. conditionally prepend 0 in case by some miracle this application and your watch is still functional in the year 4096
-		var hexYear = String (format: "%02X", intYear!)
-		if hexYear.count == 3 {
-			hexYear.insert("0", at: hexYear.startIndex)
-		}
-		
-		// infinitime (and BLE in general? I dunno...) requires the MSB first, so we have to switch the year from XXYY to YYXX
-		var revYearChars = hexYear.suffix(2)
-		revYearChars += hexYear.prefix(2)
-		
-		var fullDateString = String(revYearChars)
-		
-		let dateString = dateFormatter.string(from: now)
-		let dateParts = dateString.components(separatedBy: " ")
-		
-		// convert the rest of the date parts to hex, and append them to the date string
-		
-		for part in dateParts {
-			let intPart = Int(part)
-			let hex = String(format: "%02X", intPart!)
-			fullDateString.append(hex)
-		}
-		
-		// print(fullDateString) // debug
-		return fullDateString
-	}
 }

Infini-iOS/BLE/SetTime.swift

@@ -0,0 +1,61 @@
+//
+//  SetTime.swift
+//  Infini-iOS
+//
+//  Created by Alex Emry on 8/29/21.
+//  
+//
+    
+
+import Foundation
+
+class SetTime {
+	
+	enum SetTimeError: Error {
+		case nilValue
+	}
+		
+	// this function pulls date from phone, shuffles it into the correct order, and then hex-encodes it to a format that InfiniTime can understand
+	func currentTime() throws -> String {
+		let now = Date() // current time
+		
+		// formatting setup for the date, not including the year because we have to reformat the year hex to match what the PT expects
+		let dateFormatter = DateFormatter()
+		dateFormatter.dateFormat = "MM dd H m s e SSSS"
+		
+		// prepare formatting for year
+		let yearFormatter = DateFormatter()
+		yearFormatter.dateFormat = "y"
+		let yearString = yearFormatter.string(from: now)
+		let intYear = Int(yearString)
+		
+		// convert year string to hex-encoded string. conditionally prepend 0 in case by some miracle this application and your watch is still functional in the year 4096
+		var hexYear = String (format: "%02X", intYear!)
+		if hexYear.count == 3 {
+			hexYear.insert("0", at: hexYear.startIndex)
+		}
+		
+		// infinitime (and BLE in general? I dunno...) requires the MSB first, so we have to switch the year from XXYY to YYXX
+		var revYearChars = hexYear.suffix(2)
+		revYearChars += hexYear.prefix(2)
+		
+		var fullDateString = String(revYearChars)
+		
+		let dateString = dateFormatter.string(from: now)
+		//let dateParts = dateString.components(separatedBy: " ")
+		
+		// convert the rest of the date parts to hex, and append them to the date string
+		
+		for part in dateString.components(separatedBy: " ") {
+			guard let intPart = Int(part) else {
+				throw SetTimeError.nilValue
+			}
+			let hex = String(format: "%02X", intPart)
+			fullDateString.append(hex)
+
+		}
+		
+		// print(fullDateString) // debug
+		return fullDateString
+	}
+}