From d0a57cc44566cf9d0cc21738aa10a6842a4aeceb Mon Sep 17 00:00:00 2001 From: Rossen Georgiev Date: Wed, 1 Feb 2017 11:56:58 +0200 Subject: [PATCH] android_extract func now handles extra adb output related issue #69 * extract_secrets_from_android_rooted calling adb for the first will correctly handle the extra adb output --- steam/guard.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/steam/guard.py b/steam/guard.py index 1315e24..2f1521f 100644 --- a/steam/guard.py +++ b/steam/guard.py @@ -481,7 +481,9 @@ def extract_secrets_from_android_rooted(adb_path='adb'): "'cat /data/data/com.valvesoftware.android.steam.community/files/Steamguard*'" ]) - data = data.decode('utf-8') + # When adb daemon is not running, `adb` will print a couple of lines before our data. + # The data doesn't have new lines and its always on the last line. + data = data.decode('utf-8').split('\n')[-1] if data[0] != "{": raise RuntimeError("Got invalid data: %s" % repr(data))