HPlus: Fix deprecation warning

Freeyourgadget · Jan 10, 2017 · b92b1c0 · b92b1c0
1 parent 13ec497
commit b92b1c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
@@ -225,6 +225,7 @@ private static Entity addPebbleMorpheuzActivitySample(Schema schema, Entity user
 
     private static Entity addHPlusHealthActivitySample(Schema schema, Entity user, Entity device) {
         Entity activitySample = addEntity(schema, "HPlusHealthActivitySample");
+        activitySample.implementsSerializable();
         addCommonActivitySampleProperties("AbstractActivitySample", activitySample, user, device);
         activitySample.addByteArrayProperty("rawHPlusHealthData");
         activitySample.addIntProperty(SAMPLE_RAW_KIND).notNull().primaryKey();

diff --git a/...n/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusHandlerThread.java b/...n/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusHandlerThread.java
@@ -391,19 +391,12 @@ record = new HPlusDataRecordRealtime(data);
             sample.setRawHPlusHealthData(record.getRawData());
             sample.setProvider(provider);
 
-            if (sample.getSteps() != ActivitySample.NOT_MEASURED && sample.getSteps() - prevRealTimeRecord.steps > 0) {
-                Intent intent = new Intent(DeviceService.ACTION_REALTIME_STEPS)
-                        .putExtra(DeviceService.EXTRA_REALTIME_STEPS, sample.getSteps() - prevRealTimeRecord.steps)
-                        .putExtra(DeviceService.EXTRA_TIMESTAMP, System.currentTimeMillis());
-                LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
-            }
+            sample.setSteps(sample.getSteps() - prevRealTimeRecord.steps);
 
-            if (sample.getHeartRate() != ActivitySample.NOT_MEASURED) {
-                Intent intent = new Intent(DeviceService.ACTION_HEARTRATE_MEASUREMENT)
-                        .putExtra(DeviceService.EXTRA_HEART_RATE_VALUE, sample.getHeartRate())
-                        .putExtra(DeviceService.EXTRA_TIMESTAMP, System.currentTimeMillis());
-                LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
-            }
+            Intent intent = new Intent(DeviceService.ACTION_REALTIME_SAMPLES)
+                    .putExtra(DeviceService.EXTRA_REALTIME_SAMPLE, sample)
+                    .putExtra(DeviceService.EXTRA_TIMESTAMP, System.currentTimeMillis());
+            LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
 
             provider.addGBActivitySample(sample);