Changeset 666 for apps

Timestamp:

01/18/10 13:17:22 (3 years ago)

Author:

jonmaycock

Message:

 

Location:

apps/blackberry/branches/1.6.1/blackberry

Files:

• build.xml (modified) (1 diff)
• src/org/telnic/blackberry/dns/DNSInputStream.java (modified) (8 diffs)
• src/org/telnic/blackberry/TelnameApp.java (modified) (2 diffs)

apps/blackberry/branches/1.6.1/blackberry/build.xml

@@ -3 +3 @@
 <project name="DotTel-BB" default="build">
 
-        <property name="ver" value="1.6" />
+        <property name="ver" value="1.6.1" />
         <property name="appname" value="Access .tel" /> 
         <property name="codename" value="DotTel-BB" />

apps/blackberry/branches/1.6.1/blackberry/src/org/telnic/blackberry/dns/DNSInputStream.java

@@ -38 +38 @@
  *
  * @author John Cundall, Ben Dowling, Jonathan Maycock
- * @version $Id: DNSInputStream.java,v 1.21 2009/12/17 12:00:46 jm2 Exp $
+ * @version $Id: DNSInputStream.java,v 1.22 2010/01/18 12:42:31 jm2 Exp $
  */
 public class DNSInputStream extends ByteArrayInputStream
@@ -73 +73 @@
 
     /**
-     * the major version number.
-     */
-    public static final int MAJOR_VERSION = 1;
-
-    /**
-     * the minor version number.
-     */
-    public static final int MINOR_VERSION = 1;    
-
+     * the text major version number.
+     */
+    public static final int TEXT_MAJOR_VERSION = 1;
+
+    /**
+     * the text minor version number.
+     */
+    public static final int TEXT_MINOR_VERSION = 1;    
+    
     /**
      * A variable to monitor postion in the data
@@ -456 +456 @@
             String version = readString();
             //check version number
-
-            if (!checkTxtVersion( version ))
-            {
-                //discard
-                return null;
-            }
+            
+            boolean isOldStyleDomain = isOldStyleDomain( version );
+            Logger.logMessage( "isOldStyleDomain: " + isOldStyleDomain, Options.KEY_LOG_APPLICATION );
 
             String type = readString();
@@ -472 +469 @@
                     readString();              
                 }
-                return new DNSTxtDDSResourceRecord( ttl, txtStr, dds, version.equals( "1" ) );
+                return new DNSTxtDDSResourceRecord( ttl, txtStr, dds, isOldStyleDomain );
             }
             else if (type.equals( TSM_PRIVATE_DATA_AVAILABLE ))
@@ -486 +483 @@
                     privateAvail = true;
                 }
-                if (version.equals( "1" ))
-                {
-                    isVersionOne = true;
-                }
+                isVersionOne = isOldStyleDomain;
                 
                 //read the other entries.
@@ -569 +563 @@
         String minor = version.substring( 1, version.length() );
 
-        if (Integer.parseInt( major ) > MAJOR_VERSION )
+        if (Integer.parseInt( major ) > TEXT_MAJOR_VERSION )
         {
             Logger.logMessage("Structured Text version not supported.  Discarding.", Options.KEY_LOG_APPLICATION);
@@ -575 +569 @@
         }
 
-        String minorSystem = String.valueOf( MINOR_VERSION );
+        String minorSystem = String.valueOf( TEXT_MINOR_VERSION );
 
         while (minor.length() < minorSystem.length())
@@ -589 +583 @@
         {
             Logger.logMessage("Structured Text Record Minor Version Does Not Match, Parsing anyway", Options.KEY_LOG_APPLICATION);
+        }
+        return true;
+    }
+    
+    /**
+     * checks the structured text record version number.
+     */
+    private boolean isOldStyleDomain(String version)
+    {         
+        String major = version.substring( 0, 1 );
+        String minor = version.substring( 1, version.length() );
+
+        if (Integer.parseInt( major ) > 1 )
+        {
+            Logger.logMessage("Not v10 or v11", Options.KEY_LOG_APPLICATION);
+            return false;
+        }
+
+        String minorSystem = String.valueOf( 0 );
+
+        while (minor.length() < minorSystem.length())
+        {
+            minor += "0";
+        }
+        while (minorSystem.length() < minor.length())
+        {
+            minorSystem += "0";
+        }
+
+        if (Integer.parseInt( minor ) != 0 && Integer.parseInt( minor ) != 1)
+        {
+            Logger.logMessage("Not v10 or v11", Options.KEY_LOG_APPLICATION);
+            return false;
         }
         return true;

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

@@ -43 +43 @@
  *
  * @author Ben Dowling, Jonathan Maycock
- * @version $Id: TelnameApp.java,v 1.57 2009/12/17 12:03:00 jm2 Exp $
+ * @version $Id: TelnameApp.java,v 1.58 2010/01/18 13:16:34 jm2 Exp $
  */
 public final class TelnameApp implements OptionsChangeListener
@@ -111 +111 @@
     public static String getVersion ()
     {
-        return "1.6";
+        return "1.6.1";
     }