From e427a5a1fa98ce3f16c12e0698515250a904417d Mon Sep 17 00:00:00 2001
From: Daniel Shokouhi <dshokouhi@gmail.com>
Date: Sat, 14 Dec 2024 09:57:33 -0800
Subject: [PATCH] Update change log week of 12/13 and re-enable health connect
 for approval (#4905)

* Update change log week of 12/13 and re-enable health connect for approval

* Reorder
---
 app/src/full/AndroidManifest.xml              | 50 +++++++++----------
 .../android/sensors/SensorReceiver.kt         |  2 +-
 app/src/main/res/xml/changelog_master.xml     | 16 +++---
 3 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
index 7069f101185..bfa1a297e54 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -6,31 +6,31 @@
     <uses-permission android:name="com.google.android.gms.permission.CAR_FUEL" />
     <uses-permission android:name="com.google.android.gms.permission.CAR_MILEAGE" />
     <uses-permission android:name="com.google.android.gms.permission.CAR_SPEED" />
-<!--    <uses-permission android:name="android.permission.health.READ_ACTIVE_CALORIES_BURNED" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_BASAL_BODY_TEMPERATURE" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_BASAL_METABOLIC_RATE" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_BLOOD_GLUCOSE" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_BLOOD_PRESSURE" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_BODY_FAT" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_BODY_WATER_MASS" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_BODY_TEMPERATURE" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_BONE_MASS" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_DISTANCE" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_ELEVATION_GAINED" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_FLOORS_CLIMBED" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_HEART_RATE" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_HEART_RATE_VARIABILITY" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_HEIGHT" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_HYDRATION" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_LEAN_BODY_MASS" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_OXYGEN_SATURATION" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_RESPIRATORY_RATE" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_RESTING_HEART_RATE" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_SLEEP" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_STEPS" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_TOTAL_CALORIES_BURNED" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_WEIGHT" />-->
-<!--    <uses-permission android:name="android.permission.health.READ_VO2_MAX" />-->
+    <uses-permission android:name="android.permission.health.READ_ACTIVE_CALORIES_BURNED" />
+    <uses-permission android:name="android.permission.health.READ_BASAL_BODY_TEMPERATURE" />
+    <uses-permission android:name="android.permission.health.READ_BASAL_METABOLIC_RATE" />
+    <uses-permission android:name="android.permission.health.READ_BLOOD_GLUCOSE" />
+    <uses-permission android:name="android.permission.health.READ_BLOOD_PRESSURE" />
+    <uses-permission android:name="android.permission.health.READ_BODY_FAT" />
+    <uses-permission android:name="android.permission.health.READ_BODY_WATER_MASS" />
+    <uses-permission android:name="android.permission.health.READ_BODY_TEMPERATURE" />
+    <uses-permission android:name="android.permission.health.READ_BONE_MASS" />
+    <uses-permission android:name="android.permission.health.READ_DISTANCE" />
+    <uses-permission android:name="android.permission.health.READ_ELEVATION_GAINED" />
+    <uses-permission android:name="android.permission.health.READ_FLOORS_CLIMBED" />
+    <uses-permission android:name="android.permission.health.READ_HEART_RATE" />
+    <uses-permission android:name="android.permission.health.READ_HEART_RATE_VARIABILITY" />
+    <uses-permission android:name="android.permission.health.READ_HEIGHT" />
+    <uses-permission android:name="android.permission.health.READ_HYDRATION" />
+    <uses-permission android:name="android.permission.health.READ_LEAN_BODY_MASS" />
+    <uses-permission android:name="android.permission.health.READ_OXYGEN_SATURATION" />
+    <uses-permission android:name="android.permission.health.READ_RESPIRATORY_RATE" />
+    <uses-permission android:name="android.permission.health.READ_RESTING_HEART_RATE" />
+    <uses-permission android:name="android.permission.health.READ_SLEEP" />
+    <uses-permission android:name="android.permission.health.READ_STEPS" />
+    <uses-permission android:name="android.permission.health.READ_TOTAL_CALORIES_BURNED" />
+    <uses-permission android:name="android.permission.health.READ_WEIGHT" />
+    <uses-permission android:name="android.permission.health.READ_VO2_MAX" />
 
     <queries>
         <!-- For GMS Core/Play service -->
diff --git a/app/src/main/java/io/homeassistant/companion/android/sensors/SensorReceiver.kt b/app/src/main/java/io/homeassistant/companion/android/sensors/SensorReceiver.kt
index c996fc3b6e0..8a601944f31 100644
--- a/app/src/main/java/io/homeassistant/companion/android/sensors/SensorReceiver.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/sensors/SensorReceiver.kt
@@ -66,7 +66,7 @@ class SensorReceiver : SensorReceiverBase() {
             DynamicColorSensorManager(),
             DevicePolicyManager(),
             GeocodeSensorManager(),
-            // HealthConnectSensorManager(),
+            HealthConnectSensorManager(),
             KeyguardSensorManager(),
             LastAppSensorManager(),
             LastRebootSensorManager(),
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index d0f5572c6d7..0b5d5832a90 100755
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="MissingDefaultResource">
-    <release version="2024.12.1 - Main" versioncode="3">
-        <change>Android Auto: Add new Car sensors, support toggling fans and add refresh button</change>
-<!--        <change>Android 9+ and Play Store: Add Health Connect sensors</change>-->
-        <change>Add notification command to control flashlight</change>
-        <change>Add notification support for showing progress</change>
-        <change>Add support to identify multiple notification reply actions</change>
+    <release version="2024.12.3 - Main" versioncode="3">
+        <change>Android 9+ and Play Store: Add Health Connect sensors</change>
+        <change>Add Ethernet and VPN to Home Network options for internal URL switching</change>
         <change>Bug fixes and dependency updates</change>
     </release>
-    <release version="2024.12.1 - Wear" versioncode="2">
+    <release version="2024.12.3 - Wear" versioncode="2">
         <change>Bug fixes and dependency updates</change>
     </release>
-    <release version="2024.12.1 - Automotive" versioncode="1">
-        <change>Add new Car sensors</change>
-        <change>Driving Interface: Add support for toggling fans and refresh button</change>
+    <release version="2024.12.3 - Automotive" versioncode="1">
+        <change>Add Ethernet and VPN to Home Network options for internal URL switching</change>
         <change>Bug fixes and dependency updates</change>
     </release>
 </changelog>
\ No newline at end of file