[Device] Remove StorageInfo from Flipper GATT model

nmsantron · Jun 7, 2024 · efeebe3 · efeebe3
1 parent b947a0d
commit efeebe3
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/Flipper/Packages/Core/Sources/Flipper/Flipper.swift b/Flipper/Packages/Core/Sources/Flipper/Flipper.swift
@@ -9,7 +9,6 @@ public struct Flipper: Equatable, Identifiable {
     public var state: FlipperState = .disconnected
     public var information: DeviceInformation?
     public var battery: Battery?
-    public var storage: StorageInfo?
 
     // swiftlint:disable discouraged_optional_boolean
     public var hasProtobufVersion: Bool?
@@ -33,11 +32,6 @@ public struct Flipper: Equatable, Identifiable {
         self.battery = battery
         self.hasProtobufVersion = hasProtobufVersion
     }
-
-    public struct StorageInfo: Equatable {
-        public var `internal`: StorageSpace?
-        public var external: StorageSpace?
-    }
 }
 
 fileprivate extension String {

diff --git a/Flipper/Packages/Core/Sources/Model/Device.swift b/Flipper/Packages/Core/Sources/Model/Device.swift
@@ -19,11 +19,17 @@ public class Device: ObservableObject {
     @Published public var isLocked = false
 
     @Published public var flipper: Flipper?
+    @Published public var storageInfo: StorageInfo?
     @Published public private(set) var frame: ScreenFrame?
 
     @Published public private(set) var info: Info = .init()
     @Published public private(set) var isInfoReady = false
 
+    public struct StorageInfo: Equatable {
+        public var `internal`: StorageSpace?
+        public var external: StorageSpace?
+    }
+
     public init(
         central: Central,
         pairedDevice: PairedDevice,
@@ -201,9 +207,9 @@ public class Device: ObservableObject {
     // MARK: API
 
     private func loadStorageInfo() async throws {
-        var storageInfo = Flipper.StorageInfo()
+        var storageInfo = StorageInfo()
         defer {
-            flipper?.storage = storageInfo
+            self.storageInfo = storageInfo
         }
         do {
             storageInfo.internal = try await storage.space(of: "/int")
@@ -428,7 +434,7 @@ extension Device {
         Task {
             guard
                 let protobufRevision = flipper?.information?.protobufRevision,
-                let storage = flipper?.storage
+                let storage = storageInfo
             else {
                 return
             }

diff --git a/Flipper/Packages/Core/Sources/Model/UpdateModel.swift b/Flipper/Packages/Core/Sources/Model/UpdateModel.swift
@@ -114,7 +114,7 @@ public class UpdateModel: ObservableObject {
     var provisionedRegion: LazyResult<ISOCode, Swift.Error> = .idle
 
     var hasSDCard: LazyResult<Bool, Swift.Error> {
-        guard let storage = flipper?.storage else { return .working }
+        guard let storage = device.storageInfo else { return .working }
         return .success(storage.external != nil)
     }
 

diff --git a/Flipper/Packages/Peripheral/Sources/Bluetooth/Platform/FlipperPeripheral.swift b/Flipper/Packages/Peripheral/Sources/Bluetooth/Platform/FlipperPeripheral.swift
@@ -180,7 +180,6 @@ extension FlipperPeripheral: CBPeripheralDelegate {
         if let batteryPowerState = characteristics.batteryPowerState {
             peripheral.setNotifyValue(true, for: batteryPowerState)
             peripheral.readValue(for: batteryPowerState)
-            return
         }
     }
 

diff --git a/Flipper/Packages/UI/Sources/Device/Info/DeviceInfoView.swift b/Flipper/Packages/UI/Sources/Device/Info/DeviceInfoView.swift
@@ -126,11 +126,11 @@ struct DeviceInfoView: View {
     private func share() {
         var array = info.keys.toArray().sorted()
 
-        if let int = device.flipper?.storage?.internal {
+        if let int = device.storageInfo?.internal {
             array.append("storage.int.available: \(int.free)")
             array.append("storage.int.total: \(int.total)")
         }
-        if let ext = device.flipper?.storage?.external {
+        if let ext = device.storageInfo?.external {
             array.append("storage.ext.available: \(ext.free)")
             array.append("storage.ext.total: \(ext.total)")
         }

diff --git a/Flipper/Packages/UI/Sources/Device/InfoCard/DeviceInfoCard.swift b/Flipper/Packages/UI/Sources/Device/InfoCard/DeviceInfoCard.swift
@@ -68,7 +68,7 @@ struct DeviceInfoCard: View {
     }
 
     var internalSpace: AttributedString? {
-        guard isConnected, let int = device.flipper?.storage?.internal else {
+        guard isConnected, let int = device.storageInfo?.internal else {
             return nil
         }
         var result = AttributedString(int.description)
@@ -79,10 +79,10 @@ struct DeviceInfoCard: View {
     }
 
     var externalSpace: AttributedString? {
-        guard isConnected, device.flipper?.storage?.internal != nil else {
+        guard isConnected, device.storageInfo?.internal != nil else {
             return nil
         }
-        guard let ext = device.flipper?.storage?.external else {
+        guard let ext = device.storageInfo?.external else {
             return "—"
         }
         var result = AttributedString(ext.description)
-Original file line number
+Diff line change
@@ Expand Up / @@ -180,7 +180,6 @@ extension FlipperPeripheral: CBPeripheralDelegate { @@
             if let batteryPowerState = characteristics.batteryPowerState {
                 peripheral.setNotifyValue(true, for: batteryPowerState)
                 peripheral.readValue(for: batteryPowerState)
-                return
             }
         }
@@ Expand Down @@