Refactoring.

Removed necessity to provide fixed MiaoMiao uuid. Thus the closest MiaoMiao will be connected.

Author: UPetersen

LibreMonitor.xcodeproj/project.pbxproj

@@ -859,7 +859,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
 				MAIN_APP_BUNDLE_IDENTIFIER = "$(inherited).LibreMonitorUI";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -920,7 +920,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
 				MAIN_APP_BUNDLE_IDENTIFIER = "$(inherited).LibreMonitorUI";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;

LibreMonitor.xcworkspace/xcuserdata/Uwe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,7 +10,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "Yes"
             filePath = "LibreMonitor/Model/Measurement.swift"
-            timestampString = "565455383.823815"
+            timestampString = "578429314.26016"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "62"
@@ -34,11 +34,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "LibreMonitor/Bluetooth/MiaoMiaoManager.swift"
-            timestampString = "578129167.6082669"
+            timestampString = "578429314.260875"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "544"
-            endingLineNumber = "544"
+            startingLineNumber = "524"
+            endingLineNumber = "524"
             landmarkName = "peripheral(_:didUpdateNotificationStateFor:error:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -50,11 +50,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "LibreMonitor/Bluetooth/MiaoMiaoManager.swift"
-            timestampString = "578129167.609013"
+            timestampString = "578429314.261102"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "633"
-            endingLineNumber = "633"
+            startingLineNumber = "613"
+            endingLineNumber = "613"
             landmarkName = "peripheral(_:didUpdateValueFor:error:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -66,27 +66,27 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "LibreMonitor/Bluetooth/MiaoMiaoManager.swift"
-            timestampString = "578129167.609337"
+            timestampString = "578429314.261165"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "635"
-            endingLineNumber = "635"
+            startingLineNumber = "615"
+            endingLineNumber = "615"
             landmarkName = "MiaoMiaoManager"
             landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "LibreMonitor/Bluetooth/MiaoMiaoManager.swift"
-            timestampString = "578129167.609854"
+            timestampString = "578429314.261223"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "309"
-            endingLineNumber = "309"
+            startingLineNumber = "308"
+            endingLineNumber = "308"
             landmarkName = "centralManager(_:willRestoreState:)"
             landmarkType = "7">
          </BreakpointContent>

LibreMonitor/Bluetooth/MiaoMiaoManager.swift

@@ -241,7 +241,6 @@ final class MiaoMiaoManager: NSObject, CBCentralManagerDelegate, CBPeripheralDel
 
     override init() {
         super.init()
-//        centralManager = CBCentralManager(delegate: self, queue: nil, options: nil)
         centralManager = CBCentralManager(delegate: self, queue: nil, options: [CBCentralManagerOptionShowPowerAlertKey: true, CBCentralManagerOptionRestoreIdentifierKey: "LibreMonitorCoreBluetoothRestaurationKeyString"])
     }
 
@@ -266,8 +265,8 @@ final class MiaoMiaoManager: NSObject, CBCentralManagerDelegate, CBPeripheralDel
         //           First MiaoMiao:  A44638E4-B70F-DBE7-A519-C4E4DFED2066
         //           Second MiaoMiao: 3DE41921-6747-CDFD-D169-06EE86A81847
         os_log("Connect while state %{public}@", log: MiaoMiaoManager.bt_log, type: .default, String(describing: state.rawValue))
-//        if let peripheral = peripheral {
-        if let peripheral = peripheral, let identifier = UUID(uuidString: "3DE41921-6747-CDFD-D169-06EE86A81847"), peripheral.identifier == identifier {
+        if let peripheral = peripheral {
+//        if let peripheral = peripheral, let identifier = UUID(uuidString: "3DE41921-6747-CDFD-D169-06EE86A81847"), peripheral.identifier == identifier {
             peripheral.delegate = self
             centralManager.stopScan()
             centralManager.connect(peripheral, options: nil)
@@ -314,43 +313,24 @@ final class MiaoMiaoManager: NSObject, CBCentralManagerDelegate, CBPeripheralDel
                 print(peripheral.description)
                 if peripheral.state == .disconnecting || peripheral.state == .disconnected {
                     self.peripheral = peripheral
+                    peripheral.delegate = self
                     self.state = .Disconnected
                     connect()
                 } else {
                     self.peripheral = peripheral
                     peripheral.delegate = self
                     self.state = .Connected
                     peripheral.discoverServices(serviceUUIDs) // good practice to just discover the services, needed
-
-                    // peripheral should already be connected
                 }
             }
         } else {
             switch central.state {
             case .poweredOff, .resetting, .unauthorized, .unknown, .unsupported:
                 state = .Unassigned
-            case .poweredOn:
-                scanForMiaoMiao() // power was switched on, while app is running -> reconnect.
+            case .poweredOn: // Scanning will not work in background with MiaoMiao (since MiaoMiao does not advertise its services)
+                scanForMiaoMiao() // power was switched on, while app is running
             }
         }
-//        switch central.state {
-//        case .poweredOff, .resetting, .unauthorized, .unsupported:
-//            state = .Unassigned
-//        case .poweredOn, .unknown:
-//            if let peripheral = dict[CBCentralManagerRestoredStatePeripheralsKey] as? CBPeripheral {
-//                self.peripheral = peripheral
-//                // If the peripheral already exists:
-//                //   if disconnected, connect to it. Otherwhise it is already connected: disconnect and reconnect to get through the whole chain of methods.
-//                if peripheral.state == .disconnected || peripheral.state == .disconnecting {
-//                    connect()
-//                } else {
-//                    centralManager.cancelPeripheralConnection(peripheral)
-//                    connect()
-//                }
-//            } else {
-//                scanForMiaoMiao()
-//            }
-//        }
     }