diff options
author | apprenticeharper <[email protected]> | 2015-09-03 07:51:10 +0100 |
---|---|---|
committer | apprenticeharper <[email protected]> | 2015-09-03 07:51:10 +0100 |
commit | e5e269fbae85c59c7faf61fbbf05b610a35aaf67 (patch) | |
tree | c238d56b8e8aac8bf1cb7f9ff4490819c0600b8a /Other_Tools | |
parent | d54dc38c2d3083eb802557aa363498cf27f25f39 (diff) |
Fixes for android key extraction
Diffstat (limited to 'Other_Tools')
-rw-r--r-- | Other_Tools/DRM_Key_Scripts/Kindle_for_Android/androidkindlekey.pyw | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/Other_Tools/DRM_Key_Scripts/Kindle_for_Android/androidkindlekey.pyw b/Other_Tools/DRM_Key_Scripts/Kindle_for_Android/androidkindlekey.pyw index 2c539ee..ff8d1ee 100644 --- a/Other_Tools/DRM_Key_Scripts/Kindle_for_Android/androidkindlekey.pyw +++ b/Other_Tools/DRM_Key_Scripts/Kindle_for_Android/androidkindlekey.pyw @@ -16,16 +16,18 @@ from __future__ import with_statement # - and added in unicode command line support # 1.3 - added in TkInter interface, output to a file # 1.4 - Fix some problems identified by Aldo Bleeker +# 1.5 - Fix another problem identified by Aldo Bleeker """ Retrieve Kindle for Android Serial Number. """ __license__ = 'GPL v3' -__version__ = '1.4' +__version__ = '1.5' import os import sys +import traceback import getopt import tempfile import zlib @@ -220,20 +222,30 @@ def get_serials2(path=STORAGE2): userdata_keys = cursor.fetchall() dsns = [] for userdata_row in userdata_keys: - if userdata_row: - userdata_utf8 = userdata_row[0].encode('utf8') - if len(userdata_utf8) > 0: - dsns.append(userdata_utf8) + try: + if userdata_row and userdata_row[0]: + userdata_utf8 = userdata_row[0].encode('utf8') + if len(userdata_utf8) > 0: + dsns.append(userdata_utf8) + except: + print "Error getting one of the device serial name keys" + traceback.print_exc() + pass dsns = list(set(dsns)) cursor.execute('''select userdata_value from userdata where userdata_key like '%/%kindle.account.tokens%' ''') userdata_keys = cursor.fetchall() tokens = [] for userdata_row in userdata_keys: - if userdata_row: - userdata_utf8 = userdata_row[0].encode('utf8') - if len(userdata_utf8) > 0: - tokens.append(userdata_utf8) + try: + if userdata_row and userdata_row[0]: + userdata_utf8 = userdata_row[0].encode('utf8') + if len(userdata_utf8) > 0: + tokens.append(userdata_utf8) + except: + print "Error getting one of the account token keys" + traceback.print_exc() + pass tokens = list(set(tokens)) serials = [] @@ -377,7 +389,6 @@ def gui_main(): import Tkconstants import tkMessageBox import tkFileDialog - import traceback except: print "Tkinter not installed" return cli_main() |