jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-16 09:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Android TV ADB authorization (#38471)

Browse Source
This commit is contained in:
Jeff Irion 2020-08-02 07:08:12 -07:00 committed by GitHub
parent 72b0f95719
commit 071b8ed8a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/components/androidtv/media_player.py
View File

@ -5,7 +5,6 @@ import logging
import os import os
from adb_shell.auth.keygen import keygen from adb_shell.auth.keygen import keygen
from adb_shell.auth.sign_pythonrsa import PythonRSASigner
from adb_shell.exceptions import ( from adb_shell.exceptions import (
AdbTimeoutError, AdbTimeoutError,
InvalidChecksumError, InvalidChecksumError,
@ -14,6 +13,7 @@ from adb_shell.exceptions import (
TcpTimeoutException, TcpTimeoutException,
) )
from androidtv import ha_state_detection_rules_validator from androidtv import ha_state_detection_rules_validator
from androidtv.adb_manager.adb_manager_sync import ADBPythonSync
from androidtv.constants import APPS, KEYS from androidtv.constants import APPS, KEYS
from androidtv.exceptions import LockNotAcquiredException from androidtv.exceptions import LockNotAcquiredException
from androidtv.setup_async import setup from androidtv.setup_async import setup
@ -176,9 +176,7 @@ def setup_androidtv(hass, config):
keygen(adbkey) keygen(adbkey)
# Load the ADB key # Load the ADB key
with open(adbkey) as priv_key: signer = ADBPythonSync.load_adbkey(adbkey)
priv = priv_key.read()
signer = PythonRSASigner("", priv)
adb_log = f"using Python ADB implementation with adbkey='{adbkey}'" adb_log = f"using Python ADB implementation with adbkey='{adbkey}'"
else: else:

2
tests/components/androidtv/patchers.py
View File

@ -141,7 +141,7 @@ PATCH_ANDROIDTV_OPEN = patch(
) )
PATCH_KEYGEN = patch("homeassistant.components.androidtv.media_player.keygen") PATCH_KEYGEN = patch("homeassistant.components.androidtv.media_player.keygen")
PATCH_SIGNER = patch( PATCH_SIGNER = patch(
"homeassistant.components.androidtv.media_player.PythonRSASigner", "homeassistant.components.androidtv.media_player.ADBPythonSync.load_adbkey",
return_value="signer for testing", return_value="signer for testing",
) )