From f6360c09d413bf2dda34d17f8160a2ac8e0dcedd Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Fri, 7 Feb 2014 22:00:51 +0000
Subject: [PATCH] Added utility methods for converting string to UTF-8 and vice
versa.
---
.../src/org/briarproject/util/StringUtils.java | 10 ++++++++++
.../src/org/briarproject/util/StringUtilsTest.java | 12 ------------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/briar-core/src/org/briarproject/util/StringUtils.java b/briar-core/src/org/briarproject/util/StringUtils.java
index 547a195933..5159b2c3cb 100644
--- a/briar-core/src/org/briarproject/util/StringUtils.java
+++ b/briar-core/src/org/briarproject/util/StringUtils.java
@@ -1,5 +1,7 @@
package org.briarproject.util;
+import java.nio.charset.Charset;
+
public class StringUtils {
private static final char[] HEX = new char[] {
@@ -11,6 +13,14 @@ public class StringUtils {
return s == null || s.length() == 0;
}
+ public static byte[] toUtf8(String s) {
+ return s.getBytes(Charset.forName("UTF-8"));
+ }
+
+ public static String fromUtf8(byte[] bytes) {
+ return new String(bytes, Charset.forName("UTF-8"));
+ }
+
/** Converts the given byte array to a hex character array. */
public static char[] toHexChars(byte[] bytes) {
char[] hex = new char[bytes.length * 2];
diff --git a/briar-tests/src/org/briarproject/util/StringUtilsTest.java b/briar-tests/src/org/briarproject/util/StringUtilsTest.java
index ddcc445daa..13dfc67411 100644
--- a/briar-tests/src/org/briarproject/util/StringUtilsTest.java
+++ b/briar-tests/src/org/briarproject/util/StringUtilsTest.java
@@ -7,18 +7,6 @@ import org.junit.Test;
public class StringUtilsTest extends BriarTestCase {
- @Test
- public void testHead() {
- String head = StringUtils.head("123456789", 5);
- assertEquals("12345...", head);
- }
-
- @Test
- public void testTail() {
- String tail = StringUtils.tail("987654321", 5);
- assertEquals("...54321", tail);
- }
-
@Test
public void testToHexString() {
byte[] b = new byte[] {1, 2, 3, 127, -128};
--
GitLab