X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerBridge.java;h=84433fe9d4f9516c90acaf39d6359fce1e1e25b8;hb=f8147a0ee57317e96d9ff0bf19573f7168d0354c;hp=cb06f56369054deb8ab06b6a1e201c7ac1611e62;hpb=08f80ac5fa60738d3ad74c4b5390a0b79ae313d4;p=fanfix.git diff --git a/src/be/nikiroo/utils/serial/server/ServerBridge.java b/src/be/nikiroo/utils/serial/server/ServerBridge.java index cb06f56..84433fe 100644 --- a/src/be/nikiroo/utils/serial/server/ServerBridge.java +++ b/src/be/nikiroo/utils/serial/server/ServerBridge.java @@ -227,14 +227,14 @@ public class ServerBridge extends Server { try { while (data.startsWith("ZIP:") || data.startsWith("B64:")) { if (data.startsWith("ZIP:")) { - data = StringUtils.unbase64s(data.substring(4), true); + data = StringUtils.unzip64s(data.substring(4)); } else if (data.startsWith("B64:")) { - data = StringUtils.unbase64s(data.substring(4), false); + data = StringUtils.unzip64s(data.substring(4)); } } InputStream stream = new ByteArrayInputStream( - data.getBytes("UTF-8")); + StringUtils.getBytes(data)); try { Object obj = new Importer().read(stream).getValue(); if (obj == null) {