demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Zepp OS: Fix crash when icon is empty on app.json (#4883)

Browse Source
This commit is contained in:
José Rebelo
2025-06-09 12:05:44 +01:00
parent 0acba61522
commit 1ae9729d9b
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsFwHelper.java
+20 -8
View File
@@ -23,6 +23,7 @@ import android.net.Uri;
import androidx.annotation.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
import org.slf4j.Logger;
@@ -293,13 +294,20 @@ public class ZeppOsFwHelper {
return;
}
Bitmap icon = null;
final byte[] iconBytes = getFileFromZip(zipFile, "assets/" + appIconPath);
if (iconBytes != null) {
if (BitmapUtil.isPng(iconBytes)) {
icon = BitmapFactory.decodeByteArray(iconBytes, 0, iconBytes.length);
} else {
icon = BitmapUtil.decodeTga(iconBytes);
Bitmap icon;
if (StringUtils.isNotBlank(appIconPath)) {
final byte[] iconBytes = getFileFromZip(zipFile, "assets/" + appIconPath);
if (iconBytes != null) {
try {
if (BitmapUtil.isPng(iconBytes)) {
icon = BitmapFactory.decodeByteArray(iconBytes, 0, iconBytes.length);
} else {
icon = BitmapUtil.decodeTga(iconBytes);
}
} catch (final Exception e) {
LOG.error("Failed to decode icon from {}", appIconPath);
icon = null;
}
}
}
@@ -497,9 +505,13 @@ public class ZeppOsFwHelper {
if (entry == null) {
return null;
}
if (entry.isDirectory()) {
LOG.warn("Entry for {} is a directory", path);
return null;
}
return GBZipFile.readAllBytes(zipFile.getInputStream(entry));
} catch (final IOException e) {
LOG.error("Failed to read " + path, e);
LOG.error("Failed to read {}", path, e);
return null;
}
}