Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Prevent to open manager console when url is present but empty

Michael Rademakerd42ea138c3fa
diff --git a/console/iOS/ORLib/ORLib/ORAppDelegate.swift b/console/iOS/ORLib/ORLib/ORAppDelegate.swift
index 236765c09..91d02b29f 100644
--- a/console/iOS/ORLib/ORLib/ORAppDelegate.swift
+++ b/console/iOS/ORLib/ORLib/ORAppDelegate.swift
@@ -258,11 +258,7 @@ extension ORAppDelegate : UNUserNotificationCenterDelegate {
switch response.actionIdentifier {
case UNNotificationDefaultActionIdentifier:
- if let notiId = notificationId, let conId = consoleId {
- ORNotificationResource.sharedInstance.notificationDelivered(notificationId: notiId, targetId: conId)
- }
-
- if let urlToOpen = userInfo[ActionType.appUrl] as? String {
+ if let urlToOpen = userInfo[ActionType.appUrl] as? String, !urlToOpen.isEmpty {
let urlRequest: URL?
if urlToOpen.hasPrefix("http") || urlToOpen.hasPrefix("https") {
urlRequest = URL(string:urlToOpen)
@@ -282,7 +278,7 @@ extension ORAppDelegate : UNUserNotificationCenterDelegate {
case UNNotificationDismissActionIdentifier,
"declineAction":
if let notiId = notificationId, let conId = consoleId {
- ORNotificationResource.sharedInstance.notificationAcknowledged(notificationId: notiId, targetId: conId, acknowledgement: "")
+ ORNotificationResource.sharedInstance.notificationAcknowledged(notificationId: notiId, targetId: conId, acknowledgement: response.actionIdentifier)
}
default :
if let notiId = notificationId, let conId = consoleId {