From 10716708603a20d704350e5ff1ad1e62a6e42e4d Mon Sep 17 00:00:00 2001 From: Richard Newman Date: Mon, 27 Feb 2012 10:23:33 -0800 Subject: [PATCH] Bug 730637 - Base64 support for HttpClient in Android 2.1. r=nalexander --- .../androidextra/HttpClientAndroidLog.java | 2 +- .../httpclientandroidlib/client/RedirectStrategy.java | 2 +- .../base/httpclientandroidlib/client/utils/Idn.java | 2 +- .../base/httpclientandroidlib/client/utils/JdkIdn.java | 2 +- .../httpclientandroidlib/client/utils/Rfc3492Idn.java | 2 +- .../base/httpclientandroidlib/cookie/ClientCookie.java | 2 +- .../base/httpclientandroidlib/impl/auth/BasicScheme.java | 6 +++--- .../httpclientandroidlib/impl/auth/NTLMEngineImpl.java | 8 ++++---- .../impl/client/DefaultRedirectStrategy.java | 2 +- .../httpclientandroidlib/impl/cookie/BestMatchSpec.java | 2 +- .../impl/cookie/RFC2965CommentUrlAttributeHandler.java | 2 +- .../impl/cookie/RFC2965DiscardAttributeHandler.java | 2 +- .../impl/cookie/RFC2965DomainAttributeHandler.java | 2 +- .../impl/cookie/RFC2965VersionAttributeHandler.java | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/mobile/android/base/httpclientandroidlib/androidextra/HttpClientAndroidLog.java b/mobile/android/base/httpclientandroidlib/androidextra/HttpClientAndroidLog.java index 704cc6e962d..88c43e928aa 100644 --- a/mobile/android/base/httpclientandroidlib/androidextra/HttpClientAndroidLog.java +++ b/mobile/android/base/httpclientandroidlib/androidextra/HttpClientAndroidLog.java @@ -82,4 +82,4 @@ public class HttpClientAndroidLog { Log.i(logTag, message.toString(), t); } -} \ No newline at end of file +} diff --git a/mobile/android/base/httpclientandroidlib/client/RedirectStrategy.java b/mobile/android/base/httpclientandroidlib/client/RedirectStrategy.java index faea77ac2ca..ad2499c3757 100644 --- a/mobile/android/base/httpclientandroidlib/client/RedirectStrategy.java +++ b/mobile/android/base/httpclientandroidlib/client/RedirectStrategy.java @@ -78,4 +78,4 @@ public interface RedirectStrategy { HttpResponse response, HttpContext context) throws ProtocolException; -} \ No newline at end of file +} diff --git a/mobile/android/base/httpclientandroidlib/client/utils/Idn.java b/mobile/android/base/httpclientandroidlib/client/utils/Idn.java index 90e140c2cd8..1ace62fc25a 100644 --- a/mobile/android/base/httpclientandroidlib/client/utils/Idn.java +++ b/mobile/android/base/httpclientandroidlib/client/utils/Idn.java @@ -43,4 +43,4 @@ public interface Idn { * @return the Unicode domain name */ String toUnicode(String punycode); -} \ No newline at end of file +} diff --git a/mobile/android/base/httpclientandroidlib/client/utils/JdkIdn.java b/mobile/android/base/httpclientandroidlib/client/utils/JdkIdn.java index 7d0721679ae..f1018d616b5 100644 --- a/mobile/android/base/httpclientandroidlib/client/utils/JdkIdn.java +++ b/mobile/android/base/httpclientandroidlib/client/utils/JdkIdn.java @@ -72,4 +72,4 @@ public class JdkIdn implements Idn { } } -} \ No newline at end of file +} diff --git a/mobile/android/base/httpclientandroidlib/client/utils/Rfc3492Idn.java b/mobile/android/base/httpclientandroidlib/client/utils/Rfc3492Idn.java index d9c1ba426ee..5c10afa9386 100644 --- a/mobile/android/base/httpclientandroidlib/client/utils/Rfc3492Idn.java +++ b/mobile/android/base/httpclientandroidlib/client/utils/Rfc3492Idn.java @@ -123,4 +123,4 @@ public class Rfc3492Idn implements Idn { return output.toString(); } -} \ No newline at end of file +} diff --git a/mobile/android/base/httpclientandroidlib/cookie/ClientCookie.java b/mobile/android/base/httpclientandroidlib/cookie/ClientCookie.java index fd13a12e331..1909f0999d3 100644 --- a/mobile/android/base/httpclientandroidlib/cookie/ClientCookie.java +++ b/mobile/android/base/httpclientandroidlib/cookie/ClientCookie.java @@ -59,4 +59,4 @@ public interface ClientCookie extends Cookie { boolean containsAttribute(String name); -} \ No newline at end of file +} diff --git a/mobile/android/base/httpclientandroidlib/impl/auth/BasicScheme.java b/mobile/android/base/httpclientandroidlib/impl/auth/BasicScheme.java index 423eaf3f8a9..9dbe15d6125 100644 --- a/mobile/android/base/httpclientandroidlib/impl/auth/BasicScheme.java +++ b/mobile/android/base/httpclientandroidlib/impl/auth/BasicScheme.java @@ -28,7 +28,7 @@ package ch.boye.httpclientandroidlib.impl.auth; import ch.boye.httpclientandroidlib.annotation.NotThreadSafe; -import android.util.Base64; +import org.mozilla.apache.commons.codec.binary.Base64; import ch.boye.httpclientandroidlib.Header; import ch.boye.httpclientandroidlib.HttpRequest; import ch.boye.httpclientandroidlib.auth.AuthenticationException; @@ -161,8 +161,8 @@ public class BasicScheme extends RFC2617Scheme { tmp.append(":"); tmp.append((credentials.getPassword() == null) ? "null" : credentials.getPassword()); - byte[] base64password = Base64.encode( - EncodingUtils.getBytes(tmp.toString(), charset), Base64.NO_WRAP); + byte[] base64password = Base64.encodeBase64( + EncodingUtils.getBytes(tmp.toString(), charset)); CharArrayBuffer buffer = new CharArrayBuffer(32); if (proxy) { diff --git a/mobile/android/base/httpclientandroidlib/impl/auth/NTLMEngineImpl.java b/mobile/android/base/httpclientandroidlib/impl/auth/NTLMEngineImpl.java index a361719fb84..d912e6684ea 100644 --- a/mobile/android/base/httpclientandroidlib/impl/auth/NTLMEngineImpl.java +++ b/mobile/android/base/httpclientandroidlib/impl/auth/NTLMEngineImpl.java @@ -33,7 +33,7 @@ import java.util.Arrays; import javax.crypto.Cipher; import javax.crypto.spec.SecretKeySpec; -import android.util.Base64; +import org.mozilla.apache.commons.codec.binary.Base64; import ch.boye.httpclientandroidlib.util.EncodingUtils; /** @@ -612,8 +612,8 @@ final class NTLMEngineImpl implements NTLMEngine { /** Constructor to use when message contents are known */ NTLMMessage(String messageBody, int expectedType) throws NTLMEngineException { - messageContents = Base64.decode(EncodingUtils.getBytes(messageBody, - DEFAULT_CHARSET), Base64.NO_WRAP); + messageContents = Base64.decodeBase64(EncodingUtils.getBytes(messageBody, + DEFAULT_CHARSET)); // Look for NTLM message if (messageContents.length < SIGNATURE.length) throw new NTLMEngineException("NTLM message decoding error - packet too short"); @@ -746,7 +746,7 @@ final class NTLMEngineImpl implements NTLMEngine { } else { resp = messageContents; } - return EncodingUtils.getAsciiString(Base64.encode(resp, Base64.NO_WRAP)); + return EncodingUtils.getAsciiString(Base64.encodeBase64(resp)); } } diff --git a/mobile/android/base/httpclientandroidlib/impl/client/DefaultRedirectStrategy.java b/mobile/android/base/httpclientandroidlib/impl/client/DefaultRedirectStrategy.java index 4ec1e5e2eda..aa20fd8ff96 100644 --- a/mobile/android/base/httpclientandroidlib/impl/client/DefaultRedirectStrategy.java +++ b/mobile/android/base/httpclientandroidlib/impl/client/DefaultRedirectStrategy.java @@ -199,4 +199,4 @@ public class DefaultRedirectStrategy implements RedirectStrategy { } } -} \ No newline at end of file +} diff --git a/mobile/android/base/httpclientandroidlib/impl/cookie/BestMatchSpec.java b/mobile/android/base/httpclientandroidlib/impl/cookie/BestMatchSpec.java index 25a4996c94d..3e019aab848 100644 --- a/mobile/android/base/httpclientandroidlib/impl/cookie/BestMatchSpec.java +++ b/mobile/android/base/httpclientandroidlib/impl/cookie/BestMatchSpec.java @@ -218,4 +218,4 @@ public class BestMatchSpec implements CookieSpec { return "best-match"; } -} \ No newline at end of file +} diff --git a/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965CommentUrlAttributeHandler.java b/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965CommentUrlAttributeHandler.java index f24c1d7f428..dd851217b54 100644 --- a/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965CommentUrlAttributeHandler.java +++ b/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965CommentUrlAttributeHandler.java @@ -64,4 +64,4 @@ public class RFC2965CommentUrlAttributeHandler implements CookieAttributeHandler return true; } - } \ No newline at end of file + } diff --git a/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965DiscardAttributeHandler.java b/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965DiscardAttributeHandler.java index 84b9e29dd71..dd0a2aaa6c6 100644 --- a/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965DiscardAttributeHandler.java +++ b/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965DiscardAttributeHandler.java @@ -64,4 +64,4 @@ public class RFC2965DiscardAttributeHandler implements CookieAttributeHandler { return true; } - } \ No newline at end of file + } diff --git a/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965DomainAttributeHandler.java b/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965DomainAttributeHandler.java index 0b9f922430d..009baa3c317 100644 --- a/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965DomainAttributeHandler.java +++ b/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965DomainAttributeHandler.java @@ -191,4 +191,4 @@ public class RFC2965DomainAttributeHandler implements CookieAttributeHandler { return effectiveHostWithoutDomain.indexOf('.') == -1; } -} \ No newline at end of file +} diff --git a/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965VersionAttributeHandler.java b/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965VersionAttributeHandler.java index d4c44d1b214..204fc7c1f3c 100644 --- a/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965VersionAttributeHandler.java +++ b/mobile/android/base/httpclientandroidlib/impl/cookie/RFC2965VersionAttributeHandler.java @@ -95,4 +95,4 @@ public class RFC2965VersionAttributeHandler implements CookieAttributeHandler { return true; } -} \ No newline at end of file +}