From bf33513300ce8fb188e1a8411b59469b935461f0 Mon Sep 17 00:00:00 2001
From: Danmei Chen <danmei.chen@belledonne-communications.com>
Date: Fri, 15 Jan 2021 18:27:54 +0100
Subject: [PATCH] fix not found display name of message

---
 msgNotificationService/NotificationService.swift | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/msgNotificationService/NotificationService.swift b/msgNotificationService/NotificationService.swift
index 0bcf505a3..6650360b2 100644
--- a/msgNotificationService/NotificationService.swift
+++ b/msgNotificationService/NotificationService.swift
@@ -220,13 +220,17 @@ class NotificationService: UNNotificationServiceExtension {
 				return nil
 			}
 
-			if let displayName = addressBook?[sipAddr] as? String {
-				NotificationService.log.message(message: "display name for \(sipAddr): \(displayName)")
-				return displayName
-			} else {
-				NotificationService.log.message(message: "display name for \(sipAddr) not found in userDefaults")
-				return nil
+			if let simpleAddr = lc?.interpretUrl(url: sipAddr) {
+				simpleAddr.clean()
+				let nomalSipaddr = simpleAddr.asString()
+				if let displayName = addressBook?[nomalSipaddr] as? String {
+					NotificationService.log.message(message: "display name for \(sipAddr): \(displayName)")
+					return displayName
+				}
 			}
+
+			NotificationService.log.message(message: "display name for \(sipAddr) not found in userDefaults")
+			return nil
 		}
 		return nil
 	}