From 5d1aa3b0247fd1ede554b0c6af4155884d7c7fbb Mon Sep 17 00:00:00 2001
From: Trevor Payne <tpayne@pepperdash.com>
Date: Tue, 30 Jun 2020 11:01:46 -0500
Subject: [PATCH] Added a null check to determining SIP information

Resolves #290
---
 .../VideoCodec/CiscoCodec/CiscoSparkCodec.cs  | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
index 05bd7b01..ffcffbac 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
@@ -1658,7 +1658,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             {
                 get
                 {
-                    if (CodecStatus.Status.SIP.Registration.Count > 0)
+                    if (CodecStatus.Status.SIP != null && CodecStatus.Status.SIP.Registration.Count > 0)
                     {
                         var match = Regex.Match(CodecStatus.Status.SIP.Registration[0].URI.Value, @"(\d+)"); // extract numbers only
                         if (match.Success)
@@ -1678,17 +1678,26 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                         return string.Empty;
                     }
                 }
-            }
-            public override string SipUri
-            {
-                get
-                {
-                    if (CodecStatus.Status.SIP.AlternateURI.Primary.URI.Value != null)
-                        return CodecStatus.Status.SIP.AlternateURI.Primary.URI.Value;
-                    else
-                        return string.Empty;
-                }
-            }
+            }
+
+            public override string SipUri
+            {
+                get
+                {
+                    if (CodecStatus.Status.SIP != null && CodecStatus.Status.SIP.AlternateURI.Primary.URI.Value != null)
+                    {
+                        return CodecStatus.Status.SIP.AlternateURI.Primary.URI.Value;
+                    }
+                    else if (CodecStatus.Status.UserInterface != null &&
+                             CodecStatus.Status.UserInterface.ContactInfo.ContactMethod[0].Number.Value != null)
+                    {
+                        return CodecStatus.Status.UserInterface.ContactInfo.ContactMethod[0].Number.Value;
+                    }
+                    else
+                        return string.Empty;
+                }
+            }
+
             public override bool AutoAnswerEnabled
             {
                 get