use framework Base64 instead of android-common

Change-Id: Id3a616646192f4e6d8a37ae8f932b067064b11b8

3 files changed, 4 insertions, 6 deletions

diff --git a/src/com/android/im/app/DatabaseUtils.java b/src/com/android/im/app/DatabaseUtils.java
index 640e14a..417206a 100644
--- a/src/com/android/im/app/DatabaseUtils.java
+++ b/src/com/android/im/app/DatabaseUtils.java
@@ -20,8 +20,6 @@ package com.android.im.app;
 import com.android.im.plugin.ImConfigNames;
 import com.android.im.provider.Imps;
 
-import com.android.common.Base64;
-
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
@@ -32,6 +30,7 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.util.Log;
+import android.util.base64.Base64;
 
 import java.util.Map;
 
diff --git a/src/com/android/im/imps/ImpsPresenceUtils.java b/src/com/android/im/imps/ImpsPresenceUtils.java
index 95e1248..3703874 100644
--- a/src/com/android/im/imps/ImpsPresenceUtils.java
+++ b/src/com/android/im/imps/ImpsPresenceUtils.java
@@ -20,7 +20,7 @@ package com.android.im.imps;
 import com.android.im.engine.Presence;
 import com.android.im.plugin.PresenceMapping;
 
-import com.android.common.Base64;
+import android.util.base64.Base64;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/im/imps/StandardPasswordDigest.java b/src/com/android/im/imps/StandardPasswordDigest.java
index e88f377..dce12f7 100644
--- a/src/com/android/im/imps/StandardPasswordDigest.java
+++ b/src/com/android/im/imps/StandardPasswordDigest.java
@@ -20,9 +20,8 @@ package com.android.im.imps;
 import com.android.im.engine.ImException;
 import com.android.im.plugin.PasswordDigest;
 
-import org.apache.commons.codec.binary.Base64;
-
 import android.security.MessageDigest;
+import android.util.base64.Base64;
 
 import java.io.UnsupportedEncodingException;
 import java.security.NoSuchAlgorithmException;
@@ -47,7 +46,7 @@ public class StandardPasswordDigest implements PasswordDigest {
         } catch (NoSuchAlgorithmException e) {
             throw new ImException("Unsupported schema: " + schema);
         }
-        return new String(Base64.encodeBase64(digestBytes));
+        return Base64.encodeToString(digestBytes, Base64.NO_WRAP);
     }
 
     public String[] getSupportedDigestSchema() {