rusefi
/
Android-DFU-Library
mirror of https://github.com/rusefi/Android-DFU-Library.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Warnings fixed

This commit is contained in:
philips77 2020-05-26 15:13:17 +02:00
parent 05018e4f30
commit 87354c2073
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dfu/src/main/java/no/nordicsemi/android/dfu/internal/ArchiveInputStream.java
View File

@ -22,6 +22,7 @@
package no.nordicsemi.android.dfu.internal; package no.nordicsemi.android.dfu.internal;
import android.os.Build;
import android.util.Log; import android.util.Log;
import com.google.gson.Gson; import com.google.gson.Gson;
@ -31,6 +32,7 @@ import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
@ -346,7 +348,12 @@ public class ArchiveInputStream extends InputStream {
// Save the file content either as a manifest data or by adding it to entries // Save the file content either as a manifest data or by adding it to entries
if (MANIFEST.equals(filename)) if (MANIFEST.equals(filename))
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
manifestData = new String(source, StandardCharsets.UTF_8);
} else {
//noinspection CharsetObjectCanBeUsed
manifestData = new String(source, "UTF-8"); manifestData = new String(source, "UTF-8");
}
else else
entries.put(filename, source); entries.put(filename, source);
} }
@ -414,7 +421,7 @@ public class ArchiveInputStream extends InputStream {
private int rawRead(@NonNull final byte[] buffer, final int offset, final int length) { private int rawRead(@NonNull final byte[] buffer, final int offset, final int length) {
final int maxSize = currentSource.length - bytesReadFromCurrentSource; final int maxSize = currentSource.length - bytesReadFromCurrentSource;
final int size = length <= maxSize ? length : maxSize; final int size = Math.min(length, maxSize);
System.arraycopy(currentSource, bytesReadFromCurrentSource, buffer, offset, size); System.arraycopy(currentSource, bytesReadFromCurrentSource, buffer, offset, size);
bytesReadFromCurrentSource += size; bytesReadFromCurrentSource += size;
bytesRead += size; bytesRead += size;