Merge pull request #4443 from corona-warn-app/fix/12663-app-in-dead-m…

…ode-after-tap-on-notification-on-lock-screen Fix/12663 app in dead mode after tap on notification on lock screen
corona-warn-app · Apr 8, 2022 · 9353af8 · 9353af8
2 parents 989dd1f + 62c701d
commit 9353af8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/xcode/ENA/ENA/Source/AppDelegate & Globals/NotificationManager.swift b/src/xcode/ENA/ENA/Source/AppDelegate & Globals/NotificationManager.swift
@@ -46,9 +46,9 @@ final class NotificationManager: NSObject, UNUserNotificationCenterDelegate {
 
 	func userNotificationCenter(_: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
 		switch response.notification.request.identifier {
-
 		case ActionableNotificationIdentifier.riskDetection.identifier,
-			 ActionableNotificationIdentifier.deviceTimeCheck.identifier:
+			 ActionableNotificationIdentifier.deviceTimeCheck.identifier,
+			 DeadmanNotificationManager.deadmanNotificationIdentifier:
 			showHome()
 
 		case ActionableNotificationIdentifier.pcrWarnOthersReminder1.identifier,

diff --git a/src/xcode/ENA/ENA/Source/Scenes/Home/HomeCoordinator.swift b/src/xcode/ENA/ENA/Source/Scenes/Home/HomeCoordinator.swift
@@ -66,8 +66,15 @@ class HomeCoordinator: RequiresAppDependencies {
 				 .healthCertificateFromNotification,
 				 .healthCertifiedPersonFromNotification,
 				 .none:
+				/*
+				 .healthCertifiedPersonFromNotification .checkIn and
+				 .healthCertificateFromNotification routings are checked in the
+				 showHome function in the RootCoordinator inside the defer block.
+				 So basically here we show home THEN excute the routings in the defer
+				*/
 				rootViewController.dismiss(animated: false)
 				rootViewController.popToRootViewController(animated: false)
+				rootViewController.tabBarController?.selectedIndex = 0
 				homeController?.scrollToTop(animated: false)
 				return
 			}