Merge pull request #123 from ProteGO-Safe/release/4.7.1

Release/4.7.1

Author: qLb

CHANGELOG.md

@@ -6,6 +6,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.7.1
+- Bump iOS version availability for some log methods
+- Clear exposure risk info on demand
+
 ## 4.7.0
 - Omit package analysis on very first app run
 - Added ability for sign-in for covid-19 test

Podfile.lock

@@ -206,4 +206,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 3b4c80f3b7969f193f8dc8c1f1db0378d6243a8c
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3

README.md

@@ -74,6 +74,10 @@ To launch it, type `sh rebuild.sh` in your console.
 
 ## ChangeLog
 
+**4.7.1**
+- Bump iOS version availability for some log methods
+- Clear exposure risk info on demand
+
 **4.7.0**
 - Omit package analysis on very first app run
 - Added ability for sign-in for covid-19 test

project.yml

@@ -12,7 +12,7 @@ configs:
 
 settings:
   CODE_SIGN_STYLE: Manual
-  MARKETING_VERSION: "4.7.0"
+  MARKETING_VERSION: "4.7.1"
   CURRENT_PROJECT_VERSION: 745
 schemes:
   safesafe Dev:

safesafe/Common/Files/File.swift

@@ -27,7 +27,7 @@ final class File {
         }
     }
 
-    @available(iOS 13.0, *)
+    @available(iOS 13.4, *)
     static func append(data: Data, to fileName: String, in directory: URL) {
         let fileURL = directory.appendingPathComponent(fileName)
         if FileManager.default.fileExists(atPath: fileURL.path) {
@@ -54,7 +54,7 @@ extension File {
         return nil
     }
 
-    @available(iOS 13.0, *)
+    @available(iOS 13.5, *)
     static func logToFile(_ message: String) {
         guard let data = message.appending("\n").data(using: .utf8) else { return }
         do {

safesafe/Services/ExposureNotification/ExposureSummaryService.swift

@@ -10,7 +10,7 @@ import Foundation
 protocol ExposureSummaryServiceProtocol: class {
 
     func getExposureSummary() -> ExposureSummary
-    
+    func clearExposureSummary() -> ExposureSummary
 }
 
 final class ExposureSummaryService: ExposureSummaryServiceProtocol {
@@ -57,6 +57,24 @@ final class ExposureSummaryService: ExposureSummaryServiceProtocol {
         return summary
     }
 
+    func clearExposureSummary() -> ExposureSummary {
+        guard let allExposures: [Exposure] = storageService?.fetch() else {
+            return getExposureSummary()
+        }
+        
+        storageService?.beginWrite()
+        
+        storageService?.remove(allExposures, completion: nil)
+        
+        do {
+            try storageService?.commitWrite()
+            return getExposureSummary()
+        } catch {
+            console(error, type: .error)
+            return getExposureSummary()
+        }
+    }
+    
     // MARK: - Private methods
 
     /// Removes expired data from local storage.

safesafe/Services/JavaScript Bridge/ExposureNotificationJSBridge.swift

@@ -13,6 +13,7 @@ protocol ExposureNotificationJSProtocol: class {
 
     func enableService(enable: Bool) -> Promise<Void>
     func getExposureSummary(shouldDownload: Bool) -> Promise<ExposureSummary>
+    func clearExposureRisk() -> Promise<ExposureSummary>
 }
 
 extension ExposureNotificationJSProtocol {
@@ -86,6 +87,12 @@ final class ExposureNotificationJSBridge: ExposureNotificationJSProtocol {
         }
     }
 
+    func clearExposureRisk() -> Promise<ExposureSummary> {
+        Promise { seal in
+            seal.fulfill(self.exposureSummaryService.clearExposureSummary())
+        }
+    }
+    
     // MARK: - Private methods
 
     private func turnOnService() -> Promise<Void> {

safesafe/Services/JavaScript Bridge/JSBridge.swift

@@ -27,6 +27,7 @@ final class JSBridge: NSObject {
         case exposureList = 61
         case appVersion = 62
         case systemLanguage = 63
+        case clearExposureRisk = 66
 
         case allDistricts = 70
         case districtsAPIFetch = 71
@@ -255,6 +256,9 @@ extension JSBridge: WKScriptMessageHandler {
         case .freeTestPinCodeFetch:
             freeTestPinCodeFetch(requestID: requestId, dataType: bridgeDataType)
 
+        case .clearExposureRisk:
+            clearExposureRisk(requestID: requestId, dataType: bridgeDataType)
+            
         default:
             return
         }
@@ -434,6 +438,18 @@ private extension JSBridge {
             console($0, type: .error)
         }
     }
+    
+    func clearExposureRisk(requestID: String, dataType: BridgeDataType) {
+        exposureNotificationBridge?.clearExposureRisk()
+            .done { [weak self] summary in
+                if let body = self?.encodeToJSON(summary) {
+                    self?.bridgeDataResponse(type: dataType, body: body, requestId: requestID)
+                }
+        }
+        .catch {
+            console($0, type: .error)
+        }
+    }
 }
 
 // MARK: - onBridgeData handling