diff --git a/.github/workflows/onPush.yml b/.github/workflows/onPush.yml
index d3d38ac46e0..b151933cecf 100644
--- 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
index 7069f101185..dc0e9364487 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -6,7 +6,7 @@
-
+
@@ -15,9 +15,9 @@
-
-
-
+
+
+
@@ -27,10 +27,10 @@
-
-
+
+
+
-
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
index 043e78341fa..70b233fa5b1 100644
--- 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
index 07cbc9dba25..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/java/io/homeassistant/companion/android/settings/SettingsFragment.kt b/app/src/main/java/io/homeassistant/companion/android/settings/SettingsFragment.kt
index a2e0ac6efe4..a0e0780efab 100644
--- 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("assist")?.isVisible = !isAutomotive
+
findPreference("widgets")?.isVisible = Build.MODEL != "Quest" && !isAutomotive
findPreference("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
index 5e8887fe0e6..f6967098ff8 100644
--- 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?.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
index a8502114490..59db9181fe1 100644
--- 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
index ff6eda63884..e215bb07f69 100755
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,16 +1,16 @@
-
-
+
+ Android 9+ and Play Store: Add Health Connect sensors
Add Ethernet and VPN to Home Network options for internal URL switching
Add support for humidifier, media player, number and remote in device controls
Bug fixes and dependency updates
-
+
Bug fixes and dependency updates
-
+
Add Ethernet and VPN to Home Network options for internal URL switching
Bug fixes and dependency updates
diff --git a/automotive/src/main/AndroidManifest.xml b/automotive/src/main/AndroidManifest.xml
index 24cb671d1a8..072720277e8 100644
--- 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">
-
-
-
-
-
-
-
-
-
-