From 51a505311fc91a49934ea25694d3ceae25012f62 Mon Sep 17 00:00:00 2001
From: Douglas Orend <43975081+douglasorend@users.noreply.github.com>
Date: Wed, 15 May 2019 17:35:50 -0500
Subject: [PATCH 1/2] Addon changes for Kodi

Changes were suggested by https://wmbuck.net/blog/?p=625 in order to get this addon to work with Kodi correctly.
---
 .../FritzboxClient.py                                 |  0
 .../NcidClient.py                                     |  0
 .../__init__.py                                       |  0
 resources/lib/CommonUtils.py => CommonUtils.py        |  0
 service.py                                            | 11 ++++++-----
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename {resources/lib/CallListenerClients => CallListenerClients}/FritzboxClient.py (100%)
 rename {resources/lib/CallListenerClients => CallListenerClients}/NcidClient.py (100%)
 rename {resources/lib/CallListenerClients => CallListenerClients}/__init__.py (100%)
 rename resources/lib/CommonUtils.py => CommonUtils.py (100%)

diff --git a/resources/lib/CallListenerClients/FritzboxClient.py b/CallListenerClients/FritzboxClient.py
similarity index 100%
rename from resources/lib/CallListenerClients/FritzboxClient.py
rename to CallListenerClients/FritzboxClient.py
diff --git a/resources/lib/CallListenerClients/NcidClient.py b/CallListenerClients/NcidClient.py
similarity index 100%
rename from resources/lib/CallListenerClients/NcidClient.py
rename to CallListenerClients/NcidClient.py
diff --git a/resources/lib/CallListenerClients/__init__.py b/CallListenerClients/__init__.py
similarity index 100%
rename from resources/lib/CallListenerClients/__init__.py
rename to CallListenerClients/__init__.py
diff --git a/resources/lib/CommonUtils.py b/CommonUtils.py
similarity index 100%
rename from resources/lib/CommonUtils.py
rename to CommonUtils.py
diff --git a/service.py b/service.py
index 9dbac24..a7213c7 100644
--- a/service.py
+++ b/service.py
@@ -45,11 +45,12 @@ def handleIncomingCall(caller):
     if caller.caller == "Unknown":
         caller.caller = xbmcaddon.getLocalizedString(30602)
 
-    xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % (xbmcAddon.getLocalizedString(30601) % caller.caller,
-                                                            caller.number,
-                                                            int(notificationTimeout),
-                                                            notificationIcon
-                                                            ))
+    callerstring = xbmcAddon.getLocalizedString(30601) % caller.caller 
+    xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" % ('"'+callerstring+'"',
+        caller.number,
+        int(notificationTimeout),
+        notificationIcon
+    ))
 
     activePlayers = json.loads(xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method": "Player.GetActivePlayers", "id": 1}'))
 

From ac108a93719c1de2fbfd9452f0b88fb733cd0f54 Mon Sep 17 00:00:00 2001
From: Douglas Orend <43975081+douglasorend@users.noreply.github.com>
Date: Sun, 14 Jul 2019 19:38:10 -0500
Subject: [PATCH 2/2] Update service.py

---
 service.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/service.py b/service.py
index a7213c7..2ef0910 100644
--- a/service.py
+++ b/service.py
@@ -7,7 +7,6 @@
 
 from CallListenerClients.FritzboxClient import FritzboxClient
 from CallListenerClients.NcidClient import NcidClient
-from Yac.YacServer import YacServer
 
 runningOutsideXbmc = False
 try: