mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-07-22 10:54:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hide a few GMS features unavailable on Automotive (#3623)

Browse source
This commit is contained in:
Joris Pelgröm 2023-07-01 00:26:20 +02:00 committed by GitHub
parent b0a7641a1a
commit 8dbdfebb7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/full/java/io/homeassistant/companion/android/matter/MatterManagerImpl.kt
View file

@ -3,6 +3,7 @@ package io.homeassistant.companion.android.matter
import android.content.ComponentName
import android.content.Context
import android.content.IntentSender
import android.content.pm.PackageManager
import android.os.Build
import android.util.Log
import com.google.android.gms.home.matter.Matter
@ -12,7 +13,8 @@ import io.homeassistant.companion.android.common.data.websocket.impl.entities.Ma
import javax.inject.Inject
class MatterManagerImpl @Inject constructor(
private val serverManager: ServerManager
private val serverManager: ServerManager,
private val packageManager: PackageManager
) : MatterManager {
companion object {
@ -20,7 +22,7 @@ class MatterManagerImpl @Inject constructor(
}
override fun appSupportsCommissioning(): Boolean =
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 && !packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)
override suspend fun coreSupportsCommissioning(serverId: Int): Boolean {
if (!serverManager.isRegistered() || serverManager.getServer(serverId)?.user?.isAdmin != true) return false

2
app/src/full/java/io/homeassistant/companion/android/settings/wear/SettingsWearDetection.kt
View file

@ -1,6 +1,7 @@
package io.homeassistant.companion.android.settings.wear
import android.content.Context
import android.content.pm.PackageManager
import android.util.Log
import com.google.android.gms.common.api.ApiException
import com.google.android.gms.common.api.CommonStatusCodes
@ -16,6 +17,7 @@ object SettingsWearDetection {
* if they have the Home Assistant app installed.
*/
suspend fun hasAnyNodes(context: Context): Boolean {
if (context.packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) return false
return try {
val nodeClient = Wearable.getNodeClient(context)
nodeClient.connectedNodes.await().any()

6
app/src/full/java/io/homeassistant/companion/android/thread/ThreadManagerImpl.kt
View file

@ -3,6 +3,7 @@ package io.homeassistant.companion.android.thread
import android.app.Activity
import android.content.Context
import android.content.IntentSender
import android.content.pm.PackageManager
import android.os.Build
import android.util.Log
import androidx.activity.result.ActivityResult
@ -21,7 +22,8 @@ import kotlin.coroutines.resumeWithException
import kotlin.coroutines.suspendCoroutine
class ThreadManagerImpl @Inject constructor(
private val serverManager: ServerManager
private val serverManager: ServerManager,
private val packageManager: PackageManager
) : ThreadManager {
companion object {
private const val TAG = "ThreadManagerImpl"
@ -31,7 +33,7 @@ class ThreadManagerImpl @Inject constructor(
}
override fun appSupportsThread(): Boolean =
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 && !packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)
override suspend fun coreSupportsThread(serverId: Int): Boolean {
if (!serverManager.isRegistered() || serverManager.getServer(serverId)?.user?.isAdmin != true) return false

4
common/src/main/java/io/homeassistant/companion/android/common/data/DataModule.kt
View file

@ -139,6 +139,10 @@ abstract class DataModule {
@Provides
@Singleton
fun wifiManager(@ApplicationContext appContext: Context) = appContext.getSystemService<WifiManager>()
@Provides
@Singleton
fun packageManager(@ApplicationContext appContext: Context) = appContext.packageManager
}
@Binds