Merge pull request #138 from ProteGO-Safe/release/4.13.0

Release/4.13.0

Author: qLb

CHANGELOG.md

@@ -6,6 +6,11 @@ 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.13.0
+- Updated UI
+- Added handling deeplinks
+- Added handling redirect to sms
+
 ## 4.12.0
 - Disabled DeviceCheck for lab test 
 - Updated UI

Podfile

@@ -19,7 +19,7 @@ def pods_definition
   pod 'RealmSwift', '~> 5.0.0'
   pod 'SwiftProtobuf', '~> 1.0'
 
-  pod 'DBDebugToolkit', :configurations => ['Dev', 'DevDist', 'Stage', 'StageDebug', 'StageScreencast', 'LiveDebug', 'LiveAdhoc']
+  pod 'DBDebugToolkit', :configurations => ['Stage', 'StageDebug', 'LiveDebug']
 
 end
 

Podfile.lock

@@ -183,6 +183,6 @@ SPEC CHECKSUMS:
   TrustKit: 073855e3adecd317417bda4ac9e9ac54a2e3b9f2
   ZIPFoundation: b1f0de4eed33e74a676f76e12559ab6b75990197
 
-PODFILE CHECKSUM: 779fe596c92aaa178911e4fb4980414eb2b9ab2e
+PODFILE CHECKSUM: a0ed6453db652247e6c6ceef9c7e8c6f658f3f5e
 
 COCOAPODS: 1.10.1

README.md

@@ -73,6 +73,11 @@ For convenience, there's a `rebuild.sh` script which performs actions mentioned
 To launch it, type `sh rebuild.sh` in your console.
 
 ## ChangeLog
+**4.13.0**
+- Updated UI
+- Added handling deeplinks
+- Added handling redirect to sms
+
 **4.12.0**
 - Disabled DeviceCheck for lab test 
 - Updated UI

project.yml

@@ -1,22 +1,13 @@
 name: safesafe
 
 configs:
-  Dev: debug
-  DevDist: release
   StageDebug: debug
-  StageScreencast: release
   Stage: release
   LiveDebug: debug
   Live: release
-  LiveAdhoc: release #That's a build with Live PWA URL but with debug console
+  StageAdhoc: release
 
 schemes:
-  safesafe Dev:
-    build:
-      targets: 
-        safesafe: all
-    run:
-      config: Dev
 
   safesafe Stage:
     build:
@@ -42,7 +33,7 @@ targets:
   PushMutableContent:
     settings:
       CODE_SIGN_STYLE: Manual
-      MARKETING_VERSION: "4.12.0"
+      MARKETING_VERSION: "4.13.0"
       CURRENT_PROJECT_VERSION: 746
       TARGETED_DEVICE_FAMILY: 1,2
     type: app-extension
@@ -51,6 +42,7 @@ targets:
     configFiles:
       Stage: safesafe/Resources/Extensions/apns-stage-mutablecontent.xcconfig
       StageDebug: safesafe/Resources/Extensions/apns-stage-mutablecontent-dev.xcconfig
+      StageAdhoc: safesafe/Resources/Extensions/apns-stage-adhoc-mutablecontent.xcconfig
       Live: safesafe/Resources/Extensions/apns-mutablecontent.xcconfig
       LiveDebug: safesafe/Resources/Extensions/apns-mutablecontent-dev.xcconfig
     sources:
@@ -77,32 +69,26 @@ targets:
     deploymentTarget: "12.1"
     settings:
         CODE_SIGN_STYLE: Manual
-        MARKETING_VERSION: "4.12.0"
+        MARKETING_VERSION: "4.13.0"
         CURRENT_PROJECT_VERSION: 746
         TARGETED_DEVICE_FAMILY: 1
         SWIFT_OBJC_BRIDGING_HEADER: $(PROJECT_DIR)/safesafe/App/safesafe-Bridging-Header.h
     configFiles:
-      Dev: safesafe/Resources/Dev/dev.xcconfig
-      DevDist: safesafe/Resources/Dev/devDist.xcconfig
-      StageScreencast: safesafe/Resources/Stage/stageScreencast.xcconfig
       StageDebug: safesafe/Resources/Stage/stageDebug.xcconfig
       Stage: safesafe/Resources/Stage/stage.xcconfig
+      StageAdhoc: safesafe/Resources/Stage/stageAdhoc.xcconfig
       LiveDebug: safesafe/Resources/Live/liveDebug.xcconfig
-      LiveAdhoc: safesafe/Resources/Live/liveAdhoc.xcconfig
       Live: safesafe/Resources/Live/live.xcconfig
     sources: 
       - path: safesafe
         name: "safesafe"
         excludes:
           - "Resources/translations"
           - "Resources/pwa"
-          - "Resources/Dev/Config-dev.plist"
           - "Resources/Stage/Config-stage.plist"
           - "Resources/Live/Config-live.plist"
-          - "Resources/Dev/GoogleService-Info-Dev.plist"
           - "Resources/Stage/GoogleService-Info-Stage.plist"
           - "Resources/Live/GoogleService-Info-Live.plist"
-          - "Info-dev.plist"
           - "Info-stage.plist"
           - "Info-live.plist"
       - path: safesafe/Resources/pwa

safesafe/Common/Helpers/Deep linking/DeepLinkingWorker.swift

@@ -28,7 +28,7 @@ protocol DeepLinkingWorkerType {
     func navigate(with url: URL)
 }
 
-protocol DeepLinkingDelegate: class {
+protocol DeepLinkingDelegate: AnyObject {
     func runRoute(routeString: String)
 }
 
@@ -67,7 +67,15 @@ final class DeepLinkingWorker: DeepLinkingWorkerType {
 
         let paths = components.path.split(separator: "/")
 
-        guard let path = paths.first, paths.count == 1 else { return }
+        let path: String
+        
+        if paths.count == 1 {
+            path = String(paths[0])
+        } else if(paths.contains("uploadHistoricalData")) {
+            path = "uploadHistoricalData"
+        } else {
+            return
+        }
 
         var routeData: [String: Any] = ["name": path]
 

safesafe/DependencyContainer/DependencyContainer.swift

@@ -90,7 +90,8 @@ final class DependencyContainer {
     lazy var notificationHistoryWorker: NotificationHistoryWorkerType = NotificationHistoryWorker(storage: realmLocalStorage)
     lazy var exposureHistoricalService: ExposureServiceHistoricalDataProtocol = ExposureServiceHistoricalData(storageService: realmLocalStorage)
     lazy var jailbreakService: JailbreakServiceProtocol = JailbreakService()
-    lazy var jsBridge = JSBridge(with: serviceStatusManager)
+    lazy var openerService: OpenerServiceType = OpenerService()
+    lazy var jsBridge = JSBridge(serviceStatusManager: serviceStatusManager, openerService: openerService)
     lazy var realmLocalStorage = RealmLocalStorage()
 
     lazy var remoteConfigSetting: RemoteConfigSettings = {

safesafe/Info-dev.plist

@@ -16,6 +16,24 @@
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>ProteGO Safe</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>ENAPIVersion</key>
+	<string>1</string>
+	<key>ENDeveloperRegion</key>
+	<string>PL</string>
+	<key>FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED</key>
+	<true/>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
+	<key>LSApplicationCategoryType</key>
+	<string></string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
 	<key>TSKConfiguration</key>
 	<dict>
 		<key>TSKPinnedDomains</key>
@@ -39,18 +57,6 @@
 			</dict>
 		</dict>
 	</dict>
-	<key>CFBundlePackageType</key>
-	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
-	<key>FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED</key>
-	<true/>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
@@ -75,8 +81,6 @@
 	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
-	<key>LSApplicationCategoryType</key>
-	<string></string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
@@ -97,9 +101,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
-	<key>ENDeveloperRegion</key>
-	<string>PL</string>
-	<key>ENAPIVersion</key>
-	<string>1</string>
 </dict>
 </plist>