Cleanup MUTF8

Glavo · Jan 19, 2024 · c11ef8f · c11ef8f
1 parent 1d8b058
commit c11ef8f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/base/src/main/java/org/glavo/japp/util/MUTF8.java b/base/src/main/java/org/glavo/japp/util/MUTF8.java
@@ -33,18 +33,17 @@ public static String stringFromMUTF8(byte[] bytes, int offset, int count) {
         }
 
         StringBuilder builder = new StringBuilder(count);
-
         for (i = offset; i < end; i++) {
             byte ch = bytes[i];
 
             if (ch == 0) {
                 break;
             }
 
-            boolean isUnicode = (ch & 0x80) != 0;
-            int uch = ch & 0x7F;
-
-            if (isUnicode) {
+            if (ch > 0) {
+                builder.append((char) ch);
+            } else {
+                int uch = ch & 0x7F;
                 int mask = 0x40;
 
                 while ((uch & mask) != 0) {
@@ -61,11 +60,9 @@ public static String stringFromMUTF8(byte[] bytes, int offset, int count) {
                 if ((uch & 0xFFFF) != uch) {
                     throw new IllegalArgumentException("character out of range \\u" + Integer.toHexString(uch));
                 }
+                builder.appendCodePoint(uch);
             }
-
-            builder.appendCodePoint(uch);
         }
-
         return builder.toString();
     }
 

diff --git a/src/test/java/org/glavo/japp/util/MUTF8Test.java b/src/test/java/org/glavo/japp/util/MUTF8Test.java
@@ -32,7 +32,9 @@ private static Stream<String> strs() {
                 "",
                 "\0\0\0",
                 "Hello World!",
-                "Hello\0测试字符串"
+                "Hello àáâãäå",
+                "Hello 测试字符串",
+                "测试测试ABC测试测试\0测试"
         );
     }