From b3bcf924099686c45a47e3e8f148b273bb733d3e Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Wed, 24 Aug 2011 13:54:47 +0000
Subject: [PATCH] Keeps the "+" sign in dialed numbers (previously it was
 removed).

---
 .../addrbook/PhoneNumberI18nServiceImpl.java  | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/net/java/sip/communicator/plugin/addrbook/PhoneNumberI18nServiceImpl.java b/src/net/java/sip/communicator/plugin/addrbook/PhoneNumberI18nServiceImpl.java
index 45ff96d95..fd77da16e 100644
--- a/src/net/java/sip/communicator/plugin/addrbook/PhoneNumberI18nServiceImpl.java
+++ b/src/net/java/sip/communicator/plugin/addrbook/PhoneNumberI18nServiceImpl.java
@@ -37,10 +37,20 @@ public class PhoneNumberI18nServiceImpl
      */
     public String normalize(String phoneNumber)
     {
-        return
-            PhoneNumberUtil.normalizeDigitsOnly(
+        String plusSign = "+";
+        boolean plusSignFound = false;
+        if (phoneNumber.startsWith(plusSign))
+            plusSignFound = true;
+
+        String normalizedNumber
+            = PhoneNumberUtil.normalizeDigitsOnly(
                     PhoneNumberUtil.convertAlphaCharactersInNumber(
                             phoneNumber));
+
+        if (plusSignFound && !normalizedNumber.startsWith(plusSign))
+            return plusSign + normalizedNumber;
+
+        return normalizedNumber;
     }
 
     /**
@@ -89,24 +99,6 @@ public boolean phoneNumbersMatch(String aPhoneNumber, String bPhoneNumber)
         }
     }
 
-    public boolean isNumber(String possibleNumber)
-    {
-        PhoneNumberUtil numberUtil = PhoneNumberUtil.getInstance();
-        try
-        {
-            if (numberUtil.isPossibleNumber(possibleNumber, null))
-                return true;
-            else
-                return numberUtil.isPossibleNumber(
-                    numberUtil.parse(   possibleNumber,
-                                        Locale.getDefault().getCountry()));
-        }
-        catch (NumberParseException e)
-        {
-            return false;
-        }
-    }
-
     /**
      * Indicates if the given string is possibly a phone number.
      *