Changeset 584

Timestamp:

11/23/09 16:41:31 (4 months ago)

Author:

jonmaycock

Message:

 

Location:

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

Files:

• not/java/net (added)
• not/java/net/URLDecoder.java (added)
• telnic/blackberry/util/listcallbacks/LookupResultsListCallback.java (modified) (5 diffs)

apps/blackberry/branches/1.5/blackberry/src/org/telnic/blackberry/util/listcallbacks/LookupResultsListCallback.java

@@ -24 +24 @@
 import java.util.Vector;
 
+import net.rim.blackberry.api.browser.URLEncodedPostData;
 import net.rim.device.api.i18n.ResourceBundle;
 import net.rim.device.api.system.Bitmap;
@@ -32 +33 @@
 
 import org.bouncycastle.util.encoders.Base64;
+import org.not.java.net.URLDecoder;
 import org.telnic.blackberry.TelnameApp;
 import org.telnic.blackberry.TelnameAppResource;
@@ -43 +45 @@
  *
  * @author Ben Dowling, Jonathan Maycock
- * @version $Id: LookupResultsListCallback.java,v 1.12 2009/11/06 11:54:16 jm2 Exp $
+ * @version $Id: LookupResultsListCallback.java,v 1.13 2009/11/23 15:33:27 jm2 Exp $
  */
 public class LookupResultsListCallback implements ListFieldCallback
@@ -765 +767 @@
         String returnData = "";
         
-        if (uri.startsWith( "data:," )  || uri.startsWith( "data:text/plain;charset=US-ASCII," ) )
+        if ( uri.startsWith( "data:," ) )
         {
             returnData = uri.substring( uri.indexOf( "," ) + 1 );
-        }
-        else if (uri.startsWith( "data:;base64," ) || uri.startsWith( "data:text/plain;charset=US-ASCII;base64," ))
+            try
+            {
+                returnData = URLDecoder.decode( returnData, "UTF-8" );
+            }
+            catch (UnsupportedEncodingException e)
+            {                
+                e.printStackTrace();
+            }
+        }
+        else if ( uri.startsWith( "data:;base64," ) )
         {
             returnData = uri.substring( uri.indexOf( "," ) + 1 );            
             try
             {
-                returnData = new String (Base64.decode( returnData ), "US-ASCII");
+                returnData = new String (Base64.decode( returnData ), "UTF-8");
             }
             catch (UnsupportedEncodingException e)
@@ -781 +791 @@
             } 
         }
+        else
+        {
+            throw new DiscardedNaptrException("Unsupported Mime Type or Charset found.");
+        }
         
         return returnData;