Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Loop Status Extension/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.1.2</string>
<string>1.2.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>MainAppBundleIdentifier</key>
Expand Down
14 changes: 9 additions & 5 deletions Loop Status Extension/StatusExtensionContext.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct GlucoseContext {
let sensor: SensorDisplayable?
}

final class StatusExtensionContext: NSObject, RawRepresentable {
final class StatusExtensionContext: RawRepresentable {
typealias RawValue = [String: Any]
private let version = 1

Expand All @@ -52,12 +52,9 @@ final class StatusExtensionContext: NSObject, RawRepresentable {
var batteryPercentage: Double?
var eventualGlucose: Double?

override init() {
super.init()
}
init() { }

required init?(rawValue: RawValue) {
super.init()
let raw = rawValue

if let preferredString = raw["preferredUnitDisplayString"] as? String,
Expand Down Expand Up @@ -161,3 +158,10 @@ final class StatusExtensionContext: NSObject, RawRepresentable {
return raw
}
}


extension StatusExtensionContext: CustomDebugStringConvertible {
var debugDescription: String {
return String(reflecting: rawValue)
}
}
10 changes: 7 additions & 3 deletions Loop/Managers/DeviceDataManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -975,11 +975,11 @@ final class DeviceDataManager: CarbStoreDelegate, CarbStoreSyncDelegate, DoseSto

// MARK: - WatchKit

private(set) var watchManager: WatchDataManager!
fileprivate var watchManager: WatchDataManager!

// MARK: - Status Extension

private(set) var statusExtensionManager: StatusExtensionDataManager!
fileprivate var statusExtensionManager: StatusExtensionDataManager!

// MARK: - Initialization

Expand Down Expand Up @@ -1075,7 +1075,11 @@ extension DeviceDataManager: CustomDebugStringConvertible {
"workoutModeEnabled: \(workoutModeEnabled)",
"maximumBasalRatePerHour: \(maximumBasalRatePerHour)",
"maximumBolus: \(maximumBolus)",
String(reflecting: rileyLinkManager)
String(reflecting: rileyLinkManager),
String(reflecting: statusExtensionManager!),
"",
"## NSUserDefaults",
String(reflecting: UserDefaults.standard.dictionaryRepresentation())
].joined(separator: "\n")
}
}
Expand Down
16 changes: 15 additions & 1 deletion Loop/Managers/StatusExtensionDataManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,17 @@ final class StatusExtensionDataManager {
NotificationCenter.default.addObserver(self, selector: #selector(update(_:)), name: .LoopDataUpdated, object: deviceDataManager.loopManager)
}

fileprivate var defaults: UserDefaults? {
return UserDefaults(suiteName: Bundle.main.appGroupSuiteName)
}

@objc private func update(_ notification: Notification) {

self.dataManager.glucoseStore?.preferredUnit() { (unit, error) in
if error == nil, let unit = unit {
self.createContext(unit) { (context) in
if let context = context {
UserDefaults(suiteName: Bundle.main.appGroupSuiteName)?.statusExtensionContext = context
self.defaults?.statusExtensionContext = context
}
}
}
Expand Down Expand Up @@ -98,3 +102,13 @@ final class StatusExtensionDataManager {
}
}
}


extension StatusExtensionDataManager: CustomDebugStringConvertible {
var debugDescription: String {
return [
"## StatusExtensionDataManager",
"statusExtensionContext: \(String(reflecting: defaults?.statusExtensionContext))"
].joined(separator: "\n")
}
}