Create smack.util.stringencoder for Base64, Base32,…

Use Android's Base64 implementation when on Android, otherwise, when on
Java7, use the existing one.

smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java

@@ -21,12 +21,18 @@ import java.util.List;
 import org.apache.http.conn.ssl.StrictHostnameVerifier;
 import org.jivesoftware.smack.SmackConfiguration;
 import org.jivesoftware.smack.initializer.SimpleSmackInitializer;
+import org.jivesoftware.smack.util.stringencoder.Base64;
+import org.jivesoftware.smack.util.stringencoder.Base64UrlSafeEncoder;
+import org.jivesoftware.smack.util.stringencoder.android.AndroidBase64Encoder;
+import org.jivesoftware.smack.util.stringencoder.android.AndroidBase64UrlSafeEncoder;
 
 public class AndroidSmackInitializer extends SimpleSmackInitializer {
 
 	@Override
 	public List<Exception> initialize() {
 		SmackConfiguration.setDefaultHostnameVerifier(new StrictHostnameVerifier());
+		Base64.setEncoder(AndroidBase64Encoder.getInstance());
+		Base64UrlSafeEncoder.setEncoder(AndroidBase64UrlSafeEncoder.getInstance());
 		return null;
 	}
 

smack-android/src/main/java/org/jivesoftware/smack/util/stringencoder/android/AndroidBase64Encoder.java

@@ -0,0 +1,57 @@
+/**
+ *
+ * Copyright © 2014 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.util.stringencoder.android;
+
+import android.util.Base64;
+
+/**
+ * A Base 64 encoding implementation based on android.util.Base64
+ * @author Florian Schmaus
+ */
+public class AndroidBase64Encoder implements org.jivesoftware.smack.util.stringencoder.Base64.Encoder {
+
+    private static AndroidBase64Encoder instance = new AndroidBase64Encoder();
+
+    private AndroidBase64Encoder() {
+        // Use getInstance()
+    }
+
+    public static AndroidBase64Encoder getInstance() {
+        return instance;
+    }
+
+    @Override
+    public byte[] decode(String string) {
+        return Base64.decode(string, Base64.DEFAULT);
+    }
+
+    @Override
+    public byte[] decode(byte[] input, int offset, int len) {
+        return Base64.decode(input, offset, len, 0);
+    }
+
+    @Override
+    public String encodeToString(byte[] input, int offset, int len) {
+        return Base64.encodeToString(input, offset, len, Base64.DEFAULT);
+    }
+
+    @Override
+    public byte[] encode(byte[] input, int offset, int len) {
+        return Base64.encode(input, offset, len, Base64.DEFAULT);
+    }
+
+}

smack-android/src/main/java/org/jivesoftware/smack/util/stringencoder/android/AndroidBase64UrlSafeEncoder.java

@@ -0,0 +1,61 @@
+/**
+ *
+ * Copyright © 2014 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.util.stringencoder.android;
+
+import java.io.UnsupportedEncodingException;
+
+import org.jivesoftware.smack.util.StringUtils;
+import org.jivesoftware.smack.util.stringencoder.StringEncoder;
+
+import android.util.Base64;
+
+
+/**
+ * 
+ */
+public class AndroidBase64UrlSafeEncoder implements StringEncoder {
+
+    private static AndroidBase64UrlSafeEncoder instance = new AndroidBase64UrlSafeEncoder();
+
+    private AndroidBase64UrlSafeEncoder() {
+        // Use getInstance()
+    }
+
+    public static AndroidBase64UrlSafeEncoder getInstance() {
+        return instance;
+    }
+
+    @Override
+    public String encode(String string) {
+        try {
+            return Base64.encodeToString(string.getBytes(StringUtils.UTF8), Base64.URL_SAFE);
+        } catch (UnsupportedEncodingException e) {
+            throw new IllegalStateException("UTF-8 not supported", e);
+        }
+    }
+
+    @Override
+    public String decode(String string) {
+        byte[] bytes = Base64.decode(string, Base64.URL_SAFE);
+        try {
+            return new String(bytes, StringUtils.UTF8);
+        } catch (UnsupportedEncodingException e) {
+            throw new IllegalStateException("UTF-8 not supported", e);
+        }
+    }
+
+}