Merge pull request #119 from ProteGO-Safe/release/4.6.0

Release/4.6.0

Author: qLb

.gitignore

@@ -44,7 +44,7 @@ safesafe/resources/Stage/GoogleService-Info.plist
 safesafe/resources/Dev/Config-dev.plist
 safesafe/resources/Stage/Config-stage.plist
 
-safesafe/Resources/pwa
+safesafe/Resources/pwa/
 
 ## Xcodegen
 *.xcodeproj

CHANGELOG.md

@@ -6,6 +6,15 @@ 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.6.0
+- Added restricted districts feature
+- Added subscribing for notification for restricted districts
+- Small fixes for JS contract
+- Added ability to test districts changes notification to debug panel
+- Translations update
+- Fix for manage max exposure notifications key amount per day
+- Remove debug logging from iOS < 13.5
+
 ## 4.5.0
 - Manage user diagnosis keys share rejection 
 - Prevents url requests caching

Podfile.lock

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

README.md

@@ -74,6 +74,15 @@ To launch it, type `sh rebuild.sh` in your console.
 
 ## ChangeLog
 
+**4.6.0**
+- Added restricted districts feature
+- Added subscribing for notification for restricted districts
+- Small fixes for JS contract
+- Added ability to test districts changes notification to debug panel
+- Translations update
+- Fix for manage max exposure notifications key amount per day
+- Remove debug logging from iOS < 13.5
+
 **4.5.0**
 - Manage user diagnosis keys share rejection 
 - Prevents url requests caching

project.yml

@@ -12,8 +12,8 @@ configs:
 
 settings:
   CODE_SIGN_STYLE: Manual
-  MARKETING_VERSION: "4.5.0"
-  CURRENT_PROJECT_VERSION: 650
+  MARKETING_VERSION: "4.6.0"
+  CURRENT_PROJECT_VERSION: 12
 
 schemes:
   safesafe Dev:

safesafe/App/AppCoordinator.swift

@@ -28,8 +28,7 @@ final class AppCoordinator: CoordinatorType {
 
     init?(appWindow: UIWindow?, dependencyContainer: DependencyContainer) {
         self.dependencyContainer = dependencyContainer
-        RealmLocalStorage.setupEncryption()
-        
+
         guard let window = appWindow else {
             Fatal.execute("Window doesn't exists")
         }
@@ -49,16 +48,15 @@ final class AppCoordinator: CoordinatorType {
         window.makeKeyAndVisible()
 
         updateReminder()
+        configureJSBridge(with: rootViewController)
 
-        if #available(iOS 13.5, *) {
-            configureJSBridge(with: rootViewController)
-        }
 
         if #available(iOS 13.5, *) {
             // Don't register bg task on iPad devices that are not supported by EN
             guard UIDevice.current.model == "iPhone" else { return }
             dependencyContainer.backgroundTaskService.scheduleExposureTask()
         }
+        
     }
 
     private func updateReminder() {
@@ -109,14 +107,16 @@ final class AppCoordinator: CoordinatorType {
         self.noInternetAlert = noInternetAlert
     }
 
-    @available(iOS 13.5, *)
     private func configureJSBridge(with viewController: UIViewController) {
-        let factory: ExposureNotificationJSBridgeFactory = dependencyContainer
+        if #available(iOS 13.5, *) {
+            let factory: ExposureNotificationJSBridgeFactory = dependencyContainer
+            dependencyContainer.jsBridge.registerExposureNotification(
+                with: factory.makeExposureNotificationJSBridge(with: viewController),
+                diagnosisKeysUploadService: dependencyContainer.diagnosisKeysUploadService
+            )
+        }
 
-        dependencyContainer.jsBridge.registerExposureNotification(
-            with: factory.makeExposureNotificationJSBridge(with: viewController),
-            diagnosisKeysUploadService: dependencyContainer.diagnosisKeysUploadService
-        )
+        dependencyContainer.jsBridge.register(districtService: dependencyContainer.districtsService)
     }
 
     @objc

safesafe/App/AppDelegate.swift

@@ -66,6 +66,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func applicationDidBecomeActive(_ application: UIApplication) {
         NotificationManager.shared.clearBadgeNumber()
+        NotificationManager.shared.registerAPNSIfNeeded()
     }
 
     func applicationDidEnterBackground(_ application: UIApplication) {

safesafe/App/SceneDelegate.swift

@@ -37,6 +37,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     @available(iOS 13.0, *)
     func sceneDidBecomeActive(_ scene: UIScene) {
         NotificationManager.shared.clearBadgeNumber()
+        NotificationManager.shared.registerAPNSIfNeeded()
         // Called when the scene has moved from an inactive state to an active state.
         // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive.
 

safesafe/Common/Helpers/Logger.swift

@@ -27,12 +27,12 @@ public final class Logger {
         }
     }
 
-    private static var dateFormatter: DateFormatter {
+    private static var dateFormatter: DateFormatter = {
         let formatter = DateFormatter()
         formatter.dateFormat = "yyyy-MM-dd_HH:mm:ss.SSS"
 
         return formatter
-    }
+    }()
 
     public static func log(_ value: Any?, type: LogType, file: String, function: String, line: Int, fullPath: Bool = false) {
         #if !LIVE
@@ -52,13 +52,11 @@ public final class Logger {
     }
 
     private static func fileLog(_ message: String) {
-        DispatchQueue.global(qos: .background).async {
-            let datePrefix = "{\(Self.dateFormatter.string(from: Date()))}"
-            let line = "\(datePrefix) \(message)"
-            if #available(iOS 13.0, *) {
+        if #available(iOS 13.5, *) {
+            DispatchQueue.global(qos: .background).async {
+                let datePrefix = "{\(Logger.dateFormatter.string(from: Date()))}"
+                let line = "\(datePrefix) \(message)"
                 File.logToFile(line)
-            } else {
-                // Not implemented on earlier versions yet
             }
         }
     }

safesafe/Common/Protocols/AlertManager/AlertAction.swift

@@ -11,6 +11,7 @@ enum AlertAction {
     case cancel
     case ok
     case retry
+    case settings
 
     var title: String {
         switch self {
@@ -20,6 +21,8 @@ enum AlertAction {
             return "ALERT_OK_BUTTON_TITLE".localized()
         case .retry:
             return "ALERT_RETRY_BUTTON_TITLE".localized()
+        case .settings:
+            return "ALERT_SETTINGS_BUTTON_TITLE".localized()
         }
     }
 }