Skip to content

Commit 564c839

Browse files
author
Blankj
committed
see 02/18 log
1 parent bc8b241 commit 564c839

15 files changed

Lines changed: 695 additions & 410 deletions

File tree

utilcode/lib/src/main/java/com/blankj/utilcode/util/ConvertUtils.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,9 @@ public static OutputStream bytes2OutputStream(final byte[] bytes) {
403403
public static String inputStream2String(final InputStream is, final String charsetName) {
404404
if (is == null || isSpace(charsetName)) return "";
405405
try {
406-
return new String(inputStream2Bytes(is), charsetName);
406+
ByteArrayOutputStream baos = input2OutputStream(is);
407+
if (baos == null) return "";
408+
return baos.toString(charsetName);
407409
} catch (UnsupportedEncodingException e) {
408410
e.printStackTrace();
409411
return "";

utilcode/lib/src/main/java/com/blankj/utilcode/util/FileIOUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ public static boolean writeFileFromIS(final File file,
8989
try {
9090
os = new BufferedOutputStream(new FileOutputStream(file, append));
9191
byte data[] = new byte[sBufferSize];
92-
int len;
93-
while ((len = is.read(data, 0, sBufferSize)) != -1) {
92+
for (int len; (len = is.read(data)) != -1; ) {
9493
os.write(data, 0, len);
9594
}
9695
return true;

utilcode/lib/src/main/java/com/blankj/utilcode/util/HttpUtils.java

Lines changed: 0 additions & 322 deletions
This file was deleted.

0 commit comments

Comments
 (0)