Minor bugfixes

Author: xan-m

Infini-iOS/BLE/BLEDelegates.swift

@@ -56,13 +56,13 @@ extension BLEManager: CBPeripheralDelegate {
 	func peripheral(_ peripheral: CBPeripheral, didUpdateValueFor characteristic: CBCharacteristic, error: Error?) {
 		let getDeviceInfo = DeviceInfoManager()
 		getDeviceInfo.updateInfo(characteristic: characteristic)
+		DownloadManager.shared.getDownloadUrls()
 
 		switch characteristic.uuid {
 		case cbuuidList.shared.musicControl:
 			// listen for the music controller notifications
 			let musicControl = [UInt8](characteristic.value!)
 			controlMusic(controlNumber: Int(musicControl[0]))
-			print(musicControl)
 
 		case cbuuidList.shared.musicTrack:
 			// select track characteristic for writing to music app

Infini-iOS/BLE/BLEManager.swift

@@ -165,10 +165,11 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate {
 		if error != nil {
 			chartReconnect = true
 			connect(peripheral: peripheral)
-			UptimeManager.shared.lastDisconnect = Date()
 		} else {
 			DeviceInfoManager.init().clearDeviceInfo()
 		}
+		UptimeManager.shared.lastDisconnect = Date()
+		UptimeManager.shared.connectTime = nil
 	}
 
 	func centralManagerDidUpdateState(_ central: CBCentralManager) {

Infini-iOS/DFU/DFU.swift

@@ -74,6 +74,7 @@ class DFU_Updater: ObservableObject, DFUServiceDelegate, DFUProgressDelegate, Lo
 	func stopTransfer() {
 		if dfuController != nil {
 			_ = dfuController.abort()
+			dfuController = nil
 		}
 	}
 
@@ -84,6 +85,7 @@ class DFU_Updater: ObservableObject, DFUServiceDelegate, DFUProgressDelegate, Lo
 		if state.rawValue == 6 {
 			transferCompleted = true
 			print(transferCompleted)
+			dfuController = nil
 		}
 	}
 
@@ -99,7 +101,7 @@ class DFU_Updater: ObservableObject, DFUServiceDelegate, DFUProgressDelegate, Lo
 	}
 
 	func logWith(_ level: LogLevel, message: String) {
-		//print("DFU \(level.name()): \(message)")
+		print("DFU \(level.name()): \(message)")
 	}
 
 

Infini-iOS/DFU/DownloadManager.swift

@@ -43,7 +43,7 @@ class DownloadManager: NSObject, ObservableObject {
 			if i.tag_name.first != "v" {
 				let comparison = BLEDeviceInfo.shared.firmware.compare(i.tag_name, options: .numeric)
 				if comparison == .orderedAscending {
-					print(i.tag_name)
+					updateAvailable = true
 					autoUpgrade = i
 					return true
 				}

Infini-iOS/View Components/HomeScreen.swift

@@ -48,6 +48,7 @@ struct HomeScreen: View {
 						Text("Last disconnect: ")
 					} else {
 						Text("Last disconnect: " + uptimeManager.dateFormatter.string(from: uptimeManager.lastDisconnect))
+
 					}
 					if currentUptime == nil {
 						Text("Uptime: ")
@@ -76,9 +77,7 @@ struct HomeScreen: View {
 					}
 				}
 			}
-			.onAppear() {
-				downloadManager.getDownloadUrls()
-			}
+
 
 			Spacer()
 			Button(action: {

Infini-iOS/View Components/SettingsView.swift

@@ -62,8 +62,8 @@ struct Settings_Page: View {
 					}
 				}
 
-				Section(header: Text("Updates")) {
-					Toggle("Show Upgrades Only", isOn: $showNewDownloadsOnly)
+				Section(header: Text("Firmware Updates")) {
+					Toggle("Show Newer Versions Only", isOn: $showNewDownloadsOnly)
 				}
 
 

Infini-iOS/View Components/SideMenu.swift

@@ -72,6 +72,7 @@ struct SideMenu: View {
 			HStack {
 				if !self.bleManager.isConnectedToPinetime {
 					Button(action: {
+						SheetManager.shared.sheetSelection = .connect
 						SheetManager.shared.showSheet = true
 						pageSwitcher.showMenu = false
 					}) {