diff --git a/stuffs/android_id.py b/stuffs/android_id.py index 444f8f1..ad92a62 100644 --- a/stuffs/android_id.py +++ b/stuffs/android_id.py @@ -1,18 +1,23 @@ import os import sys +from tools import container from tools.helper import run from tools.logger import Logger class Android_id: def get_id(self): - if not os.path.isfile("/var/lib/waydroid/data/data/com.google.android.gsf/databases/gservices.db"): + + if container.is_running(): + queryout = run([ + 'waydroid','shell', + 'sqlite3', + '/data/data/com.google.android.gsf/databases/gservices.db', + "select * from main where name = \"android_id\";" + ]) + else: Logger.error("Cannot access gservices.db, make sure gapps is installed and waydroid was started at least once after installation and make sure waydroid is running !") - sys.exit(1) - sqs = """ - SELECT * FROM main WHERE name='android_id' - """ - queryout = run(["sqlite3", "/var/lib/waydroid/data/data/com.google.android.gsf/databases/gservices.db", sqs.strip()]) + return print(queryout.stdout.decode().replace("android_id|", "").strip()) print(" ^----- Open https://google.com/android/uncertified/?pli=1") print(" Login with your google id then submit the form with id shown above") diff --git a/tools/helper.py b/tools/helper.py index 18ff50f..81ae7f9 100644 --- a/tools/helper.py +++ b/tools/helper.py @@ -23,8 +23,8 @@ def get_download_dir(): def get_data_dir(): return os.path.join('/', "home", os.environ.get("SUDO_USER", os.environ["USER"]), ".local", "share", "waydroid", "data") -def run(args, ignore=""): - result = subprocess.run(args=args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +def run(args, env=None, ignore=""): + result = subprocess.run(args=args, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE) # print(result.stdout.decode()) if result.stderr: error = result.stderr.decode("utf-8")