in.
* @return A character array with the Base64 encoded data.
*/
- static char[] encode(byte[] in, int iLen) {
- int oDataLen = (iLen * 4 + 2) / 3; // output length without padding
- int oLen = ((iLen + 2) / 3) * 4; // output length including padding
- char[] out = new char[oLen];
+ static char[] encode(final byte[] in, final int iLen) {
+ final int oDataLen = (iLen * 4 + 2) / 3; // output length without
+ // padding
+ final int oLen = (iLen + 2) / 3 * 4; // output length including padding
+ final char[] out = new char[oLen];
int ip = 0;
int op = 0;
while (ip < iLen) {
- int i0 = in[ip++] & 0xff;
- int i1 = ip < iLen ? in[ip++] & 0xff : 0;
- int i2 = ip < iLen ? in[ip++] & 0xff : 0;
- int o0 = i0 >>> 2;
- int o1 = ((i0 & 3) << 4) | (i1 >>> 4);
- int o2 = ((i1 & 0xf) << 2) | (i2 >>> 6);
- int o3 = i2 & 0x3F;
+ final int i0 = in[ip++] & 0xff;
+ final int i1 = ip < iLen ? in[ip++] & 0xff : 0;
+ final int i2 = ip < iLen ? in[ip++] & 0xff : 0;
+ final int o0 = i0 >>> 2;
+ final int o1 = (i0 & 3) << 4 | i1 >>> 4;
+ final int o2 = (i1 & 0xf) << 2 | i2 >>> 6;
+ final int o3 = i2 & 0x3F;
out[op++] = map1[o0];
out[op++] = map1[o1];
out[op] = op < oDataLen ? map1[o2] : '=';
@@ -114,83 +169,15 @@ class Base64Coder {
}
/**
- * Decodes a string from Base64 format.
+ * Encodes a string into Base64 format. No blanks or line breaks are
+ * inserted.
*
* @param s
- * a Base64 String to be decoded.
- * @return A String containing the decoded data.
- * @throws IllegalArgumentException
- * if the input is not valid Base64 encoded data.
+ * a String to be encoded.
+ * @return A String with the Base64 encoded data.
*/
- static String decodeString(String s) {
- return new String(decode(s));
- }
-
- /**
- * Decodes a byte array from Base64 format.
- *
- * @param s
- * a Base64 String to be decoded.
- * @return An array containing the decoded data bytes.
- * @throws IllegalArgumentException
- * if the input is not valid Base64 encoded data.
- */
- static byte[] decode(String s) {
- return decode(s.toCharArray());
- }
-
- /**
- * Decodes a byte array from Base64 format. No blanks or line breaks are
- * allowed within the Base64 encoded data.
- *
- * @param in
- * a character array containing the Base64 encoded data.
- * @return An array containing the decoded data bytes.
- * @throws IllegalArgumentException
- * if the input is not valid Base64 encoded data.
- */
- static byte[] decode(char[] in) {
- int iLen = in.length;
- if (iLen % 4 != 0) {
- throw new IllegalArgumentException(
- "Length of Base64 encoded input string is not a multiple of 4.");
- }
- while (iLen > 0 && in[iLen - 1] == '=') {
- iLen--;
- }
- int oLen = (iLen * 3) / 4;
- byte[] out = new byte[oLen];
- int ip = 0;
- int op = 0;
- while (ip < iLen) {
- int i0 = in[ip++];
- int i1 = in[ip++];
- int i2 = ip < iLen ? in[ip++] : 'A';
- int i3 = ip < iLen ? in[ip++] : 'A';
- if (i0 > 127 || i1 > 127 || i2 > 127 || i3 > 127) {
- throw new IllegalArgumentException(
- "Illegal character in Base64 encoded data.");
- }
- int b0 = map2[i0];
- int b1 = map2[i1];
- int b2 = map2[i2];
- int b3 = map2[i3];
- if (b0 < 0 || b1 < 0 || b2 < 0 || b3 < 0) {
- throw new IllegalArgumentException(
- "Illegal character in Base64 encoded data.");
- }
- int o0 = (b0 << 2) | (b1 >>> 4);
- int o1 = ((b1 & 0xf) << 4) | (b2 >>> 2);
- int o2 = ((b2 & 3) << 6) | b3;
- out[op++] = (byte) o0;
- if (op < oLen) {
- out[op++] = (byte) o1;
- }
- if (op < oLen) {
- out[op++] = (byte) o2;
- }
- }
- return out;
+ static String encodeString(final String s) {
+ return new String(encode(s.getBytes()));
}
// Dummy constructor.
diff --git a/OSJ Forum/src/org/xmlrpc/android/IXMLRPCSerializer.java b/OSJ Forum/src/org/xmlrpc/android/IXMLRPCSerializer.java
index f651e46..429a00f 100644
--- a/OSJ Forum/src/org/xmlrpc/android/IXMLRPCSerializer.java
+++ b/OSJ Forum/src/org/xmlrpc/android/IXMLRPCSerializer.java
@@ -11,7 +11,7 @@ public interface IXMLRPCSerializer {
String TAG_MEMBER = "member";
String TAG_VALUE = "value";
String TAG_DATA = "data";
-
+
String TYPE_INT = "int";
String TYPE_I4 = "i4";
String TYPE_I8 = "i8";
@@ -24,9 +24,10 @@ public interface IXMLRPCSerializer {
String TYPE_STRUCT = "struct";
// This added by mattias.ellback as part of issue #19
String TYPE_NULL = "nil";
-
+
String DATETIME_FORMAT = "yyyyMMdd'T'HH:mm:ss";
- void serialize(XmlSerializer serializer, Object object) throws IOException;
Object deserialize(XmlPullParser parser) throws XmlPullParserException, IOException;
+
+ void serialize(XmlSerializer serializer, Object object) throws IOException;
}
diff --git a/OSJ Forum/src/org/xmlrpc/android/MethodCall.java b/OSJ Forum/src/org/xmlrpc/android/MethodCall.java
index d573d5c..67641eb 100644
--- a/OSJ Forum/src/org/xmlrpc/android/MethodCall.java
+++ b/OSJ Forum/src/org/xmlrpc/android/MethodCall.java
@@ -7,14 +7,24 @@ public class MethodCall {
private static final int TOPIC = 1;
String methodName;
ArrayList