mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-09-19 08:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hide NFC if the device reports it has no hardware (#941)

Browse source 
* Hide NFC if the device reports it has no hardware

* Add hardware check to webview activity
This commit is contained in:
Daniel Shokouhi 2020-09-16 08:47:09 -07:00 committed by GitHub
parent 532ae9d366
commit debeadb707
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/io/homeassistant/companion/android/settings/SettingsFragment.kt
View file

@ -1,5 +1,6 @@
package io.homeassistant.companion.android.settings package io.homeassistant.companion.android.settings
import android.content.pm.PackageManager
import android.graphics.Color import android.graphics.Color
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
@ -96,7 +97,11 @@ class SettingsFragment : PreferenceFragmentCompat(), SettingsView {
} }
findPreference<Preference>("nfc_tags")?.let { findPreference<Preference>("nfc_tags")?.let {
it.isVisible = presenter.nfcEnabled() val pm: PackageManager = requireContext().packageManager
if (pm.hasSystemFeature(PackageManager.FEATURE_NFC))
it.isVisible = presenter.nfcEnabled()
else
it.isVisible = false
it.onPreferenceClickListener = Preference.OnPreferenceClickListener { it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
startActivity(NfcSetupActivity.newInstance(requireActivity())) startActivity(NfcSetupActivity.newInstance(requireActivity()))
true true

4
app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
View file

@ -350,6 +350,8 @@ class WebViewActivity : AppCompatActivity(), io.homeassistant.companion.android.
} }
} }
"config/get" -> { "config/get" -> {
val pm: PackageManager = context.packageManager
val hasNfc = pm.hasSystemFeature(PackageManager.FEATURE_NFC)
val script = "externalBus(" + val script = "externalBus(" +
"${JSONObject( "${JSONObject(
mapOf( mapOf(
@ -359,7 +361,7 @@ class WebViewActivity : AppCompatActivity(), io.homeassistant.companion.android.
"result" to JSONObject( "result" to JSONObject(
mapOf( mapOf(
"hasSettingsScreen" to true, "hasSettingsScreen" to true,
"canWriteTag" to true, "canWriteTag" to hasNfc,
"hasExoPlayer" to true "hasExoPlayer" to true
) )
) )