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

Garmin: Fix XML download progress notification

Browse Source
This commit is contained in:
José Rebelo
2025-12-26 19:58:36 +00:00
parent a225d868e8
commit c67da1b275
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileTransferHandler.java
+2 -4
View File
@@ -108,10 +108,8 @@ public class FileTransferHandler implements MessageHandler {
return new DownloadRequestMessage(0, 0, DownloadRequestMessage.REQUEST_TYPE.NEW, 0, 0);
}
public DownloadRequestMessage initiateDebugDownload() {
DirectoryEntry deviceXml = new DirectoryEntry(0xFFFD, FileType.FILETYPE.DEVICE_XML, 0xFFFD, 0, 0, 0, new Date());
download.setCurrentlyDownloading(new FileFragment(deviceXml));
return new DownloadRequestMessage(deviceXml.getFileIndex(), 0, DownloadRequestMessage.REQUEST_TYPE.NEW, 0, 0);
public DirectoryEntry getDeviceXmlDirectoryEntry() {
return new DirectoryEntry(0xFFFD, FileType.FILETYPE.DEVICE_XML, 0xFFFD, 0, 0, 0, new Date());
}
// public DownloadRequestMessage downloadSettings() {
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/GarminSupport.java
+8 -4
View File
@@ -177,7 +177,7 @@ public class GarminSupport extends AbstractBTLESingleDeviceSupport implements IC
}
public void addFileToDownloadList(FileTransferHandler.DirectoryEntry directoryEntry) {
if (newSyncProtocol()) {
if (newSyncProtocol() && directoryEntry.getFiletype() != FileType.FILETYPE.DEVICE_XML) {
if (directoryEntry.getFiletype() == FileType.FILETYPE.DIRECTORY) {
LOG.debug("Got directory entry, syncing with new protocol");
sendOutgoingMessage(
@@ -346,7 +346,6 @@ public class GarminSupport extends AbstractBTLESingleDeviceSupport implements IC
@Override
public void onSetCallState(CallSpec callSpec) {
LOG.info("INCOMING CALLSPEC: {}", callSpec.command);
sendOutgoingMessage("send call", notificationsHandler.onSetCallState(callSpec));
}
@@ -422,7 +421,7 @@ public class GarminSupport extends AbstractBTLESingleDeviceSupport implements IC
}
}
if (!getKeepActivityDataOnDevice()) { // delete file from watch upon successful download
if (entry.getFiletype() != FileType.FILETYPE.DEVICE_XML && !getKeepActivityDataOnDevice()) { // delete file from watch upon successful download
sendOutgoingMessage("archive file " + entry.getFileIndex(), new SetFileFlagsMessage(entry.getFileIndex(), SetFileFlagsMessage.FileFlags.ARCHIVE));
}
} else if (fileDownloadedDeviceEvent.localPath != null) {
@@ -463,7 +462,8 @@ public class GarminSupport extends AbstractBTLESingleDeviceSupport implements IC
@Override
public void onFetchRecordedData(final int dataTypes) {
if (dataTypes == RecordedDataTypes.TYPE_DEBUGLOGS) {
sendOutgoingMessage("fetch debug data", fileTransferHandler.initiateDebugDownload());
addFileToDownloadList(fileTransferHandler.getDeviceXmlDirectoryEntry());
processDownloadQueue();
return;
}
@@ -754,6 +754,8 @@ public class GarminSupport extends AbstractBTLESingleDeviceSupport implements IC
private void processDownloadQueue() {
if (!filesToDownload.isEmpty() && currentlyDownloading == null) {
if (!gbDevice.isBusy()) {
LOG.debug("Starting download queue");
isBusyFetching = true;
transferNotification.start(
R.string.busy_task_fetch_activity_data,
@@ -797,6 +799,8 @@ public class GarminSupport extends AbstractBTLESingleDeviceSupport implements IC
).build()
)
);
} else {
LOG.error("Unexpected FileToDownload");
}
return;