Huawei: Add ActivityTrackProvider

2026-07-31 07:44:24 +02:00 · 2026-03-21 21:55:04 +00:00
parent a7b432c4b0
commit 32d5bbc1c6
9 changed files with 240 additions and 31 deletions
@@ -0,0 +1,38 @@
+/*  Copyright (C) 2026 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.database.schema;
+
+import android.database.sqlite.SQLiteDatabase;
+
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.database.DBUpdateScript;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySampleDao;
+
+public class GadgetbridgeUpdate_129 implements DBUpdateScript {
+    @Override
+    public void upgradeSchema(final SQLiteDatabase db) {
+        if (!DBHelper.existsColumn(HuaweiWorkoutSummarySampleDao.TABLENAME, HuaweiWorkoutSummarySampleDao.Properties.RawGpsFileLocation.columnName, db)) {
+            final String statement = "ALTER TABLE " + HuaweiWorkoutSummarySampleDao.TABLENAME + " ADD COLUMN \""
+                    + HuaweiWorkoutSummarySampleDao.Properties.RawGpsFileLocation.columnName + "\" TEXT";
+            db.execSQL(statement);
+        }
+    }
+
+    @Override
+    public void downgradeSchema(final SQLiteDatabase db) {
+    }
+}
@@ -68,6 +68,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySampleD
 import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSwimSegmentsSampleDao;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryParser;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityTrackProvider;
 import nodomain.freeyourgadget.gadgetbridge.model.HrvSummarySample;
 import nodomain.freeyourgadget.gadgetbridge.model.HrvValueSample;
 import nodomain.freeyourgadget.gadgetbridge.model.SleepScoreSample;
@@ -75,6 +76,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
 import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
 import nodomain.freeyourgadget.gadgetbridge.model.TemperatureSample;
 import nodomain.freeyourgadget.gadgetbridge.model.heartratezones.HeartRateZonesSpec;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiActivityTrackProvider;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiWorkoutGbParser;

 public abstract class HuaweiCoordinator extends AbstractDeviceCoordinator {
@@ -383,6 +385,11 @@ public abstract class HuaweiCoordinator extends AbstractDeviceCoordinator {
        return new HuaweiWorkoutGbParser(device, context);
    }

+    @Override
+    public ActivityTrackProvider getActivityTrackProvider(@NonNull final GBDevice device, @NonNull final Context context) {
+        return new HuaweiActivityTrackProvider(device);
+    }
+
    @Override
    public SampleProvider<? extends AbstractActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
        return new HuaweiSampleProvider(device, session);
@@ -22,6 +22,10 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;

+import nodomain.freeyourgadget.gadgetbridge.model.ActivityPoint;
+import nodomain.freeyourgadget.gadgetbridge.model.GPSCoordinate;
+import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
+
 public class HuaweiGpsParser {

    public static class GpsPoint {
@@ -44,6 +48,20 @@ public class HuaweiGpsParser {
                    ", altitude=" + altitude +
                    '}';
        }
+
+        @NonNull
+        public ActivityPoint toActivityPoint() {
+            final GPSCoordinate coordinate;
+            if (altitudeSupported)
+                coordinate = new GPSCoordinate(longitude, latitude, altitude);
+            else
+                coordinate = new GPSCoordinate(longitude, latitude);
+
+            final ActivityPoint activityPoint = new ActivityPoint();
+            activityPoint.setTime(DateTimeUtils.parseTimeStamp(timestamp));
+            activityPoint.setLocation(coordinate);
+            return activityPoint;
+        }
    }

    public static GpsPoint[] parseHuaweiGps(byte[] data) {
@@ -16,9 +16,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei;

+import androidx.annotation.Nullable;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import java.io.File;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
@@ -457,7 +460,7 @@ public class HuaweiTruSleepParser {
        }

        @Override
-        public void downloadComplete(HuaweiFileDownloadManager.FileRequest fileRequest) {
+        public void downloadComplete(HuaweiFileDownloadManager.FileRequest fileRequest, @Nullable File localRawFile) {
            if (fileRequest.getFileType() == HuaweiFileDownloadManager.FileType.SLEEP_STATE) {
                statusData = fileRequest.getData();
                statusSynced = true;
@@ -0,0 +1,99 @@
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import de.greenrobot.dao.query.QueryBuilder;
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiGpsParser;
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.User;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityPoint;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityTrack;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityTrackProvider;
+import nodomain.freeyourgadget.gadgetbridge.model.GpxActivityTrackProvider;
+import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
+
+@SuppressWarnings("ClassCanBeRecord")
+public class HuaweiActivityTrackProvider implements ActivityTrackProvider {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiActivityTrackProvider.class);
+
+    private final GBDevice gbDevice;
+
+    public HuaweiActivityTrackProvider(final GBDevice gbDevice) {
+        this.gbDevice = gbDevice;
+    }
+
+    @Nullable
+    @Override
+    public ActivityTrack getActivityTrack(@NonNull final BaseActivitySummary summary) {
+        // Find the existing HuaweiWorkoutSummarySample
+        final HuaweiWorkoutSummarySample huaweiWorkoutSummarySample;
+        try (DBHandler db = GBApplication.acquireDB()) {
+            final DaoSession session = db.getDaoSession();
+            final Device device = DBHelper.getDevice(gbDevice, session);
+            final User user = DBHelper.getUser(session);
+
+            QueryBuilder<HuaweiWorkoutSummarySample> qb = session.getHuaweiWorkoutSummarySampleDao().queryBuilder();
+            qb.where(HuaweiWorkoutSummarySampleDao.Properties.StartTimestamp.eq(summary.getStartTime().getTime() / 1000));
+            qb.where(HuaweiWorkoutSummarySampleDao.Properties.DeviceId.eq(device.getId()));
+            qb.where(HuaweiWorkoutSummarySampleDao.Properties.UserId.eq(user.getId()));
+            final List<HuaweiWorkoutSummarySample> huaweiSummaries = qb.build().list();
+            if (huaweiSummaries.isEmpty()) {
+                LOG.warn("Failed to find huawei summary for {}", summary.getId());
+                return new GpxActivityTrackProvider().getActivityTrack(summary);
+            }
+
+            huaweiWorkoutSummarySample = huaweiSummaries.get(0);
+        } catch (Exception e) {
+            LOG.error("Failed to get huawei summary");
+            return new GpxActivityTrackProvider().getActivityTrack(summary);
+        }
+
+        final String rawGpsFileLocation = huaweiWorkoutSummarySample.getRawGpsFileLocation();
+        final File rawGpsFile = FileUtils.tryFixPath(rawGpsFileLocation);
+        if (rawGpsFile == null) {
+            LOG.debug("Raw gps file not found: {}", rawGpsFileLocation);
+            return new GpxActivityTrackProvider().getActivityTrack(summary);
+        }
+
+        LOG.debug("Loading gps points from {}", rawGpsFileLocation);
+
+        final byte[] rawGpsBytes;
+        try {
+            rawGpsBytes = FileUtils.readAll(rawGpsFile);
+        } catch (final IOException e) {
+            LOG.error("Failed to read raw gps bytes from {}", rawGpsFile, e);
+            return new GpxActivityTrackProvider().getActivityTrack(summary);
+        }
+        try {
+            final HuaweiGpsParser.GpsPoint[] gpsPoints = HuaweiGpsParser.parseHuaweiGps(rawGpsBytes);
+            final List<ActivityPoint> activityPoints = Arrays.stream(gpsPoints)
+                    .map(HuaweiGpsParser.GpsPoint::toActivityPoint).collect(Collectors.toList());
+
+            final ActivityTrack activityTrack = new ActivityTrack();
+            activityTrack.setName(summary.getName());
+            activityTrack.addTrackPoints(activityPoints);
+            return activityTrack;
+        } catch (final Exception e) {
+            LOG.error("Failed to parse Huawei GpsPoints", e);
+            return new GpxActivityTrackProvider().getActivityTrack(summary);
+        }
+    }
+}
@@ -130,7 +130,7 @@ public class HuaweiFileDownloadManager {
    }

    public static class FileDownloadCallback {
-        public void downloadComplete(FileRequest fileRequest) {
+        public void downloadComplete(FileRequest fileRequest, @Nullable File localRawFile) {
        }

        public void downloadException(HuaweiFileDownloadException e) {
@@ -815,35 +815,39 @@ public class HuaweiFileDownloadManager {
        } // Else we're expecting more data to arrive automatically
    }

-    private void saveRawFileData(FileRequest fileRequest) {
+    @Nullable
+    private File saveRawFileData(FileRequest fileRequest) {
        boolean saveRawFilesEnabled = GBApplication
                .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
                .getBoolean(DeviceSettingsPreferenceConst.PREF_HUAWEI_SAVE_RAW_FILES, false);
-        if (!saveRawFilesEnabled)
-            return;
+        if (fileRequest.fileType != FileType.GPS && !saveRawFilesEnabled)
+            return null;

        try {
            String filename = FileUtils.makeValidFileName(System.currentTimeMillis() + "_" + fileRequest.getFileId() + "_" + fileRequest.getFilename());
-            File dir = new File(supportProvider.getDevice().getDeviceCoordinator().getWritableExportDirectory(supportProvider.getDevice(), true) + File.separator + "raw");
-            if (!dir.isDirectory()) {
-                if (!dir.mkdir()) {
+            final File writableExportDirectory = supportProvider.getDevice().getDeviceCoordinator().getWritableExportDirectory(supportProvider.getDevice(), true);
+            File rawDir = new File(writableExportDirectory, "raw");
+            File typeDir = new File(rawDir, fileRequest.fileType.name());
+            if (!typeDir.isDirectory()) {
+                if (!typeDir.mkdirs()) {
                    LOG.error("Error save raw file");
-                    return;
+                    return null;
                }
            }

            File targetFile = new File(
-                    dir,
+                    typeDir,
                    filename
            );
            try (FileOutputStream fos = new FileOutputStream(targetFile)) {
                fos.write(fileRequest.getData());
            }
            LOG.info("RAW file saved to: {}", targetFile.getAbsolutePath());
+            return targetFile;
        } catch (IOException e) {
            LOG.error("Could save RAW file", e);
+            return null;
        }
-
    }

    private void fileComplete() {
@@ -887,16 +891,16 @@ public class HuaweiFileDownloadManager {

        // Handle file data

+        final File rawFileData = saveRawFileData(currentFileRequest);
+
        try {
-            currentFileRequest.fileDownloadCallback.downloadComplete(currentFileRequest);
+            currentFileRequest.fileDownloadCallback.downloadComplete(currentFileRequest, rawFileData);
        } catch (Exception e) {
            LOG.error("Download complete callback exception.", e);
            LOG.warn("File contents: {}", GB.hexdump(currentFileRequest.getData()));
            GB.toast("Workout GPX file could not be parsed.", Toast.LENGTH_SHORT, GB.ERROR, e);
        }

-        saveRawFileData(currentFileRequest);
-
        if (!this.currentFileRequest.newSync && !this.fileRequests.isEmpty() && !this.fileRequests.get(0).newSync) {
            // Old sync can potentially take a shortcut
            if (arrayContains(this.currentFileRequest.filenames, this.fileRequests.get(0).filename)) {
@@ -34,6 +34,7 @@ import android.text.TextUtils;
 import android.widget.Toast;

 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;

 import org.slf4j.Logger;
@@ -2093,7 +2094,8 @@ public class HuaweiSupportProvider {
                    packet.trainingPoints,
                    packet.longestStreak,
                    packet.tripped,
-                    getDeviceState().isSupportsWorkoutNewSteps()
+                    getDeviceState().isSupportsWorkoutNewSteps(),
+                    null
            );

            db.getDaoSession().getHuaweiWorkoutSummarySampleDao().insertOrReplace(summarySample);
@@ -2970,7 +2972,7 @@ public class HuaweiSupportProvider {
    public void deviceFileDownloadRequest(String filename, byte fileType, byte fileId, int fileSize, String srcPackage, String dstPackage, String srcFingerprint, String dstFingerprint) {
        HuaweiFileDownloadManager.FileRequest request = HuaweiFileDownloadManager.FileRequest.IncomingFileRequest(filename, new HuaweiFileDownloadManager.FileDownloadCallback() {
            @Override
-            public void downloadComplete(HuaweiFileDownloadManager.FileRequest fileRequest) {
+            public void downloadComplete(HuaweiFileDownloadManager.FileRequest fileRequest, @Nullable File localRawFile) {
                LOG.info("Download file: {}", fileRequest.getFilename());
                huaweiP2PManager.handleFile(fileRequest.getSrcPackage(), fileRequest.getDstPackage(), fileRequest.getSrcFingerprint(), fileRequest.getDstFingerprint(), fileRequest.getFilename(), fileRequest.getData());
            }
@@ -3007,7 +3009,7 @@ public class HuaweiSupportProvider {
                HuaweiDictTypes.SLEEP_DETAILS_CLASS,
                new HuaweiFileDownloadManager.FileDownloadCallback() {
                    @Override
-                    public void downloadComplete(HuaweiFileDownloadManager.FileRequest fileRequest) {
+                    public void downloadComplete(HuaweiFileDownloadManager.FileRequest fileRequest, @Nullable File localRawFile) {
                        HuaweiSequenceDataFileParser.SequenceFileData sequenceFileData = HuaweiSequenceDataFileParser.parseSequenceFileData(fileRequest.getData());
                        LOG.info("SLEEP File data: {}", sequenceFileData);

@@ -3169,7 +3171,7 @@ public class HuaweiSupportProvider {
                end,
                new HuaweiFileDownloadManager.FileDownloadCallback() {
                    @Override
-                    public void downloadComplete(HuaweiFileDownloadManager.FileRequest fileRequest) {
+                    public void downloadComplete(HuaweiFileDownloadManager.FileRequest fileRequest, @Nullable File localRawFile) {
                        if (fileRequest.getData().length != 0) {
                            LOG.debug("Parsing stress file");
                            HuaweiStressParser.RriFileData results = HuaweiStressParser.parseRri(fileRequest.getData());
@@ -3213,7 +3215,7 @@ public class HuaweiSupportProvider {
                end,
                new HuaweiFileDownloadManager.FileDownloadCallback() {
                    @Override
-                    public void downloadComplete(HuaweiFileDownloadManager.FileRequest fileRequest) {
+                    public void downloadComplete(HuaweiFileDownloadManager.FileRequest fileRequest, @Nullable File localRawFile) {
                        if (fileRequest.getData().length != 0) {
                            LOG.debug("Parsing ECG file");

@@ -3276,7 +3278,7 @@ public class HuaweiSupportProvider {
                databaseId,
                new HuaweiFileDownloadManager.FileDownloadCallback() {
                    @Override
-                    public void downloadComplete(HuaweiFileDownloadManager.FileRequest fileRequest) {
+                    public void downloadComplete(HuaweiFileDownloadManager.FileRequest fileRequest, @Nullable File localRawFile) {
                        if (fileRequest.getData().length == 0) {
                            LOG.debug("PDR file empty");
                            return;
@@ -3306,7 +3308,7 @@ public class HuaweiSupportProvider {
                databaseId,
                new HuaweiFileDownloadManager.FileDownloadCallback() {
                    @Override
-                    public void downloadComplete(HuaweiFileDownloadManager.FileRequest fileRequest) {
+                    public void downloadComplete(HuaweiFileDownloadManager.FileRequest fileRequest, @Nullable File localRawFile) {
                        extraCallbackAction.run();

                        if (fileRequest.getData().length == 0) {
@@ -3315,6 +3317,29 @@ public class HuaweiSupportProvider {
                            return;
                        }

+                        Long databaseId = fileRequest.getDatabaseId();
+                        if (databaseId == null) {
+                            GB.toast(context, "Cannot link GPX to workout", Toast.LENGTH_SHORT, GB.ERROR);
+                            LOG.error("Cannot link GPX to workout");
+                            syncState.stopWorkoutGpsDownload();
+                            return;
+                        }
+
+                        // Link the raw file to the workout right away
+                        if (localRawFile != null) {
+                            try (DBHandler db = GBApplication.acquireDB()) {
+                                DaoSession daoSession = db.getDaoSession();
+                                HuaweiWorkoutSummarySample sample = daoSession.getHuaweiWorkoutSummarySampleDao().load(databaseId);
+                                sample.setRawGpsFileLocation(localRawFile.getAbsolutePath());
+                                sample.update();
+                            } catch (Exception e) {
+                                GB.toast(context, "Failed to save Workout raw file location", Toast.LENGTH_SHORT, GB.ERROR, e);
+                                LOG.error("Failed to save Workout raw file location", e);
+                                syncState.stopWorkoutGpsDownload();
+                                return;
+                            }
+                        }
+
                        LOG.debug("Parsing GPS file");

                        HuaweiGpsParser.GpsPoint[] points = HuaweiGpsParser.parseHuaweiGps(fileRequest.getData());
@@ -3378,14 +3403,6 @@ public class HuaweiSupportProvider {
                            return;
                        }

-                        Long databaseId = fileRequest.getDatabaseId();
-                        if (databaseId == null) {
-                            GB.toast(context, "Cannot link GPX to workout", Toast.LENGTH_SHORT, GB.ERROR);
-                            LOG.error("Cannot link GPX to workout");
-                            syncState.stopWorkoutGpsDownload();
-                            return;
-                        }
-
                        try (DBHandler db = GBApplication.acquireDB()) {
                            DaoSession daoSession = db.getDaoSession();
                            HuaweiWorkoutSummarySample sample = daoSession.getHuaweiWorkoutSummarySampleDao().load(databaseId);
@@ -214,8 +214,28 @@ public class HuaweiWorkoutGbParser implements ActivitySummaryParser {
    @Override
    public nodomain.freeyourgadget.gadgetbridge.model.workout.Workout parseWorkout(BaseActivitySummary summary, final boolean forDetails) {
        if (!forDetails) {
+            final ActivitySummaryData activitySummaryData = ActivitySummaryData.fromJson(summary.getSummaryData());
+            if (summary.getGpxTrack() == null) {
+                // Quickly check and update whether the activity has gps
+                try (DBHandler db = GBApplication.acquireDB()) {
+                    final DaoSession session = db.getDaoSession();
+                    final Device device = DBHelper.getDevice(gbDevice, session);
+                    final User user = DBHelper.getUser(session);
+                    final QueryBuilder<HuaweiWorkoutSummarySample> qb = session.getHuaweiWorkoutSummarySampleDao().queryBuilder();
+                    qb.where(HuaweiWorkoutSummarySampleDao.Properties.StartTimestamp.eq(summary.getStartTime().getTime() / 1000));
+                    qb.where(HuaweiWorkoutSummarySampleDao.Properties.DeviceId.eq(device.getId()));
+                    qb.where(HuaweiWorkoutSummarySampleDao.Properties.UserId.eq(user.getId()));
+                    final List<HuaweiWorkoutSummarySample> huaweiSummaries = qb.build().list();
+                    if (!huaweiSummaries.isEmpty()) {
+                        activitySummaryData.setHasGps(huaweiSummaries.get(0).getRawGpsFileLocation() != null);
+                    }
+                } catch (Exception e) {
+                    LOG.error("Failed to check whether activity has gps");
+                }
+            }
+
            // Our parsing is too slow, especially without a RecyclerView
-            return new nodomain.freeyourgadget.gadgetbridge.model.workout.Workout(summary, ActivitySummaryData.fromJson(summary.getSummaryData()));
+            return new nodomain.freeyourgadget.gadgetbridge.model.workout.Workout(summary, activitySummaryData);
        }

        // Find the existing HuaweiWorkoutSummarySample
@@ -639,6 +659,7 @@ public class HuaweiWorkoutGbParser implements ActivitySummaryParser {
                                                 final List<HuaweiActivityPoint> activityPoints) {

        ActivitySummaryData summaryData = new ActivitySummaryData();
+        summaryData.setHasGps(summary.getRawGpsFileLocation() != null);

        try {