trying to catch object

ddtch · Mar 22, 2022 · 4d6ff9c · 4d6ff9c
1 parent 3dc1799
commit 4d6ff9c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/Sources/RNLibreToolsiOS13/LibreToolsResources/Sensor.swift b/Sources/RNLibreToolsiOS13/LibreToolsResources/Sensor.swift
@@ -494,7 +494,7 @@ class Sensor: ObservableObject {
         var initializations: Int
     }
 
-    func detailFRAM() -> SensorInfo {
+    func detailFRAM() throws -> SensorInfo {
 
         let response = SensorInfo(
             type: type,
@@ -516,9 +516,7 @@ class Sensor: ObservableObject {
         if crcReport.count > 0 {
             logger.info("crcReport: \(crcReport)")
             if isCrcReportFailed(crcReport) {
-                let err = LibreError.dataValidation("detailFram sensor data")
-                logger.error("CRC report fails")
-                return response
+                throw LibreError.dataValidation("detailFram sensor data")
             }
         }
 

diff --git a/Sources/RNLibreToolsiOS13/NFCOperations/NFCReadFramOperation.swift b/Sources/RNLibreToolsiOS13/NFCOperations/NFCReadFramOperation.swift
@@ -21,12 +21,13 @@ final class NFCReadFramOperation: NFCAbstractOperation {
 extension Sensor {
 
     func convertToReadFramResponse() throws -> [[String: AnyObject]] {
-        let sensInfo = try self.detailFRAM()
-        if (sensInfo.age <= 0) {
+        do {
+            let sensInfo = try self.detailFRAM()
+            print(sensInfo.age)
+            return [["sensorInfo": sensInfo as AnyObject]]
+        } catch {
             throw LibreError.readFailure("Can not get senser info")
         }
-        // TODO @ddtch: implement actual logic
-        return [["sensorInfo": sensInfo as AnyObject]]
 
     }
 }

diff --git a/Sources/RNLibreToolsiOS13/RNLibreToolsiOS13.swift b/Sources/RNLibreToolsiOS13/RNLibreToolsiOS13.swift
@@ -39,7 +39,11 @@ public class RNLibreToolsiOS13 : RnLibreToolsProtocol {
             case .failure(let err): completion(.failure(err))
             case .success(let sensor):
                 do {
-                    completion(.success(try sensor.convertToReadFramResponse()))
+                    let sensInfo = try sensor.convertToReadFramResponse()
+                    self.logger.info("+++++++++++++++++++++++++++++++++++++++++++++++++++")
+                    print(sensInfo)
+                    self.logger.info("+++++++++++++++++++++++++++++++++++++++++++++++++++")
+                    completion(.success(sensInfo))
                 } catch {
                    if let err = error as? LibreError {
                      completion(.failure(err))