From c67da1b2759e670a3167fc3d66b8c1afb616e82f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 26 Dec 2025 19:58:36 +0000
Subject: [PATCH] Garmin: Fix XML download progress notification

---
 .../service/devices/garmin/FileTransferHandler.java  |  6 ++----
 .../service/devices/garmin/GarminSupport.java        | 12 ++++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileTransferHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileTransferHandler.java
index fe0be21589..f78f318f09 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileTransferHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/FileTransferHandler.java
@@ -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() {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/GarminSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/GarminSupport.java
index 283a84c991..f32fc047bc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/GarminSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/GarminSupport.java
@@ -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;