From d3103400fcade9ee6e1fa28f666abad5ed089b55 Mon Sep 17 00:00:00 2001 From: Vitaliy Tomin Date: Sat, 30 Aug 2025 14:51:49 +0800 Subject: [PATCH] igpsport: Add missing return after download data --- .../service/devices/igpsport/IGPSportDeviceSupport.java | 3 ++- .../service/devices/igpsport/IGPSportDownloadManager.java | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDeviceSupport.java index 9f4c2af990..3d15f3d531 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDeviceSupport.java @@ -286,6 +286,7 @@ public class IGPSportDeviceSupport extends AbstractBTLESingleDeviceSupport { if (characteristicUUID.compareTo(UUID_IGPSPORT_CHARACTERISTIC_THIRD_RX) == 0 ) { downloadManager.addData(value); } + return true; } if(partialPacketInProgress) { @@ -314,7 +315,7 @@ public class IGPSportDeviceSupport extends AbstractBTLESingleDeviceSupport { if ((value[0] == (byte) 0x01) && ( value[3] == (byte)0xff)) { int dataSize = ByteBuffer.wrap(value, 7, 2).getShort(); if (dataSize+DATA_HEADER_SIZE > value.length) { - LOG.info("Partial packet detected, creating buffer for it"); + LOG.info("Partial packet detected, creating buffer for it, buffer size: " + dataSize+DATA_HEADER_SIZE); partialPacketInProgress = true; partialBuffer = ByteBuffer.allocate(dataSize+DATA_HEADER_SIZE); partialBuffer.put(value); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDownloadManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDownloadManager.java index 6fa215029b..05462c7740 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDownloadManager.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDownloadManager.java @@ -189,13 +189,10 @@ public class IGPSportDownloadManager { } public Boolean needMoreData() { - if (!downloadInProgress) - return false; - if (recievingDataBuffer.size() < (downloadingFile.getFileSize() + 20 + 4 + pbSize)) { - return true; - } else { + if (!downloadInProgress) { return false; } + return recievingDataBuffer.size() < (downloadingFile.getFileSize() + 20 + 4 + pbSize); } public static class FileInfo {