Merge pull request #363 from DP-3T/release/1.2.1

Release 1.2.1

.github/workflows/build.yml

@@ -13,8 +13,8 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Switch to Xcode 11.7
-      run: sudo xcode-select --switch /Applications/Xcode_11.7.app
+    - name: Switch to Xcode 12.2
+      run: sudo xcode-select --switch /Applications/Xcode_12.2.app
 
     # Compile project and run tests
     - name: Compile and run tests
@@ -26,8 +26,8 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Switch to Xcode 11.7
-      run: sudo xcode-select --switch /Applications/Xcode_11.7.app
+    - name: Switch to Xcode 12.2
+      run: sudo xcode-select --switch /Applications/Xcode_12.2.app
 
     # Compile "Release-Prod" for iOS Simulator (no signing)
     - name: Compile and run tests
@@ -39,8 +39,8 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Switch to Xcode 11.7
-      run: sudo xcode-select --switch /Applications/Xcode_11.7.app
+    - name: Switch to Xcode 12.2
+      run: sudo xcode-select --switch /Applications/Xcode_12.2.app
 
     # Compile "Release-Dev-Calibration" for iOS Simulator (no signing)
     - name: Compile and run tests

.github/workflows/distribute.yml

@@ -14,8 +14,8 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Switch to Xcode 11.7
-      run: sudo xcode-select --switch /Applications/Xcode_11.7.app
+    - name: Switch to Xcode 12.2
+      run: sudo xcode-select --switch /Applications/Xcode_12.2.app
 
     - name: Installs librsvg
       run: brew install librsvg
@@ -67,8 +67,8 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Switch to Xcode 11.7
-      run: sudo xcode-select --switch /Applications/Xcode_11.7.app
+    - name: Switch to Xcode 12.2
+      run: sudo xcode-select --switch /Applications/Xcode_12.2.app
 
     - name: Installs librsvg
       run: brew install librsvg
@@ -120,8 +120,8 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Switch to Xcode 11.7
-      run: sudo xcode-select --switch /Applications/Xcode_11.7.app
+    - name: Switch to Xcode 12.2
+      run: sudo xcode-select --switch /Applications/Xcode_12.2.app
 
     - name: Installs librsvg
       run: brew install librsvg
@@ -173,8 +173,8 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Switch to Xcode 11.7
-      run: sudo xcode-select --switch /Applications/Xcode_11.7.app
+    - name: Switch to Xcode 12.2
+      run: sudo xcode-select --switch /Applications/Xcode_12.2.app
 
     - name: Sets up bundler
       run: bundle update --bundler
@@ -221,8 +221,8 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Switch to Xcode 11.7
-      run: sudo xcode-select --switch /Applications/Xcode_11.7.app
+    - name: Switch to Xcode 12.2
+      run: sudo xcode-select --switch /Applications/Xcode_12.2.app
 
     - name: Installs librsvg
       run: brew install librsvg

DP3TApp.xcodeproj/project.pbxproj

@@ -3215,7 +3215,7 @@
 			repositoryURL = "https://github.com/DP-3T/dp3t-sdk-ios.git";
 			requirement = {
 				kind = revision;
-				revision = 522938daf30dfc93b47aba4d3956a01b5561905e;
+				revision = 2dd6f63092599632d31eaaa35664664243e0b809;
 			};
 		};
 		F870A5B52492C6D500C34FFA /* XCRemoteSwiftPackageReference "SQLite" */ = {

DP3TApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -33,7 +33,7 @@
         "repositoryURL": "https://github.com/DP-3T/dp3t-sdk-ios.git",
         "state": {
           "branch": null,
-          "revision": "522938daf30dfc93b47aba4d3956a01b5561905e",
+          "revision": "2dd6f63092599632d31eaaa35664664243e0b809",
           "version": null
         }
       },

DP3TApp/Logic/Config/ConfigManager.swift

@@ -127,7 +127,7 @@ class ConfigManager: NSObject {
         dataTask = session.dataTask(with: request, completionHandler: { data, response, error in
 
             guard let httpResponse = response as? HTTPURLResponse,
-                let data = data else {
+                  let data = data else {
                 Logger.log("Failed to load config, error: \(error?.localizedDescription ?? "?")")
                 DispatchQueue.main.async { completion(nil) }
                 return

DP3TApp/Logic/Helpers/Bundle+BuildInfo.swift

@@ -22,8 +22,8 @@ extension Bundle {
     static var buildDate: Date? {
         let bundleName = Bundle.main.infoDictionary!["CFBundleName"] as? String ?? "Info.plist"
         if let infoPath = Bundle.main.path(forResource: bundleName, ofType: nil),
-            let infoAttr = try? FileManager.default.attributesOfItem(atPath: infoPath),
-            let infoDate = infoAttr[FileAttributeKey.creationDate] as? Date
+           let infoAttr = try? FileManager.default.attributesOfItem(atPath: infoPath),
+           let infoDate = infoAttr[FileAttributeKey.creationDate] as? Date
         { return infoDate }
         return nil
     }

DP3TApp/Logic/Helpers/UIImage+localizedImage.swift

@@ -16,7 +16,7 @@ extension UIImage {
 
         for preferredLanguage in preferredLanguages {
             if let code = preferredLanguage.components(separatedBy: "-").first,
-                let image = UIImage(named: prefix + code) {
+               let image = UIImage(named: prefix + code) {
                 return image
             }
         }

DP3TApp/Logic/Networking/Base/URLSession+pinning.swift

@@ -134,7 +134,7 @@ class CertificateEvaluator: NSObject, URLSessionDelegate {
         let host = challenge.protectionSpace.host
 
         guard challenge.protectionSpace.authenticationMethod == NSURLAuthenticationMethodServerTrust,
-            let trust = challenge.protectionSpace.serverTrust else {
+              let trust = challenge.protectionSpace.serverTrust else {
             return (.cancelAuthenticationChallenge, nil, nil)
         }
 
@@ -156,8 +156,8 @@ class CertificateEvaluator: NSObject, URLSessionDelegate {
 extension Bundle {
     func getCertificate(with name: String, fileExtension: String = "der") -> SecCertificate? {
         if let certificateURL = url(forResource: name, withExtension: fileExtension),
-            let certificateData = try? Data(contentsOf: certificateURL),
-            let certificate = SecCertificateCreateWithData(nil, certificateData as CFData) {
+           let certificateData = try? Data(contentsOf: certificateURL),
+           let certificate = SecCertificateCreateWithData(nil, certificateData as CFData) {
             return certificate
         }
         return nil

DP3TApp/Logic/Statistics/StatisticsLoader.swift

@@ -28,7 +28,7 @@ class StatisticsLoader {
             }
 
             guard let httpResponse = response as? HTTPURLResponse,
-                let data = data else {
+                  let data = data else {
                 Logger.log("Failed to load statistics, error: \(error?.localizedDescription ?? "?")")
                 DispatchQueue.main.async { completionHandler(.failure(.networkError)) }
                 return

DP3TApp/Logic/Tracing/DatabaseSyncer.swift

@@ -25,7 +25,7 @@ class DatabaseSyncer {
 
     func syncDatabaseIfNeeded(completionHandler: ((UIBackgroundFetchResult) -> Void)? = nil) {
         guard !databaseIsSyncing,
-            UserStorage.shared.hasCompletedOnboarding else {
+              UserStorage.shared.hasCompletedOnboarding else {
             completionHandler?(.noData)
             return
         }

DP3TApp/Logic/Tracing/Reporting/FakePublishManager.swift

@@ -97,7 +97,7 @@ private class FakePublishOperation: Operation {
         var numberOfFakeRequestsDone = 0
 
         while isCancelled == false,
-            now >= manager.nextScheduledFakeRequestDate {
+              now >= manager.nextScheduledFakeRequestDate {
             let isFirstReport = numberOfFakeRequestsDone == 0
 
             // only do request if it was planned to do in the last 48h

DP3TApp/Logic/Tracing/TracingLocalPush.swift

@@ -84,6 +84,8 @@ class TracingLocalPush: NSObject, LocalPushProtocol {
                     scheduleNotification(identifier: exposure.identifier)
                     // and update the latestExpsoureDate
                     lastestExposureDate = exposure.date
+                    // and reset the didOpenLeitfaden flag
+                    UserStorage.shared.didOpenLeitfaden = false
 
                     break
                 }
@@ -256,8 +258,8 @@ class TracingLocalPush: NSObject, LocalPushProtocol {
         let calendar = Calendar.current
         let components = calendar.dateComponents([.hour], from: now)
         guard let hour = components.hour,
-            hour > 7,
-            hour < 23 else {
+              hour > 7,
+              hour < 23 else {
             return
         }
 

DP3TApp/Logic/Tracing/UIState/UIStateLogic.swift

@@ -141,8 +141,8 @@ class UIStateLogic {
         }
 
         if let first = manager.firstSyncErrorTime,
-            let last = manager.lastSyncErrorTime,
-            last.timeIntervalSince(first) > manager.syncProblemInterval {
+           let last = manager.lastSyncErrorTime,
+           last.timeIntervalSince(first) > manager.syncProblemInterval {
             newState.homescreen.reports.syncProblemNetworkingError = true
             if let codedError = UIStateManager.shared.syncError {
                 newState.homescreen.reports.errorTitle = codedError.errorTitle
@@ -159,7 +159,7 @@ class UIStateLogic {
 
     private func setInfoBoxState(_ newState: inout UIStateModel) {
         if let infoBox = ConfigManager.currentConfig?.infoBox?.value,
-            infoBox.infoId == nil || !NSInfoBoxVisibilityManager.shared.dismissedInfoBoxIds.contains(infoBox.infoId!) {
+           infoBox.infoId == nil || !NSInfoBoxVisibilityManager.shared.dismissedInfoBoxIds.contains(infoBox.infoId!) {
             newState.homescreen.infoBox = UIStateModel.Homescreen.InfoBox(title: infoBox.title,
                                                                           text: infoBox.msg,
                                                                           link: infoBox.urlTitle,
@@ -190,15 +190,11 @@ class UIStateLogic {
 
     private func setLastReportState(_ newState: inout UIStateModel) {
         if let report = newState.reportsDetail.reports.first {
-            newState.shouldStartAtReportsDetail = UserStorage.shared.lastPhoneCall(for: report.identifier) == nil
+            newState.shouldStartAtReportsDetail = !UserStorage.shared.didOpenLeitfaden
             newState.homescreen.reports.lastReport = report.timestamp
             newState.reportsDetail.showReportWithAnimation = !UserStorage.shared.hasSeenMessage(for: report.identifier)
 
-            if UserStorage.shared.lastPhoneCall(for: report.identifier) != nil {
-                newState.reportsDetail.phoneCallState = .calledAfterLastExposure
-            } else {
-                newState.reportsDetail.phoneCallState = .notCalled
-            }
+            newState.reportsDetail.didOpenLeitfaden = UserStorage.shared.didOpenLeitfaden
         }
     }
 
@@ -227,10 +223,13 @@ class UIStateLogic {
             }
         }
 
-        static let randIdentifier1 = UUID()
-        static let randIdentifier2 = UUID()
-        static let randDate1 = Date(timeIntervalSinceNow: -10000)
-        static let randDate2 = Date(timeIntervalSinceNow: -100_000)
+        static var identifiers: [UUID] = {
+            var identifiers = [UUID]()
+            for _ in 0 ... 20 {
+                identifiers.append(.init())
+            }
+            return identifiers
+        }()
 
         private func setDebugReports(_ newState: inout UIStateModel) {
             // in case the infection state is overwritten, we need to
@@ -253,7 +252,7 @@ class UIStateLogic {
                 newState.reportsDetail.reports = []
 
                 for i in 0 ..< count {
-                    newState.reportsDetail.reports.append(UIStateModel.ReportsDetail.NSReportModel(identifier: UUID(), timestamp: Date(timeIntervalSinceNow: Double(i * 60 * 60 * 24 * -1))))
+                    newState.reportsDetail.reports.append(UIStateModel.ReportsDetail.NSReportModel(identifier: Self.identifiers[i], timestamp: Date(timeIntervalSinceNow: Double(i * 60 * 60 * 24 * -1))))
                 }
 
                 newState.shouldStartAtReportsDetail = true

DP3TApp/Logic/Tracing/UIState/UIStateModel.swift

@@ -77,7 +77,7 @@ struct UIStateModel: Equatable {
     struct ReportsDetail: Equatable {
         var report: ReportState = .noReport
         var reports: [NSReportModel] = []
-        var phoneCallState: PhoneCallState = .notCalled
+        var didOpenLeitfaden: Bool = false
         var showReportWithAnimation: Bool = false
 
         struct NSReportModel: Equatable {

DP3TApp/Logic/User/UserStorage.swift

@@ -20,47 +20,22 @@ class UserStorage {
         }
     }
 
-    func registerPhoneCall(identifier: UUID) {
-        var lastPhoneCalls = self.lastPhoneCalls
-        // we only want the last
-        lastPhoneCalls.removeAll()
-        lastPhoneCalls["\(identifier.uuidString)"] = Date()
-
-        self.lastPhoneCalls = lastPhoneCalls
-
-        UIStateManager.shared.userCalledInfoLine()
-    }
-
     func registerSeenMessages(identifier: UUID) {
         seenMessages.append("\(identifier.uuidString)")
     }
 
-    var lastPhoneCallDate: Date? {
-        let allDates = lastPhoneCalls.values
-
-        return allDates.sorted().last
-    }
-
-    func lastPhoneCall(for identifier: UUID) -> Date? {
-        if lastPhoneCalls.keys.contains("\(identifier.uuidString)") {
-            return lastPhoneCalls["\(identifier)"]
-        }
-
-        return nil
-    }
-
     func hasSeenMessage(for identifier: UUID) -> Bool {
         return seenMessages.contains("\(identifier.uuidString)")
     }
 
-    @KeychainPersisted(key: "lastPhoneCalls", defaultValue: [:])
-    private var lastPhoneCalls: [String: Date]
+    @KeychainPersisted(key: "didOpenLeitfaden", defaultValue: false)
+    var didOpenLeitfaden: Bool
 
     @KeychainPersisted(key: "seenMessages", defaultValue: [])
     private var seenMessages: [String]
 }
 
-class KeychainMigration {
+enum KeychainMigration {
     @KeychainPersisted(key: "didMigrateToKeychain", defaultValue: false)
     static var didMigrateToKeychain: Bool
 

DP3TApp/Resources/Assets.xcassets/Encounters/ic-infoline.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "ic-infoline.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DP3TApp/Screens/Debugscreen/NSDebugDatabaseUploadHelper.swift

@@ -29,7 +29,7 @@ class NSDebugDatabaseUploadHelper {
         let fileUrl = documentsDirectory.appendingPathComponent("DP3T_tracing_db").appendingPathExtension("sqlite")
 
         guard let databaseData = try? Data(contentsOf: fileUrl),
-            let url = URL(string: "https://dp3tdemoupload.azurewebsites.net/upload") else {
+              let url = URL(string: "https://dp3tdemoupload.azurewebsites.net/upload") else {
             completion?(.failure(UploadError(message: "Couldn't read file")))
             return
         }

DP3TApp/Screens/Debugscreen/NSDebugScreenMockView.swift

@@ -82,6 +82,8 @@
             private func select(_ checkBox: NSCheckBoxView) {
                 let stateManager = UIStateManager.shared
 
+                UserStorage.shared.didOpenLeitfaden = false
+
                 if let index = checkboxes.firstIndex(of: checkBox) {
                     switch index {
                     case 1:

DP3TApp/Screens/Homescreen/Homescreen/NSHomescreenViewController.swift

@@ -248,7 +248,7 @@ class NSHomescreenViewController: NSTitleViewScrollViewController {
         infoBoxView.uiState = state.homescreen.infoBox
 
         if let infoId = state.homescreen.infoBox?.infoId,
-            state.homescreen.infoBox?.isDismissible == true {
+           state.homescreen.infoBox?.isDismissible == true {
             infoBoxView.closeButtonTouched = { [weak infoBoxView] in
                 NSInfoBoxVisibilityManager.shared.dismissedInfoBoxIds.append(infoId)
                 UIView.animate(withDuration: 0.3) {

DP3TApp/Screens/Homescreen/Homescreen/Reports/NSReportsModuleView.swift

@@ -56,7 +56,7 @@ class NSReportsModuleView: NSModuleBaseView {
 
     private let noPushView = NSTracingErrorView(model: NSTracingErrorView.NSTracingErrorViewModel(icon: UIImage(named: "ic-push-disabled")!, title: "push_deactivated_title".ub_localized, text: "push_deactivated_text".ub_localized, buttonTitle: "push_open_settings_button".ub_localized, action: { _ in
         guard let settingsUrl = URL(string: UIApplication.openSettingsURLString),
-            UIApplication.shared.canOpenURL(settingsUrl) else { return }
+              UIApplication.shared.canOpenURL(settingsUrl) else { return }
 
         UIApplication.shared.open(settingsUrl)
     }))
@@ -140,7 +140,7 @@ class NSReportsModuleView: NSModuleBaseView {
             }
         case .exposed:
             views.append(exposedView)
-            views.append(NSMoreInfoView(line1: "exposed_info_contact_hotline".ub_localized, line2: "exposed_info_contact_hotline_name".ub_localized))
+            views.append(NSMoreInfoView(line1: "exposed_info_answer_questions_in_leitfaden".ub_localized, line2: "exposed_info_swisscovid_leitfaden".ub_localized))
             if let lastReport = reportsState.lastReport {
                 let container = UIView()
                 let dateLabel = NSLabel(.date, textColor: .ns_blue)