Skip to content

Commit f76bc6a

Browse files
jpelgromjpelgrom
authored
Fix casting for Health Connect buildReadRecordsRequest result (#4931)
1 parent 2c1a8f5 commit f76bc6a

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

‎app/src/full/java/io/homeassistant/companion/android/sensors/HealthConnectSensorManager.kt‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ class HealthConnectSensorManager : SensorManager {
471471

472472
private suspend fun updateActiveCaloriesBurnedSensor(context: Context) {
473473
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
474-
val activeCaloriesBurnedRequest = buildReadRecordsRequest(ActiveCaloriesBurnedRecord::class) as ReadRecordsRequest<ActiveCaloriesBurnedRecord>
474+
val activeCaloriesBurnedRequest = buildReadRecordsRequest(ActiveCaloriesBurnedRecord::class)
475475
val response = healthConnectClient.readRecordsOrNull(activeCaloriesBurnedRequest)
476476
if (response == null || response.records.isEmpty()) {
477477
return
@@ -490,7 +490,7 @@ class HealthConnectSensorManager : SensorManager {
490490

491491
private suspend fun updateBasalBodyTemperatureSensor(context: Context) {
492492
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
493-
val basalBodyTemperatureRequest = buildReadRecordsRequest(BasalBodyTemperatureRecord::class) as ReadRecordsRequest<BasalBodyTemperatureRecord>
493+
val basalBodyTemperatureRequest = buildReadRecordsRequest(BasalBodyTemperatureRecord::class)
494494
val response = healthConnectClient.readRecordsOrNull(basalBodyTemperatureRequest)
495495
if (response == null || response.records.isEmpty()) {
496496
return
@@ -509,7 +509,7 @@ class HealthConnectSensorManager : SensorManager {
509509

510510
private suspend fun updateBasalMetabolicRateSensor(context: Context) {
511511
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
512-
val basalMetabolicRateRequest = buildReadRecordsRequest(BasalMetabolicRateRecord::class) as ReadRecordsRequest<BasalMetabolicRateRecord>
512+
val basalMetabolicRateRequest = buildReadRecordsRequest(BasalMetabolicRateRecord::class)
513513
val response = healthConnectClient.readRecordsOrNull(basalMetabolicRateRequest)
514514
if (response == null || response.records.isEmpty()) {
515515
return
@@ -528,7 +528,7 @@ class HealthConnectSensorManager : SensorManager {
528528

529529
private suspend fun updateBloodGlucoseSensor(context: Context) {
530530
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
531-
val bloodGlucoseRequest = buildReadRecordsRequest(BloodGlucoseRecord::class) as ReadRecordsRequest<BloodGlucoseRecord>
531+
val bloodGlucoseRequest = buildReadRecordsRequest(BloodGlucoseRecord::class)
532532
val response = healthConnectClient.readRecordsOrNull(bloodGlucoseRequest)
533533
if (response == null || response.records.isEmpty()) {
534534
return
@@ -550,7 +550,7 @@ class HealthConnectSensorManager : SensorManager {
550550

551551
private suspend fun updateBloodPressureSensors(context: Context, isDiastolic: Boolean) {
552552
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
553-
val bloodPressureRequest = buildReadRecordsRequest(BloodPressureRecord::class) as ReadRecordsRequest<BloodPressureRecord>
553+
val bloodPressureRequest = buildReadRecordsRequest(BloodPressureRecord::class)
554554
val response = healthConnectClient.readRecordsOrNull(bloodPressureRequest)
555555
if (response == null || response.records.isEmpty()) {
556556
return
@@ -571,7 +571,7 @@ class HealthConnectSensorManager : SensorManager {
571571

572572
private suspend fun updateBodyFatSensor(context: Context) {
573573
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
574-
val bodyFatRequest = buildReadRecordsRequest(BodyFatRecord::class) as ReadRecordsRequest<BodyFatRecord>
574+
val bodyFatRequest = buildReadRecordsRequest(BodyFatRecord::class)
575575
val response = healthConnectClient.readRecordsOrNull(bodyFatRequest)
576576
if (response == null || response.records.isEmpty()) {
577577
return
@@ -590,7 +590,7 @@ class HealthConnectSensorManager : SensorManager {
590590

591591
private suspend fun updateBodyWaterMassSensor(context: Context) {
592592
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
593-
val bodyWaterMassRequest = buildReadRecordsRequest(BodyWaterMassRecord::class) as ReadRecordsRequest<BodyWaterMassRecord>
593+
val bodyWaterMassRequest = buildReadRecordsRequest(BodyWaterMassRecord::class)
594594
val response = healthConnectClient.readRecordsOrNull(bodyWaterMassRequest)
595595
if (response == null || response.records.isEmpty()) {
596596
return
@@ -609,7 +609,7 @@ class HealthConnectSensorManager : SensorManager {
609609

610610
private suspend fun updateBodyTemperatureSensor(context: Context) {
611611
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
612-
val bodyTemperatureRequest = buildReadRecordsRequest(BodyTemperatureRecord::class) as ReadRecordsRequest<BodyTemperatureRecord>
612+
val bodyTemperatureRequest = buildReadRecordsRequest(BodyTemperatureRecord::class)
613613
val response = healthConnectClient.readRecordsOrNull(bodyTemperatureRequest)
614614
if (response == null || response.records.isEmpty()) {
615615
return
@@ -629,7 +629,7 @@ class HealthConnectSensorManager : SensorManager {
629629

630630
private suspend fun updateBoneMassSensor(context: Context) {
631631
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
632-
val boneMassRequest = buildReadRecordsRequest(BoneMassRecord::class) as ReadRecordsRequest<BoneMassRecord>
632+
val boneMassRequest = buildReadRecordsRequest(BoneMassRecord::class)
633633
val response = healthConnectClient.readRecordsOrNull(boneMassRequest)
634634
if (response == null || response.records.isEmpty()) {
635635
return
@@ -687,7 +687,7 @@ class HealthConnectSensorManager : SensorManager {
687687

688688
private suspend fun updateHeartRateSensor(context: Context) {
689689
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
690-
val heartRateRequest = buildReadRecordsRequest(HeartRateRecord::class) as ReadRecordsRequest<HeartRateRecord>
690+
val heartRateRequest = buildReadRecordsRequest(HeartRateRecord::class)
691691
val response = healthConnectClient.readRecordsOrNull(heartRateRequest)
692692
if (response == null || response.records.isEmpty() || response.records.last().samples.isEmpty()) {
693693
return
@@ -706,7 +706,7 @@ class HealthConnectSensorManager : SensorManager {
706706

707707
private suspend fun updateHeartRateVariabilitySensor(context: Context) {
708708
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
709-
val heartRateVariabilityRequest = buildReadRecordsRequest(HeartRateVariabilityRmssdRecord::class) as ReadRecordsRequest<HeartRateVariabilityRmssdRecord>
709+
val heartRateVariabilityRequest = buildReadRecordsRequest(HeartRateVariabilityRmssdRecord::class)
710710
val response = healthConnectClient.readRecordsOrNull(heartRateVariabilityRequest)
711711
if (response == null || response.records.isEmpty()) {
712712
return
@@ -725,7 +725,7 @@ class HealthConnectSensorManager : SensorManager {
725725

726726
private suspend fun updateHeightSensor(context: Context) {
727727
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
728-
val heightRequest = buildReadRecordsRequest(HeightRecord::class) as ReadRecordsRequest<HeightRecord>
728+
val heightRequest = buildReadRecordsRequest(HeightRecord::class)
729729
val response = healthConnectClient.readRecordsOrNull(heightRequest)
730730
if (response == null || response.records.isEmpty()) {
731731
return
@@ -757,7 +757,7 @@ class HealthConnectSensorManager : SensorManager {
757757

758758
private suspend fun updateLeanBodyMassSensor(context: Context) {
759759
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
760-
val leanBodyMassRequest = buildReadRecordsRequest(LeanBodyMassRecord::class) as ReadRecordsRequest<LeanBodyMassRecord>
760+
val leanBodyMassRequest = buildReadRecordsRequest(LeanBodyMassRecord::class)
761761
val response = healthConnectClient.readRecordsOrNull(leanBodyMassRequest)
762762
if (response == null || response.records.isEmpty()) {
763763
return
@@ -776,7 +776,7 @@ class HealthConnectSensorManager : SensorManager {
776776

777777
private suspend fun updateOxygenSaturationSensor(context: Context) {
778778
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
779-
val oxygenSaturationRequest = buildReadRecordsRequest(OxygenSaturationRecord::class) as ReadRecordsRequest<OxygenSaturationRecord>
779+
val oxygenSaturationRequest = buildReadRecordsRequest(OxygenSaturationRecord::class)
780780
val response = healthConnectClient.readRecordsOrNull(oxygenSaturationRequest)
781781
if (response == null || response.records.isEmpty()) {
782782
return
@@ -795,7 +795,7 @@ class HealthConnectSensorManager : SensorManager {
795795

796796
private suspend fun updateRespiratoryRateSensor(context: Context) {
797797
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
798-
val respiratoryRateRequest = buildReadRecordsRequest(RespiratoryRateRecord::class) as ReadRecordsRequest<RespiratoryRateRecord>
798+
val respiratoryRateRequest = buildReadRecordsRequest(RespiratoryRateRecord::class)
799799
val response = healthConnectClient.readRecordsOrNull(respiratoryRateRequest)
800800
if (response == null || response.records.isEmpty()) {
801801
return
@@ -814,7 +814,7 @@ class HealthConnectSensorManager : SensorManager {
814814

815815
private suspend fun updateRestingHeartRateSensor(context: Context) {
816816
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
817-
val restingHeartRateRequest = buildReadRecordsRequest(RestingHeartRateRecord::class) as ReadRecordsRequest<RestingHeartRateRecord>
817+
val restingHeartRateRequest = buildReadRecordsRequest(RestingHeartRateRecord::class)
818818
val response = healthConnectClient.readRecordsOrNull(restingHeartRateRequest)
819819
if (response == null || response.records.isEmpty()) {
820820
return
@@ -833,7 +833,7 @@ class HealthConnectSensorManager : SensorManager {
833833

834834
private suspend fun updateSleepDurationSensor(context: Context) {
835835
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
836-
val sleepRequest = buildReadRecordsRequest(SleepSessionRecord::class) as ReadRecordsRequest<SleepSessionRecord>
836+
val sleepRequest = buildReadRecordsRequest(SleepSessionRecord::class)
837837
val sleepRecords = healthConnectClient.readRecordsOrNull(sleepRequest)
838838
if (sleepRecords == null || sleepRecords.records.isEmpty()) {
839839
return
@@ -882,7 +882,7 @@ class HealthConnectSensorManager : SensorManager {
882882

883883
private suspend fun updateVo2MaxSensor(context: Context) {
884884
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
885-
val vo2MaxRequest = buildReadRecordsRequest(Vo2MaxRecord::class) as ReadRecordsRequest<Vo2MaxRecord>
885+
val vo2MaxRequest = buildReadRecordsRequest(Vo2MaxRecord::class)
886886
val response = healthConnectClient.readRecordsOrNull(vo2MaxRequest)
887887
if (response == null || response.records.isEmpty()) {
888888
return
@@ -902,7 +902,7 @@ class HealthConnectSensorManager : SensorManager {
902902

903903
private suspend fun updateWeightSensor(context: Context) {
904904
val healthConnectClient = getOrCreateHealthConnectClient(context) ?: return
905-
val weightRequest = buildReadRecordsRequest(WeightRecord::class) as ReadRecordsRequest<WeightRecord>
905+
val weightRequest = buildReadRecordsRequest(WeightRecord::class)
906906
val response = healthConnectClient.readRecordsOrNull(weightRequest)
907907
if (response == null || response.records.isEmpty()) {
908908
return
@@ -1005,7 +1005,7 @@ class HealthConnectSensorManager : SensorManager {
10051005
)
10061006
}
10071007

1008-
private fun buildReadRecordsRequest(request: KClass<out Record>): ReadRecordsRequest<out Record> {
1008+
private fun <T : Record> buildReadRecordsRequest(request: KClass<T>): ReadRecordsRequest<T> {
10091009
return ReadRecordsRequest(
10101010
recordType = request,
10111011
timeRangeFilter = TimeRangeFilter.between(

0 commit comments

Comments
 (0)