Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-25 15:52:06 +01:00
Code Issues Releases Wiki Activity

Use NO_WRAP/DONT_BREAK_LINES when doing Base64 encoding

Browse source
This commit is contained in:
Florian Schmaus 2014-09-05 23:19:27 +02:00
parent 34bc13bec7
commit 51083b014e
4 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,8 @@ public class AndroidBase64Encoder implements org.jivesoftware.smack.util.stringe
private static AndroidBase64Encoder instance = new AndroidBase64Encoder();
private static final int BASE64_ENCODER_FLAGS = Base64.NO_WRAP;
private AndroidBase64Encoder() {
// Use getInstance()
}
@ -46,12 +48,12 @@ public class AndroidBase64Encoder implements org.jivesoftware.smack.util.stringe
@Override
public String encodeToString(byte[] input, int offset, int len) {
return Base64.encodeToString(input, offset, len, Base64.DEFAULT);
return Base64.encodeToString(input, offset, len, BASE64_ENCODER_FLAGS);
}
@Override
public byte[] encode(byte[] input, int offset, int len) {
return Base64.encode(input, offset, len, Base64.DEFAULT);
return Base64.encode(input, offset, len, BASE64_ENCODER_FLAGS);
}
}

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

@ -31,6 +31,8 @@ public class AndroidBase64UrlSafeEncoder implements StringEncoder {
private static AndroidBase64UrlSafeEncoder instance = new AndroidBase64UrlSafeEncoder();
private static final int BASE64_ENCODER_FLAGS = Base64.URL_SAFE | Base64.NO_WRAP;
private AndroidBase64UrlSafeEncoder() {
// Use getInstance()
}
@ -42,7 +44,7 @@ public class AndroidBase64UrlSafeEncoder implements StringEncoder {
@Override
public String encode(String string) {
try {
return Base64.encodeToString(string.getBytes(StringUtils.UTF8), Base64.URL_SAFE);
return Base64.encodeToString(string.getBytes(StringUtils.UTF8), BASE64_ENCODER_FLAGS);
} catch (UnsupportedEncodingException e) {
throw new IllegalStateException("UTF-8 not supported", e);
}
@ -50,7 +52,7 @@ public class AndroidBase64UrlSafeEncoder implements StringEncoder {
@Override
public String decode(String string) {
byte[] bytes = Base64.decode(string, Base64.URL_SAFE);
byte[] bytes = Base64.decode(string, BASE64_ENCODER_FLAGS);
try {
return new String(bytes, StringUtils.UTF8);
} catch (UnsupportedEncodingException e) {

4
smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java
View file

@ -28,6 +28,8 @@ public class Java7Base64Encoder implements org.jivesoftware.smack.util.stringenc
private static Java7Base64Encoder instance = new Java7Base64Encoder();
private static int BASE64_ENCODER_FLAGS = Base64.URL_SAFE;
private Java7Base64Encoder() {
// Use getInstance()
}
@ -48,7 +50,7 @@ public class Java7Base64Encoder implements org.jivesoftware.smack.util.stringenc
@Override
public String encodeToString(byte[] input, int offset, int len) {
return Base64.encodeBytes(input, offset, len);
return Base64.encodeBytes(input, offset, len, BASE64_ENCODER_FLAGS);
}
@Override

6
smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java
View file

@ -34,6 +34,8 @@ public class Java7Base64UrlSafeEncoder implements StringEncoder {
private static Java7Base64UrlSafeEncoder instance = new Java7Base64UrlSafeEncoder();
private static int BASE64_ENCODER_FLAGS = Base64.URL_SAFE | Base64.DONT_BREAK_LINES;
private Java7Base64UrlSafeEncoder() {
// Use getInstance()
}
@ -43,11 +45,11 @@ public class Java7Base64UrlSafeEncoder implements StringEncoder {
}
public String encode(String s) {
return Base64.encodeBytes(s.getBytes(), Base64.URL_SAFE);
return Base64.encodeBytes(s.getBytes(), BASE64_ENCODER_FLAGS);
}
public String decode(String s) {
return new String(Base64.decode(s, Base64.URL_SAFE));
return new String(Base64.decode(s, BASE64_ENCODER_FLAGS));
}
}