huge commit -- oops!

- DFU updates can now be pulled from the GitHub releases API, and there's a link on the home page if there's a newer version of InfiniTime than what's on the connected device. Clicking that link takes you to the DFU page and sets everything up so you can just press "Start transfer" and skip the whole downloading process.
    - Manual DFU updates are still available for those who wish to flash custom firmware files or InfiniTime PRs

- Uptime tracker - super rudimentary uptime tracker is now on the home screen. Shows the last disconnect time, and the uptime of your current session. This probably won't be useful long-term, but with all of the BLE fixes going on at InfiniTime it's fun to track the improvement in uptime.
    - no long-term tracking yet, and if you disconnect for anything (even just stepping out of range for a second), it resets the timer.

- DFU manager is a singleton now, and there are no environment objects in the app anymore!

Author: xan-m

Infini-iOS.xcodeproj/project.pbxproj

@@ -22,6 +22,7 @@
 		263B20C726CF07BB00676BF0 /* DFUProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 263B20C626CF07BB00676BF0 /* DFUProgressBar.swift */; };
 		2644261226DC093D009BD54A /* SetTime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2644261126DC093D009BD54A /* SetTime.swift */; };
 		2644261626DC1D8E009BD54A /* Onboarding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2644261526DC1D8E009BD54A /* Onboarding.swift */; };
+		264AE04627026BD6001504A7 /* UptimeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 264AE04527026BD6001504A7 /* UptimeManager.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 */; };
@@ -51,6 +52,8 @@
 		26C5FAD826FC129400921207 /* ArbitraryNotificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26C5FAD726FC129400921207 /* ArbitraryNotificationView.swift */; };
 		26C5FADC26FE7EB000921207 /* SheetCloseButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26C5FADB26FE7EB000921207 /* SheetCloseButton.swift */; };
 		26C5FAE126FE98F500921207 /* BLEAutoconnectManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26C5FAE026FE98F500921207 /* BLEAutoconnectManager.swift */; };
+		26C5FAE326FEB0A400921207 /* DFUDownloadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26C5FAE226FEB0A400921207 /* DFUDownloadView.swift */; };
+		26C5FAE8270100FF00921207 /* DownloadManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26C5FAE7270100FF00921207 /* DownloadManager.swift */; };
 		26D7816526C9EB3800BBF555 /* BLEDelegates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26D7816426C9EB3800BBF555 /* BLEDelegates.swift */; };
 		26D7816726C9EC3100BBF555 /* BLEManagerExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26D7816626C9EC3100BBF555 /* BLEManagerExtensions.swift */; };
 		26D7816E26CA003B00BBF555 /* SettingsFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26D7816D26CA003B00BBF555 /* SettingsFunctions.swift */; };
@@ -91,6 +94,7 @@
 		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>"; };
 		2644261526DC1D8E009BD54A /* Onboarding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Onboarding.swift; sourceTree = "<group>"; };
+		264AE04527026BD6001504A7 /* UptimeManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UptimeManager.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>"; };
@@ -126,6 +130,8 @@
 		26C5FAD726FC129400921207 /* ArbitraryNotificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArbitraryNotificationView.swift; sourceTree = "<group>"; };
 		26C5FADB26FE7EB000921207 /* SheetCloseButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SheetCloseButton.swift; sourceTree = "<group>"; };
 		26C5FAE026FE98F500921207 /* BLEAutoconnectManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEAutoconnectManager.swift; sourceTree = "<group>"; };
+		26C5FAE226FEB0A400921207 /* DFUDownloadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DFUDownloadView.swift; sourceTree = "<group>"; };
+		26C5FAE7270100FF00921207 /* DownloadManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadManager.swift; sourceTree = "<group>"; };
 		26D7816426C9EB3800BBF555 /* BLEDelegates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEDelegates.swift; sourceTree = "<group>"; };
 		26D7816626C9EC3100BBF555 /* BLEManagerExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEManagerExtensions.swift; sourceTree = "<group>"; };
 		26D7816D26CA003B00BBF555 /* SettingsFunctions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsFunctions.swift; sourceTree = "<group>"; };
@@ -301,6 +307,7 @@
 		26A6315926C49839005AE404 /* DFU */ = {
 			isa = PBXGroup;
 			children = (
+				26C5FAE7270100FF00921207 /* DownloadManager.swift */,
 				26A6315A26C49841005AE404 /* DFU.swift */,
 			);
 			path = DFU;
@@ -326,6 +333,7 @@
 				2675CA5626DC447500967E4D /* SheetManager.swift */,
 				26A6316226C4C6D6005AE404 /* BLEConnectView.swift */,
 				26C5FAD726FC129400921207 /* ArbitraryNotificationView.swift */,
+				26C5FAE226FEB0A400921207 /* DFUDownloadView.swift */,
 				26C5FADB26FE7EB000921207 /* SheetCloseButton.swift */,
 				2632389326F29A4100D72B43 /* Onboarding */,
 			);
@@ -344,6 +352,7 @@
 			isa = PBXGroup;
 			children = (
 				264BFE7526BC52720050A223 /* HexStringToData.swift */,
+				264AE04527026BD6001504A7 /* UptimeManager.swift */,
 				26D7817926CAD19F00BBF555 /* ColorPalette.swift */,
 				26C5FAD426FBB76100921207 /* DeviceNameManager.swift */,
 			);
@@ -497,6 +506,7 @@
 				26C5FAE126FE98F500921207 /* BLEAutoconnectManager.swift in Sources */,
 				26A6316026C4BC25005AE404 /* DFUView.swift in Sources */,
 				2632389026F2980A00D72B43 /* OnboardingDismissButton.swift in Sources */,
+				264AE04627026BD6001504A7 /* UptimeManager.swift in Sources */,
 				26A6315226BF45E0005AE404 /* BLEMusic.swift in Sources */,
 				2632388C26F265B100D72B43 /* MainView.swift in Sources */,
 				2632388826F2576D00D72B43 /* DFUFileSelectButton.swift in Sources */,
@@ -507,6 +517,7 @@
 				2644261626DC1D8E009BD54A /* Onboarding.swift in Sources */,
 				2632388426F2531C00D72B43 /* DFUWithBLE.swift in Sources */,
 				263B20C726CF07BB00676BF0 /* DFUProgressBar.swift in Sources */,
+				26C5FAE8270100FF00921207 /* DownloadManager.swift in Sources */,
 				26A6314D26BEFD2C005AE404 /* MusicController.swift in Sources */,
 				264DB80B26C62ED600E812C3 /* SideMenu.swift in Sources */,
 				264DB80D26C633CF00E812C3 /* PageSwitcher.swift in Sources */,
@@ -518,6 +529,7 @@
 				264BFE7626BC52720050A223 /* HexStringToData.swift in Sources */,
 				2632388626F2548600D72B43 /* DFUWithoutBLE.swift in Sources */,
 				26C5FADC26FE7EB000921207 /* SheetCloseButton.swift in Sources */,
+				26C5FAE326FEB0A400921207 /* DFUDownloadView.swift in Sources */,
 				2632388A26F2591900D72B43 /* DFUStartTransferButton.swift in Sources */,
 				2675CA5A26DC81AA00967E4D /* DFUComplete.swift in Sources */,
 				263B20BC26CDF20400676BF0 /* BatteryChart.swift in Sources */,

Infini-iOS/BLE/BLEManager.swift

@@ -133,26 +133,12 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate {
 	func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String : Any], rssi RSSI: NSNumber) {
 
 		var peripheralName: String!
-		// TODO: Recreate the process below.
-		/*
-			- the hash I'm using is only unique between PineTimes because the peripheral struct includes an incrementing ID number that's part of the hash.
-				- this works for getting more than one PT in the menu, but is obviously a drag because it's not at all guaranteed to be persistent
-			- there's some stuff happening here that doesn't need to happen - ex. there's an array and a dictionary doing basically the same thing?
-			- I mistakenly was under the impression that the UUID was generated by InfiniTime and was probably the same across all instances of InfiniTime, but it seems like that's incorrect!
-		*/
 
 		if let name = advertisementData[CBAdvertisementDataLocalNameKey] as? String {
 			peripheralName = name
 			let devUUIDString: String = peripheral.identifier.uuidString
 			let devUUID: CBUUID = CBUUID(string: devUUIDString)
 			let newPeripheral = Peripheral(id: peripheralDictionary.count, name: peripheralName, rssi: RSSI.intValue, peripheralHash: peripheral.hash, deviceUUID: devUUID, stringUUID: peripheral.identifier.uuidString)
-
-			
-			// handle autoconnect defaults
-			//let settings = UserDefaults.standard
-			//let autoconnect = settings.object(forKey: "autoconnect") as? Bool ?? true
-			//let autoconnectUUID = settings.object(forKey: "autoconnectUUID") as? String ?? ""
-			
 
 			guard BLEAutoconnectManager.shared.connect(peripheral: peripheral) else {
 				// compare peripheral UUIDs to make sure we're only adding each device once -- super helpful if you have a very noisy BLE advertiser nearby!
@@ -172,12 +158,14 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate {
 	func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeripheral) {
 		self.infiniTime.discoverServices(nil)
 		DeviceInfoManager().setDeviceName(uuid: peripheral.identifier.uuidString)
+		UptimeManager.shared.connectTime = Date()
 	}
 
 	func centralManager(_ central: CBCentralManager, didDisconnectPeripheral peripheral: CBPeripheral, error: Error?) {
 		if error != nil {
 			chartReconnect = true
 			connect(peripheral: peripheral)
+			UptimeManager.shared.lastDisconnect = Date()
 		} else {
 			DeviceInfoManager.init().clearDeviceInfo()
 		}

Infini-iOS/ContentView.swift

@@ -59,9 +59,6 @@ struct ContentView: View {
 					MainView()
 						.sheet(isPresented: $sheetManager.showSheet, content: {
 							SheetManager.CurrentSheet()
-								.onAppear {
-									print(sheetManager.sheetSelection)
-								}
 								.onDisappear {
 									if onboarding {
 										onboarding = false

Infini-iOS/DFU/DFU.swift

@@ -10,22 +10,30 @@ import NordicDFU
 
 class DFU_Updater: ObservableObject, DFUServiceDelegate, DFUProgressDelegate, LoggerDelegate  {
 
+	static let shared = DFU_Updater()
+	
 	private var url: URL = URL(fileURLWithPath: "")
-	var bleManager: BLEManager!
+	var bleManager: BLEManager = BLEManager.shared
 	var dfuController: DFUServiceController!
 
 	@Published var dfuState: String = ""
 	@Published var transferFailed = false
 	@Published var transferCompleted = false
 	@Published var percentComplete: Double = 0
+	
+	@Published var firmwareFilename = ""
+	@Published var firmwareSelected: Bool = false
+	public var local = true
+	public var firmwareURL: URL!
 
 
-	func prepare(location: URL, device: BLEManager) {
-		url = location
-		bleManager = device
-	}
+//	func prepare(location: URL, device: BLEManager) {
+//		url = location
+//		bleManager = device
+//	}
 
 	func transfer() {
+		guard let url = firmwareURL else {return}
 		guard url.startAccessingSecurityScopedResource() else { return }
 		guard let selectedFirmware = DFUFirmware(urlToZipFile:url) else { return }
 		let initiator = DFUServiceInitiator().with(firmware: selectedFirmware)
@@ -43,6 +51,26 @@ class DFU_Updater: ObservableObject, DFUServiceDelegate, DFUProgressDelegate, Lo
 		url.stopAccessingSecurityScopedResource()
 	}
 
+	func downloadTransfer() {
+		print("transfer function:")
+
+		
+		guard let selectedFirmware = DFUFirmware(urlToZipFile: firmwareURL) else { print("failed to load file"); return }
+	
+		let initiator = DFUServiceInitiator().with(firmware: selectedFirmware)
+
+		// Optional:
+		// initiator.forceDfu = true/false // default false
+		// initiator.packetReceiptNotificationParameter = N // default is 12
+		initiator.logger = self // - to get log info
+		initiator.delegate = self // - to be informed about current state and errors
+		initiator.progressDelegate = self // - to show progress bar
+		// initiator.peripheralSelector = ... // the default selector is used
+		if bleManager.infiniTime != nil {
+			dfuController = initiator.start(target: bleManager.infiniTime)
+		}
+	}
+	
 	func stopTransfer() {
 		if dfuController != nil {
 			_ = dfuController.abort()
@@ -54,14 +82,14 @@ class DFU_Updater: ObservableObject, DFUServiceDelegate, DFUProgressDelegate, Lo
 		dfuState = state.description()
 		print(dfuState)
 		if state.rawValue == 6 {
-			print("hooray")
 			transferCompleted = true
 			print(transferCompleted)
 		}
 	}
 
 	func dfuError(_ error: DFUError, didOccurWithMessage message: String) {
 		print("DFU Error:", message)
+		
 		dfuController = nil
 		transferFailed = true
 	}
@@ -71,6 +99,7 @@ class DFU_Updater: ObservableObject, DFUServiceDelegate, DFUProgressDelegate, Lo
 	}
 
 	func logWith(_ level: LogLevel, message: String) {
+		//print("DFU \(level.name()): \(message)")
 	}
 
 

Infini-iOS/DFU/DownloadManager.swift

@@ -0,0 +1,152 @@
+//
+//  DownloadManager.swift
+//  Infini-iOS
+//
+//  Created by Alex Emry on 9/26/21.
+//  
+//
+    
+
+import Foundation
+import NordicDFU
+
+class DownloadManager: NSObject, ObservableObject {
+	static var shared = DownloadManager()
+
+	@Published var tasks: [URLSessionTask] = []
+	@Published var results: [Result] = []
+	@Published var downloading = false
+	@Published var updateAvailable = false
+	@Published var autoUpgrade: Result!
+	
+	private lazy var urlSession = URLSession(configuration: .default, delegate: self, delegateQueue: nil)
+	private var downloadTask: URLSessionDownloadTask!
+	
+	struct Asset: Codable {
+		let id: Int
+		let name: String
+		let browser_download_url: URL
+	}
+	
+	struct Result: Codable {
+		let tag_name: String
+		let assets: [Asset]
+		var zipAsset: Asset!
+		
+		private enum CodingKeys: String, CodingKey {
+			case tag_name, assets
+		}
+	}
+	
+	func checkForUpdates() -> Bool {
+		for i in results {
+			if i.tag_name.first != "v" {
+				let comparison = BLEDeviceInfo.shared.firmware.compare(i.tag_name, options: .numeric)
+				if comparison == .orderedAscending {
+					print(i.tag_name)
+					autoUpgrade = i
+					return true
+				}
+			}
+		}
+		return false
+	}
+	
+	func getDownloadUrls() {
+		results = []
+		guard let url = URL(string: "https://api.github.com/repos/jf002/infinitime/releases") else {
+			return
+		}
+		URLSession.shared.dataTask(with: url) { data, response, error in
+			if let data = data {
+				do {
+					let res = try JSONDecoder().decode([Result].self, from: data)
+					DispatchQueue.main.async {
+						for i in res {
+							if i.tag_name.first != "v" {
+								if UserDefaults.standard.value(forKey: "showNewDownloadsOnly") as? Bool ?? true {
+									let comparison = BLEDeviceInfo.shared.firmware.compare(i.tag_name, options: .numeric)
+									if comparison == .orderedAscending || comparison == .orderedSame {
+										self.results.append(i)
+									}
+								} else {
+									self.results.append(i)
+								}
+							}
+						}
+						self.updateAvailable = self.checkForUpdates()
+					}
+				} catch {
+					print(error)
+				}
+			}
+		}.resume()
+	}
+	
+	func chooseAsset(response: Result) -> Asset {
+		// for now, I'm pulling the .zip file from the releases. This is not guaranteed to be successful (ie if there's more than one zip file in the release), but it's a start
+		for x in response.assets {
+			if x.name.suffix(4) == ".zip" {
+				return x
+			}
+		}
+		return Asset(id: Int(), name: String(), browser_download_url: URL(fileURLWithPath: ""))
+	}
+
+	func startDownload(url: URL) {
+		self.downloading = true
+		let downloadTask = urlSession.downloadTask(with: url)
+		downloadTask.resume()
+		self.downloadTask = downloadTask
+	}
+
+	private func updateTasks() {
+		urlSession.getAllTasks { tasks in
+			DispatchQueue.main.async {
+				self.tasks = tasks
+			}
+		}
+	}
+}
+
+extension DownloadManager: URLSessionDelegate, URLSessionDownloadDelegate {
+	func urlSession(_: URLSession, downloadTask: URLSessionDownloadTask, didWriteData _: Int64, totalBytesWritten _: Int64, totalBytesExpectedToWrite _: Int64) {
+		// uncomment for progress updates in console
+		//print("Progress " + String(downloadTask.progress.fractionCompleted))
+	}
+	
+	func urlSession(_: URLSession, downloadTask: URLSessionDownloadTask, didFinishDownloadingTo location: URL) {
+		do {
+			
+			let documentsURL = try FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: false)
+			let savedURL = documentsURL.appendingPathComponent(
+				"firmware.zip")
+			
+			// check for existing file and delete it if there is anything.
+			if FileManager.default.fileExists(atPath: savedURL.path) {
+				try? FileManager.default.removeItem(at: savedURL)
+				print("old file deleted")
+			}
+			
+			// move downloaded file out of ephemeral storage and tell DFU where to look
+			try FileManager.default.moveItem(at: location, to: savedURL)
+			DFU_Updater.shared.firmwareURL = savedURL
+			
+			} catch let fmerror {
+				print("filesystem error: \(fmerror)")
+				// handle filesystem error
+			}
+		DispatchQueue.main.async {
+			self.downloading = false
+		}
+	}
+	
+	func urlSession(_: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
+		if let error = error {
+			print("Download error: %@" + String(describing: error))
+//		uncomment to print that it finished
+//		} else {
+//			print("Task finished: %@" )//+ task)
+		}
+	}
+}

Infini-iOS/Infini_iOSApp.swift

@@ -15,8 +15,6 @@ struct Infini_iOSApp: App {
         WindowGroup {
             ContentView()
                 .environment(\.managedObjectContext, persistenceController.container.viewContext)
-//				.environmentObject(BLEManager())
-				.environmentObject(DFU_Updater())
         }
     }
 }

Infini-iOS/Info.plist

@@ -26,6 +26,8 @@
 	<string>This app uses bluetooth to communicate with your PineTime.</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
 	<string>This app uses bluetooth to communicate with your PineTime.</string>
+	<key>NSDownloadsFolderUsageDescription</key>
+	<string></string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>