MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-03 17:02:13 +01:00
Code Releases Wiki Activity

persist metadata in class, move validity check to isValid() function

Browse Source
This commit is contained in:
MPeter 2022-09-01 22:15:35 +02:00
parent c7841b4947
commit 96f87cf913
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeInstallHandler.java
View File

@ -43,7 +43,8 @@ public class PineTimeInstallHandler implements InstallHandler {
private static final Logger LOG = LoggerFactory.getLogger(PineTimeInstallHandler.class);
private final Context context;
private boolean valid = false;
private InfiniTimeDFUPackage dfuPackageManifest;
private String version = "(Unknown version)";
public PineTimeInstallHandler(Uri uri, Context context) {
@ -71,17 +72,6 @@ public class PineTimeInstallHandler implements InstallHandler {
} catch (Exception e) {
LOG.error("Unknown error occurred.", e);
}
if (metadata != null &&
metadata.manifest != null &&
metadata.manifest.application != null &&
metadata.manifest.application.bin_file != null) {
valid = true;
version = metadata.manifest.application.bin_file;
} else {
valid = false;
LOG.error("Somehow metadata was found, but some data was missing");
}
}
@Override
@ -103,7 +93,7 @@ public class PineTimeInstallHandler implements InstallHandler {
return;
}
if (!valid) {
if (!isValid()) {
LOG.error("Firmware cannot be installed (not valid)");
installActivity.setInfoText("Firmware cannot be installed (not valid)");
installActivity.setInstallEnabled(false);
@ -126,6 +116,9 @@ public class PineTimeInstallHandler implements InstallHandler {
@Override
public boolean isValid() {
return valid;
return dfuPackageManifest != null &&
dfuPackageManifest.manifest != null &&
dfuPackageManifest.manifest.application != null &&
dfuPackageManifest.manifest.application.bin_file != null;
}
}