Changeset 564

Timestamp:

11/09/09 11:05:56 (4 years ago)

Author:

jonmaycock

Message:

 

Location:

apps/blackberry/branches/1.5/blackberry/src/org/telnic/blackberry

Files:

• LookupApplication.java (modified) (2 diffs)
• MultiImportScreen.java (modified) (3 diffs)
• TelnameApp.java (modified) (2 diffs)
• TelnameAppResource.java (modified) (2 diffs)

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

@@ -43 +43 @@
  *
  * @author Ben Dowling, Jonathan Maycock
- * @version $Id: LookupApplication.java,v 1.13 2009/01/16 14:33:49 jm2 Exp $
+ * @version $Id: LookupApplication.java,v 1.14 2009/11/06 11:51:35 jm2 Exp $
  */
 public class LookupApplication extends UiApplication implements BlackberryUICallback, RealtimeClockListener, GlobalEventListener
@@ -176 +176 @@
                 AutomaticUpdateStore.setAutomaticUpdate( System.currentTimeMillis() );
                 TelnicWebServices tw = new TelnicWebServices();
-                tw.listPublishers( this, "" );
+                tw.listPublishers( this, "", false );
                             
                 //check messages when we check the publishers list.

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

@@ -60 +60 @@
 import org.telnic.blackberry.util.CustomRichTextField;
 import org.telnic.blackberry.util.Logger;
+import org.telnic.blackberry.util.listcallbacks.DiscardedNaptrException;
 import org.telnic.blackberry.util.listcallbacks.LookupResultsListCallback;
 
@@ -66 +67 @@
  *
  * @author Jonathan Maycock
- * @version $Id: MultiImportScreen.java,v 1.21 2009/01/16 14:33:50 jm2 Exp $
+ * @version $Id: MultiImportScreen.java,v 1.22 2009/11/06 11:52:14 jm2 Exp $
  */
 public class MultiImportScreen extends MainScreen implements FieldChangeListener, FocusChangeListener
@@ -531 +532 @@
                 if (!rr.isNonTerminal())
                 {
-                    final Object[] vals = resultsListCallback.parseNaptrStringAndIcon( rr );
-                    final String element = (String) vals[0];
-                    final Bitmap icon = (Bitmap) vals[1];
-
-                    Vector xlbls = rr.getXlbl();
-                    String service = resultsListCallback.getServiceString( i );
-
-                    xlblSet.addElement( xlbls );
-                    serviceSet.addElement( service );
-
-                    final CustomRichTextField data = new CustomRichTextField( element,
-                        RichTextField.NON_FOCUSABLE, icon, CustomRichTextField.LEFT, thisScreen );
-
-                    dataFields[i] = data;
-                    vfm.add( data );
+                    Object[] vals;
+                    try
+                    {
+                        vals = resultsListCallback.parseNaptrStringAndIcon( rr );
+                        final String element = (String) vals[0];
+                        final Bitmap icon = (Bitmap) vals[1];
+
+                        Vector xlbls = rr.getXlbl();
+                        String service = resultsListCallback.getServiceString( i );
+
+                        xlblSet.addElement( xlbls );
+                        serviceSet.addElement( service );
+
+                        final CustomRichTextField data = new CustomRichTextField( element,
+                            RichTextField.NON_FOCUSABLE, icon, CustomRichTextField.LEFT, thisScreen );
+
+                        dataFields[i] = data;
+                        vfm.add( data );
+                    }
+                    catch (DiscardedNaptrException e)
+                    {
+                        Logger.logMessage( "Problem with NAPTR: " + e.getMessage(), Options.KEY_LOG_APPLICATION );
+                    }                    
                 }
                 else

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

@@ -43 +43 @@
  *
  * @author Ben Dowling, Jonathan Maycock
- * @version $Id: TelnameApp.java,v 1.54 2009/07/28 15:03:53 jm2 Exp $
+ * @version $Id: TelnameApp.java,v 1.55 2009/11/06 11:56:26 jm2 Exp $
  */
 public final class TelnameApp implements OptionsChangeListener
@@ -111 +111 @@
     public static String getVersion ()
     {
-        return "1.4";
+        return "1.5";
     }
 

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

@@ -24 +24 @@
  *
  * @author Ben Dowling, Jonathan Maycock
- * @version $Id: TelnameAppResource.java,v 1.34 2009/03/05 11:41:07 jm2 Exp $
+ * @version $Id: TelnameAppResource.java,v 1.35 2009/11/06 11:56:27 jm2 Exp $
  */
 public interface TelnameAppResource
@@ -1212 +1212 @@
     /** TELFRIENDS_URL */
     int TELFRIENDS_URL = 1;
+    
+    /**SERVICE_TYPE_NOTE */
+    int SERVICE_TYPE_NOTE = 1;
+    
+    /**SERVICE_TYPE_USER */
+    int SERVICE_TYPE_USER = 1;
 
     /**