Changeset 565

Timestamp:

11/09/09 11:06:11 (4 years ago)

Author:

jonmaycock

Message:

Change to publishers list lookup

Files:

• apps/blackberry/branches/1.5/blackberry/src/org/telnic/blackberry/TelOptionsScreen.java (modified) (4 diffs)

apps/blackberry/branches/1.5/blackberry/src/org/telnic/blackberry/TelOptionsScreen.java

@@ -21 +21 @@
 
 import java.util.Date;
-import java.util.Hashtable;
 
 import javax.microedition.pim.Contact;
@@ -46 +45 @@
 import org.telnic.blackberry.util.xml.BlackberryUICallback;
 import org.telnic.blackberry.util.xml.PublishersList;
+import org.telnic.blackberry.util.xml.PublishersListUtils;
 import org.telnic.blackberry.util.xml.TelnicWebServices;
 import org.telnic.blackberry.util.xml.TelnicWebServicesReference;
@@ -53 +53 @@
  *
  * @author Jonathan Maycock
- * @version $Id: TelOptionsScreen.java,v 1.18 2008/10/13 11:32:59 jm2 Exp $
+ * @version $Id: TelOptionsScreen.java,v 1.19 2009/11/06 11:52:34 jm2 Exp $
  */
 public class TelOptionsScreen extends MainScreen implements BlackberryUICallback, Cancellable
@@ -200 +200 @@
             if (PublishersList.getPublishersList() != null)
             {
-                final Hashtable list = PublishersList.getPublishersList();
-                if (!telnameVal.toLowerCase().endsWith( ".tel" ))
-                {
-                    if (list.containsKey( telnameVal.toLowerCase() ))
-                    {
-                        contactIsFriend = true;
-                    }
-                    telnameVal = telnameVal + ".";
-                    if (list.containsKey( telnameVal.toLowerCase() ))
-                    {
-                        contactIsFriend = true;
-                    }
-                }
-                if (!telnameVal.toLowerCase().endsWith( ".tel." ))
-                {
-                    if (list.containsKey( telnameVal.toLowerCase() ))
-                    {
-                        contactIsFriend = true;
-                    }
-                    telnameVal = telnameVal.substring( 0, telnameVal.length() - 2 );
-                    if (list.containsKey( telnameVal.toLowerCase() ))
-                    {
-                        contactIsFriend = true;
-                    }
-                }
-
-                if (contactIsFriend)
-                {
-                    subdomainTelname = (String) list.get( telnameVal.toLowerCase() );
-
-                    if (!subdomainTelname.endsWith( ".tel" ))
-                    {
-                        subdomainTelname = subdomainTelname + "." + telname;
-                    }
-                    if (!subdomainTelname.endsWith( "." ))
-                    {
-                        subdomainTelname += ".";
-                    }
+                subdomainTelname = PublishersListUtils.addPrivateSubDomain( telnameVal,
+                    PublishersList.getPublishersList() );
+                if (subdomainTelname.equals( telnameVal ))
+                {
+                    contactIsFriend = false;
                 }
                 else
                 {
-                    subdomainTelname = this.telname;
+                    contactIsFriend = true;
+                }     
+                
+                if (!subdomainTelname.endsWith( "." ))
+                {
+                    subdomainTelname += ".";
                 }
             }