Merge remote-tracking branch 'upstream/main' into fix-merge

Author: DAcodedBEAT

App/App.swift

@@ -13,15 +13,15 @@ import SwiftUI
 // MARK: - GlucoseDirectApp
 
 @main
-final class GlucoseDirectApp: App {
+struct GlucoseDirectApp: App {
     // MARK: Lifecycle
 
     init() {
         #if targetEnvironment(simulator)
             DirectLog.info("Application directory: \(NSHomeDirectory())")
         #endif
 
-        GlucoseDirectApp.store.dispatch(.startup)
+        store.dispatch(.startup)
     }
 
     // MARK: Internal
@@ -36,16 +36,13 @@ final class GlucoseDirectApp: App {
     var body: some Scene {
         WindowGroup {
             ContentView()
-                .environmentObject(GlucoseDirectApp.store)
+                .environmentObject(self.store)
         }
     }
 
     // MARK: Private
 
-    
-    public static var store: DirectStore = {
-            return createStore()
-        }()
+    private let store: DirectStore = createStore()
 }
 
 // MARK: - GlucoseDirectAppDelegate

App/Modules/SensorConnector/LibreConnection/LibreLinkUpConnection.swift

@@ -151,14 +151,18 @@ class LibreLinkUpConnection: SensorBluetoothConnection, IsSensor {
 
     // MARK: Private
 
+    private var throttleDelay: Double {
+        (Double(sensorInterval) / 1.5) * 60
+    }
+
     private var lastLogin: LibreLinkLogin?
     private let oneMinuteReadingUUID = CBUUID(string: "0898177A-EF89-11E9-81B4-2A2AE2DBCCE4")
     private var oneMinuteReadingCharacteristic: CBCharacteristic?
     private let requestHeaders = [
         "User-Agent": "Mozilla/5.0",
         "Content-Type": "application/json",
         "product": "llu.ios",
-        "version": "4.8.0",
+        "version": "4.12.0",
         "Accept-Encoding": "gzip, deflate, br",
         "Connection": "keep-alive",
         "Pragma": "no-cache",
@@ -179,13 +183,9 @@ class LibreLinkUpConnection: SensorBluetoothConnection, IsSensor {
         return decoder
     }()
 
-    private var throttleDelay: Double {
-        (Double(sensorInterval) / 1.5) * 60
-    }
-
     private func processLogin(apiRegion: String? = nil) async throws {
         if lastLogin == nil || lastLogin!.authExpires <= Date() {
-            DirectLog.info("LibreLinkUp processLogin")
+            DirectLog.info("LibreLinkUp processLogin, starts working, \(Date().debugDescription)")
 
             var loginResponse = try await login(apiRegion: apiRegion)
             if loginResponse.status == 4 {
@@ -223,7 +223,7 @@ class LibreLinkUpConnection: SensorBluetoothConnection, IsSensor {
             DirectLog.info("LibreLinkUp processLogin, apiRegion: \(apiRegion)")
             DirectLog.info("LibreLinkUp processLogin, authExpires: \(authExpires)")
 
-            let connectResponse = try await connect(apiRegion: apiRegion, authToken: authToken)
+            let connectResponse = try await connect(userID: userID, apiRegion: apiRegion, authToken: authToken)
 
             guard let patientID = connectResponse.data?.first(where: { $0.patientID == userID })?.patientID ?? connectResponse.data?.first?.patientID else {
                 disconnectConnection()
@@ -233,12 +233,12 @@ class LibreLinkUpConnection: SensorBluetoothConnection, IsSensor {
 
             DirectLog.info("LibreLinkUp processLogin, patientID: \(patientID)")
 
-            lastLogin = LibreLinkLogin(patientID: patientID, apiRegion: apiRegion, authToken: authToken, authExpires: authExpires)
+            lastLogin = LibreLinkLogin(userID: userID, patientID: patientID, apiRegion: apiRegion, authToken: authToken, authExpires: authExpires)
         }
     }
 
     private func processFetch() async throws {
-        DirectLog.info("LibreLinkUp processFetch")
+        DirectLog.info("LibreLinkUp processFetch, starts working, \(Date().debugDescription)")
 
         try await processLogin()
 
@@ -375,7 +375,7 @@ class LibreLinkUpConnection: SensorBluetoothConnection, IsSensor {
         throw LibreLinkError.unknownError
     }
 
-    private func connect(apiRegion: String, authToken: String) async throws -> LibreLinkResponse<[LibreLinkResponseConnect]> {
+    private func connect(userID: String, apiRegion: String, authToken: String) async throws -> LibreLinkResponse<[LibreLinkResponseConnect]> {
         DirectLog.info("LibreLinkUp connect")
 
         guard let url = URL(string: "https://api-\(apiRegion).libreview.io/llu/connections") else {
@@ -386,6 +386,7 @@ class LibreLinkUpConnection: SensorBluetoothConnection, IsSensor {
 
         var request = URLRequest(url: url)
         request.setValue("Bearer \(authToken)", forHTTPHeaderField: "Authorization")
+        request.setValue(userID.toSha256(), forHTTPHeaderField: "Account-Id")
 
         for (header, value) in requestHeaders {
             request.setValue(value, forHTTPHeaderField: header)
@@ -422,6 +423,7 @@ class LibreLinkUpConnection: SensorBluetoothConnection, IsSensor {
 
         var request = URLRequest(url: url)
         request.setValue("Bearer \(lastLogin.authToken)", forHTTPHeaderField: "Authorization")
+        request.setValue(lastLogin.userID.toSha256(), forHTTPHeaderField: "Account-Id")
 
         for (header, value) in requestHeaders {
             request.setValue(value, forHTTPHeaderField: header)
@@ -526,9 +528,7 @@ private struct LibreLinkResponseActiveSensors: Codable {
 // MARK: - LibreLinkResponseDevice
 
 private struct LibreLinkResponseDevice: Codable {
-    enum CodingKeys: String, CodingKey { case dtid
-        case version = "v"
-    }
+    enum CodingKeys: String, CodingKey { case dtid, version = "v" }
 
     let dtid: Int
     let version: String
@@ -537,9 +537,7 @@ private struct LibreLinkResponseDevice: Codable {
 // MARK: - LibreLinkResponseSensor
 
 private struct LibreLinkResponseSensor: Codable {
-    enum CodingKeys: String, CodingKey { case sn
-        case activation = "a"
-    }
+    enum CodingKeys: String, CodingKey { case sn, activation = "a" }
 
     let sn: String
     let activation: Double
@@ -559,9 +557,7 @@ private extension LibreLinkResponseSensor {
 // MARK: - LibreLinkResponseGlucose
 
 private struct LibreLinkResponseGlucose: Codable {
-    enum CodingKeys: String, CodingKey { case timestamp = "Timestamp"
-        case value = "ValueInMgPerDl"
-    }
+    enum CodingKeys: String, CodingKey { case timestamp = "Timestamp", value = "ValueInMgPerDl" }
 
     let timestamp: Date
     let value: Double
@@ -580,7 +576,7 @@ private extension LibreLinkResponseUser {
             return country.lowercased()
         }
 
-        if country.lowercased() == "gb" {
+        if (country.lowercased() == "gb") {
             return "eu2"
         }
 
@@ -600,7 +596,8 @@ private struct LibreLinkResponseAuthentication: Codable {
 private struct LibreLinkLogin {
     // MARK: Lifecycle
 
-    init(patientID: String, apiRegion: String, authToken: String, authExpires: Double) {
+    init(userID: String, patientID: String, apiRegion: String, authToken: String, authExpires: Double) {
+        self.userID = userID
         self.patientID = patientID
         self.apiRegion = apiRegion.lowercased()
         self.authToken = authToken
@@ -609,6 +606,7 @@ private struct LibreLinkLogin {
 
     // MARK: Internal
 
+    let userID: String
     let patientID: String
     let apiRegion: String
     let authToken: String

FAQ.md

@@ -2,14 +2,14 @@
 
 ## Glucose Direct keeps losing the connection to the sensor
 
-Check if other apps (such as LibreLink) are allowed to use Bluetooth, and thus take away Glucose Direct's connection to the sensor !
+Check if other apps (such as LibreLink) are allowed to use Bluetooth, and thus take away Glucose Direct's connection to the sensor.
 
 This can be done under the iOS app "Settings" > "LibreLink" (or other app that can connect sensors), disable Bluetooth there.
 
 ## No more minute-by-minute notifications, but glucose alarms continue to sound
 Go to Settings, disable the Glucose Badge under "Other Settings", but leave all alarms enabled. With the glucose badge also minutely notifications disappear. Without the notifications, however, it is also unfortunately not possible to display mmol values on the app icon.
 
-## Display glucose values on the Apple Watch !
+## Display glucose values on the Apple Watch
 Create a new calendar in the Apple "Calendar" app, e.g. "Glucose Direct".  Activate the calendar export in the Glucose Direct app, also select the created calendar there.
 
 On the Apple Watch, activate a complication with the calendar selection "Your Schedule" on your Watch Face.

GlucoseDirect.xcodeproj/project.pbxproj

@@ -970,7 +970,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1400;
-				LastUpgradeCheck = 1400;
+				LastUpgradeCheck = 1600;
 				TargetAttributes = {
 					E20B8539266F4A9800AA4224 = {
 						CreatedOnToolsVersion = 12.5;
@@ -1396,6 +1396,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1459,6 +1460,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1483,7 +1485,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = E247D8E426B7D70A00BDAF89 /* GlucoseDirect.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				APP_GROUP_ID = "$(APP_GROUP_ID)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -1515,7 +1516,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = E247D8E426B7D70A00BDAF89 /* GlucoseDirect.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				APP_GROUP_ID = "$(APP_GROUP_ID)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -1647,7 +1647,7 @@
 			repositoryURL = "https://github.com/groue/GRDB.swift";
 			requirement = {
 				kind = exactVersion;
-				version = 6.15.0;
+				version = 6.29.3;
 			};
 		};
 		F45270802ACE690C00DB1611 /* XCRemoteSwiftPackageReference "toast-swift" */ = {

GlucoseDirect.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,12 +1,13 @@
 {
+  "originHash" : "1608ac12fdffe7fac9708cd1c5ae519dcab3a5d88dd62c53deb1c399a2e8dbf1",
   "pins" : [
     {
       "identity" : "grdb.swift",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/groue/GRDB.swift",
       "state" : {
-        "revision" : "57aa4c30bfa0fe6a1913f83042937c4fb943e79c",
-        "version" : "6.15.0"
+        "revision" : "2cf6c756e1e5ef6901ebae16576a7e4e4b834622",
+        "version" : "6.29.3"
       }
     },
     {
@@ -19,5 +20,5 @@
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }

GlucoseDirect.xcodeproj/xcshareddata/xcschemes/GlucoseDirectApp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

GlucoseDirect.xcodeproj/xcshareddata/xcschemes/GlucoseDirectWidget.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1600"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

GlucoseDirectOverride.xcconfig

@@ -3,8 +3,4 @@
 //  LibreDirect
 //
 
-PRODUCT_BUNDLE_IDENTIFIER = name.${DEVELOPMENT_TEAM}.libre-direct
 DEVELOPMENT_TEAM = 9JNYW2DG9D
-
-APP_AUTHOR = Reimar Metzen
-APP_SUPPORT_MAIL = glucosedirect@icloud.com

Library/Extensions/String.swift

@@ -5,6 +5,7 @@
 
 import CommonCrypto
 import Foundation
+import CryptoKit
 
 extension String {
     func capitalizingFirstLetter() -> String {
@@ -14,6 +15,13 @@ extension String {
     func asMinuteChange() -> String {
         return String(format: LocalizedString("%1$@/min."), self)
     }
+    
+    func toSha256() -> String {
+        let data = Data(self.utf8)
+        
+        let hashedData = SHA256.hash(data: data)
+        return hashedData.map { String(format: "%02hhx", $0) }.joined()
+    }
 
     func toSha1() -> String {
         let data = Data(self.utf8)

README.md

@@ -1,4 +1,4 @@
-## Glucose Direct App
+## Glucose Direct
 
 *** Warning ***, This project is highly experimental! Please use this app with caution and extreme care. Do not make careless decisions based on software. Do not use this software if you are unsure.***