From 9d4835dca15ea471853165ccccf782b9d11f35db Mon Sep 17 00:00:00 2001
From: Ingo Bauersachs <ingo@jitsi.org>
Date: Tue, 17 May 2016 23:39:35 +0200
Subject: [PATCH] Fix an NPE when adding short SIP contacts

---
 .../impl/protocol/sip/ContactSipImpl.java             | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ContactSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ContactSipImpl.java
index 3bd574e4e..7f30e4fd0 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ContactSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ContactSipImpl.java
@@ -578,10 +578,15 @@ static String stripAddress(String address)
      */
     public static String stripScheme(String from)
     {
-        int i = from.substring(0, 5).indexOf(':');
+        if (from.startsWith("sip:"))
+        {
+            return from.substring(4);
+        }
+        else if (from.startsWith("sips:"))
+        {
+            return from.substring(5);
+        }
 
-        if(from.startsWith("sip") && i > 0)
-            return from.substring(i + 1);
         return from;
     }