evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modify check for ADB public key (#22378)

Browse source 
* Remove check for public key

* Remove has_adb_files, directly call cv.isfile

* Check for missing adbkey.pub, create dummy if not found

* Reorder imports

* Bumped androidtv library version, deactivated pubkey test

* Code works without pubkey, removed function

* Removed "import os", not needed anymore

* Bump library version
This commit is contained in:
dilruacs 2019-03-28 02:19:24 +01:00 • committed by Andrew Sayre
parent 217782cd05
commit 9176e13a97
2 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
homeassistant/components/androidtv/media_player.py
View file

@ -22,7 +22,7 @@ import homeassistant.helpers.config_validation as cv
ANDROIDTV_DOMAIN = 'androidtv'
REQUIREMENTS = ['androidtv==0.0.13']
REQUIREMENTS = ['androidtv==0.0.14']
_LOGGER = logging.getLogger(__name__)
@ -61,21 +61,13 @@ SERVICE_ADB_COMMAND_SCHEMA = vol.Schema({
})
def has_adb_files(value):
"""Check that ADB key files exist."""
priv_key = value
pub_key = '{}.pub'.format(value)
cv.isfile(pub_key)
return cv.isfile(priv_key)
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Required(CONF_HOST): cv.string,
vol.Optional(CONF_DEVICE_CLASS, default=DEFAULT_DEVICE_CLASS):
vol.In(DEVICE_CLASSES),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
vol.Optional(CONF_ADBKEY): has_adb_files,
vol.Optional(CONF_ADBKEY): cv.isfile,
vol.Optional(CONF_ADB_SERVER_IP): cv.string,
vol.Optional(CONF_ADB_SERVER_PORT, default=DEFAULT_ADB_SERVER_PORT):
cv.port,