Merge branch 'master' into develop-thermostat-tile

home-assistant · Jan 10, 2025 · 01215ad · 01215ad
2 parents e395ce5 + 2a9dab5
commit 01215ad
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 50 deletions.
diff --git a/.github/workflows/onPush.yml b/.github/workflows/onPush.yml
@@ -91,7 +91,7 @@ jobs:
 
       - name: Create Github Pre-Release
         if: github.event.inputs.beta == 'true'
-        uses: softprops/action-gh-release@v2.1.0
+        uses: softprops/action-gh-release@v2.2.1
         with:
           tag_name: ${{ steps.rel_number.outputs.version }}
           body_path: ./app/build/outputs/changelogGithub

diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
@@ -6,7 +6,7 @@
     <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_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" />-->
@@ -15,9 +15,9 @@
 <!--    <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_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" />-->
@@ -27,10 +27,10 @@
 <!--    <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_STEPS" />
+    <uses-permission android:name="android.permission.health.READ_TOTAL_CALORIES_BURNED" />
+    <uses-permission android:name="android.permission.health.READ_VO2_MAX" />
 <!--    <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/full/java/io/homeassistant/companion/android/sensors/HealthConnectSensorManager.kt b/app/src/full/java/io/homeassistant/companion/android/sensors/HealthConnectSensorManager.kt
@@ -927,31 +927,31 @@ class HealthConnectSensorManager : SensorManager {
         return if (hasSensor(context)) {
             listOf(
                 activeCaloriesBurned,
-                basalBodyTemperature,
-                basalMetabolicRate,
-                bloodGlucose,
-                bodyFat,
-                bodyWaterMass,
-                bodyTemperature,
-                boneMass,
-                diastolicBloodPressure,
+//                basalBodyTemperature,
+//                basalMetabolicRate,
+//                bloodGlucose,
+//                bodyFat,
+//                bodyWaterMass,
+//                bodyTemperature,
+//                boneMass,
+//                diastolicBloodPressure,
                 distance,
                 elevationGained,
                 floorsClimbed,
-                heartRate,
-                heartRateVariability,
-                height,
-                hydration,
-                leanBodyMass,
-                oxygenSaturation,
-                respiratoryRate,
-                restingHeartRate,
-                sleepDuration,
+//                heartRate,
+//                heartRateVariability,
+//                height,
+//                hydration,
+//                leanBodyMass,
+//                oxygenSaturation,
+//                respiratoryRate,
+//                restingHeartRate,
+//                sleepDuration,
                 steps,
-                systolicBloodPressure,
+//                systolicBloodPressure,
                 totalCaloriesBurned,
-                vo2Max,
-                weight
+                vo2Max
+//                weight
             )
         } else {
             emptyList()

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
@@ -66,7 +66,7 @@ class SensorReceiver : SensorReceiverBase() {
             DynamicColorSensorManager(),
             DevicePolicyManager(),
             GeocodeSensorManager(),
-//            HealthConnectSensorManager(),
+            HealthConnectSensorManager(),
             KeyguardSensorManager(),
             LastAppSensorManager(),
             LastRebootSensorManager(),

diff --git a/app/src/main/java/io/homeassistant/companion/android/settings/SettingsFragment.kt b/app/src/main/java/io/homeassistant/companion/android/settings/SettingsFragment.kt
@@ -176,6 +176,8 @@ class SettingsFragment(
         val isAutomotive =
             Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && requireContext().packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)
 
+        findPreference<PreferenceCategory>("assist")?.isVisible = !isAutomotive
+
         findPreference<PreferenceCategory>("widgets")?.isVisible = Build.MODEL != "Quest" && !isAutomotive
         findPreference<Preference>("manage_widgets")?.setOnPreferenceClickListener {
             parentFragmentManager.commit {

diff --git a/app/src/main/java/io/homeassistant/companion/android/settings/SettingsPresenterImpl.kt b/app/src/main/java/io/homeassistant/companion/android/settings/SettingsPresenterImpl.kt
@@ -257,7 +257,13 @@ class SettingsPresenterImpl @Inject constructor(
 
         // Assist
         var assistantSuggestion = serverManager.defaultServers.any { it.version?.isAtLeast(2023, 5) == true }
-        assistantSuggestion = if (assistantSuggestion && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        assistantSuggestion = if (
+            assistantSuggestion &&
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
+            context.packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)
+        ) {
+            false
+        } else if (assistantSuggestion && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             val roleManager = context.getSystemService<RoleManager>()
             roleManager?.isRoleAvailable(RoleManager.ROLE_ASSISTANT) == true && !roleManager.isRoleHeld(RoleManager.ROLE_ASSISTANT)
         } else if (assistantSuggestion && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {

diff --git a/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
@@ -1473,7 +1473,7 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi
 
         if (!httpAuth?.host.isNullOrBlank()) {
             if (!authError) {
-                handler.proceed(httpAuth?.username, httpAuth?.password)
+                handler.proceed(httpAuth.username, httpAuth.password)
                 autoAuth = true
                 firstAuthTime = System.currentTimeMillis()
             }
@@ -1488,6 +1488,7 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi
             }
         }
         if (!autoAuth || authError) {
+            isShowingError = true
             AlertDialog.Builder(this, R.style.Authentication_Dialog)
                 .setTitle(commonR.string.auth_request)
                 .setMessage(message)
@@ -1528,6 +1529,10 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi
                     Toast.makeText(applicationContext, commonR.string.auth_cancel, Toast.LENGTH_SHORT)
                         .show()
                 }
+                .setOnDismissListener {
+                    isShowingError = false
+                    waitForConnection()
+                }
                 .show()
         }
     }

diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="MissingDefaultResource">
-    <release version="2025.1.1 - Main" versioncode="3">
-<!--        <change>Android 9+ and Play Store: Add Health Connect sensors</change>-->
+    <release version="2025.1.2 - 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>Add support for humidifier, media player, number and remote in device controls</change>
         <change>Bug fixes and dependency updates</change>
     </release>
-    <release version="2025.1.1 - Wear" versioncode="2">
+    <release version="2025.1.2 - Wear" versioncode="2">
         <change>Bug fixes and dependency updates</change>
     </release>
-    <release version="2025.1.1 - Automotive" versioncode="1">
+    <release version="2025.1.2 - 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>

diff --git a/automotive/src/main/AndroidManifest.xml b/automotive/src/main/AndroidManifest.xml
@@ -423,20 +423,7 @@
             android:autoRemoveFromRecents="true"
             android:showWhenLocked="true"
             android:theme="@style/Theme.HomeAssistant.Assist">
-            <intent-filter>
-                <action android:name="android.intent.action.ASSIST" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
         </activity>
-        <activity-alias
-            android:name=".assist.VoiceCommandIntentActivity"
-            android:targetActivity=".assist.AssistActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.VOICE_COMMAND" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity-alias>
 
         <provider
             android:name="androidx.core.content.FileProvider"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 activity-compose = "1.9.3"
 androidBeaconLibrary = "2.20.7"
-androidPlugin = "8.7.3"
+androidPlugin = "8.8.0"
 androidSdk-compile = "35"
 androidSdk-min = "21"
 androidSdk-target = "34"
@@ -27,7 +27,7 @@ fragment-ktx = "1.8.5"
 googleServices = "4.4.2"
 guava = "33.4.0-android"
 healthServicesClient = "1.1.0-alpha04"
-hilt = "2.54"
+hilt = "2.55"
 iconics = "5.4.0"
 improv = "0.1.1"
 jackson-module-kotlin = "2.13.5"