Merge branch 'casualsnek:main' into main

main.py

@@ -18,7 +18,6 @@ from stuff.nodataperm import Nodataperm
 from stuff.smartdock import Smartdock
 from stuff.widevine import Widevine
 from stuff.fdroidpriv import FDroidPriv
-from stuff.tflitefix import TfliteFix
 import tools.helper as helper
 from tools import container
 from tools import images
@@ -145,8 +144,6 @@ def remove_app(args):
         remove_list.append(Nodataperm(args.android_version))
     if "hidestatusbar" in app:
         remove_list.append(HideStatusBar())
-    if "tflitefix" in app:
-        remove_list.append(TfliteFix())
 
     if not container.use_overlayfs():
         copy_dir = "/tmp/waydroid"
@@ -172,8 +169,6 @@ def hack_option(args):
         hack_list.append(Nodataperm())
     if "hidestatusbar" in options:
         hack_list.append(HideStatusBar())
-    if "tflitefix" in options:
-        hack_list.append(TfliteFix())
 
     if not container.use_overlayfs():
         copy_dir = "/tmp/waydroid"
@@ -209,7 +204,7 @@ def interact():
     args = argparse.Namespace()
     android_version = inquirer.select(
         message="Select Android version",
-        instruction="(↑↓ Select Item)",
+        instruction="(\u2191\u2193 Select Item)",
         choices=[
             Choice(name="Android 11", value="11"),
             Choice(name="Android 13", value="13"),
@@ -235,7 +230,7 @@ def interact():
         exit()
 
     install_choices = ["gapps", "microg", "libndk", "libhoudini", "magisk", "smartdock", "fdroidpriv", "widevine",]
-    hack_choices = ["tflitefix"]
+    hack_choices = []
     if android_version=="11":
         hack_choices.extend(["nodataperm", "hidestatusbar"])
 
@@ -302,7 +297,7 @@ def main():
 
     install_choices = ["gapps", "microg", "libndk", "libhoudini",
                        "magisk", "mitm", "smartdock", "widevine"]
-    hack_choices = ["nodataperm", "hidestatusbar", "tflitefix"]
+    hack_choices = ["nodataperm", "hidestatusbar"]
     micrg_variants = ["Standard", "NoGoolag", "UNLP", "Minimal", "MinimalIAP"]
     remove_choices = install_choices
 

stuff/tflitefix.py

@@ -1,78 +0,0 @@
-import glob
-import os
-import shutil
-from stuff.general import General
-from tools.logger import Logger
-
-
-class TfliteFix(General):
-    id = "tflitefix"
-    partition = "system"
-    TARGET_OFFSET = 0x2E9204
-    PATCH_BYTES = b"\xc0\x03\x5f\xd6"  # ret in AArch64 little-endian
-
-    def __init__(self, android_version="13") -> None:
-        super().__init__()
-
-    def download(self):
-        pass
-
-    @property
-    def skip_extract(self):
-        return True
-
-    def copy(self):
-        pass
-
-    def extra1(self):
-        """Applies binary patch to libtensorflowlite.so in installed apps"""
-        search_paths = [
-            os.path.expanduser("~/.local/share/waydroid/data/app/~~*==/*/lib/arm64/libtensorflowlite.so"),
-            "/var/lib/waydroid/data/app/~~*==/*/lib/arm64/libtensorflowlite.so",
-        ]
-        found = []
-        for p in search_paths:
-            found.extend(glob.glob(p))
-
-        if not found:
-            Logger.warning("No installed apps with libtensorflowlite.so found in Waydroid data.")
-            return
-
-        for lib_path in found:
-            try:
-                with open(lib_path, "rb") as f:
-                    data = bytearray(f.read())
-
-                if len(data) > self.TARGET_OFFSET + 4:
-                    if bytes(data[self.TARGET_OFFSET:self.TARGET_OFFSET+4]) == self.PATCH_BYTES:
-                        Logger.info(f"Patch already applied to {lib_path}")
-                        continue
-
-                    backup = lib_path + ".orig"
-                    if not os.path.exists(backup):
-                        shutil.copy2(lib_path, backup)
-
-                    data[self.TARGET_OFFSET:self.TARGET_OFFSET+4] = self.PATCH_BYTES
-                    with open(lib_path, "wb") as f:
-                        f.write(data)
-                    os.chmod(lib_path, 0o755)
-                    Logger.info(f"Successfully patched {lib_path}")
-            except Exception as e:
-                Logger.error(f"Failed to patch {lib_path}: {e}")
-
-    def extra2(self):
-        """Restores original libtensorflowlite.so from backup"""
-        search_paths = [
-            os.path.expanduser("~/.local/share/waydroid/data/app/~~*==/*/lib/arm64/libtensorflowlite.so.orig"),
-            "/var/lib/waydroid/data/app/~~*==/*/lib/arm64/libtensorflowlite.so.orig",
-        ]
-        for p in search_paths:
-            for orig in glob.glob(p):
-                target = orig[:-5]
-                try:
-                    shutil.copy2(orig, target)
-                    os.remove(orig)
-                    os.chmod(target, 0o755)
-                    Logger.info(f"Restored {target}")
-                except Exception as e:
-                    Logger.error(f"Failed to restore {target}: {e}")

tools/container.py

@@ -1,23 +1,9 @@
 import configparser
 import os
 import sys
-# import dbus
 from tools.helper import run
 from tools.logger import Logger
 
-# def DBusContainerService(object_path="/ContainerManager", intf="id.waydro.ContainerManager"):
-#     return dbus.Interface(dbus.SystemBus().get_object("id.waydro.Container", object_path), intf)
-
-# def DBusSessionService(object_path="/SessionManager", intf="id.waydro.SessionManager"):
-#     return dbus.Interface(dbus.SessionBus().get_object("id.waydro.Session", object_path), intf)
-
-# def use_dbus():
-#     try:
-#         DBusContainerService()
-#     except:
-#         return False
-#     return True
-
 def use_overlayfs():
     cfg = configparser.ConfigParser()
     cfg_file = os.environ.get("WAYDROID_CONFIG", "/var/lib/waydroid/waydroid.cfg")
@@ -34,20 +20,14 @@ def use_overlayfs():
     return False
 
 
-# def get_session():
-#     return DBusContainerService().GetSession()
-
 def stop():
-    # if use_dbus():
-    #     session = DBusContainerService().GetSession()
-    #     if session:
-    #         DBusContainerService().Stop(False)
-    # else:
         run(["waydroid", "container", "stop"])
 
-
 def is_running():
         return "Session:\tRUNNING" in run(["waydroid", "status"]).stdout.decode()
 
 def upgrade():
-    run(["waydroid", "upgrade", "-o"], ignore=r"\[.*\] Stopping container\n\[.*\] Starting container")
+    try:
+        run(["waydroid", "upgrade"], ignore=r"\[.*\] Stopping container\n\[.*\] Starting container")
+    except subprocess.CalledProcessError:
+        Logger.warning("Waydroid upgrade reported an error (likely system_ota), but we are continuing...")

tools/helper.py

@@ -2,7 +2,6 @@ import gzip
 import os
 import re
 import platform
-import re
 import subprocess
 import sys
 import requests
@@ -11,27 +10,24 @@ from tqdm import tqdm
 import hashlib
 from typing import Optional
 
-
 def get_download_dir():
-    download_loc = ""
+    if os.environ.get("XDG_CACHE_HOME"):
-    if os.environ.get("XDG_CACHE_HOME", None) is None:
-        download_loc = os.path.join('/', "home", os.environ.get(
-            "SUDO_USER", os.environ["USER"]), ".cache", "waydroid-script", "downloads"
-        )
-    else:
         download_loc = os.path.join(
             os.environ["XDG_CACHE_HOME"], "waydroid-script", "downloads"
         )
+    else:
+        user = os.environ.get("SUDO_USER", os.environ.get("USER", "root"))
+        download_loc = os.path.join("/", "home", user, ".cache", "waydroid-script", "downloads")
+        
     if not os.path.exists(download_loc):
-        os.makedirs(download_loc)
+        os.makedirs(download_loc, exist_ok=True)
     return download_loc
 
-# not good
 def get_data_dir():
-    return os.path.join('/', "home", os.environ.get("SUDO_USER", os.environ["USER"]), ".local", "share", "waydroid", "data")
+    user = os.environ.get("SUDO_USER", os.environ.get("USER", "root"))
+    return os.path.join("/", "home", user, ".local", "share", "waydroid", "data")
 
-# execute on host
+def run(args: list, env: Optional[dict] = None, ignore: Optional[str] = None):
-def run(args: list, env: Optional[str] = None, ignore: Optional[str] = None):
     result = subprocess.run(
         args=args, 
         env=env, 
@@ -39,11 +35,12 @@ def run(args: list, env: Optional[str] = None, ignore: Optional[str] = None):
         stderr=subprocess.PIPE
     )
 
-    # print(result.stdout.decode())
     if result.stderr:
-        error = result.stderr.decode("utf-8")
+        error = result.stderr.decode("utf-8").strip()
-        if ignore and re.match(ignore, error):
+        
+        if (ignore and re.search(ignore, error)) or "system_ota" in error:
             return result
+        
         Logger.error(error)
         raise subprocess.CalledProcessError(
             returncode=result.returncode,
@@ -52,64 +49,58 @@ def run(args: list, env: Optional[str] = None, ignore: Optional[str] = None):
         )
     return result
 
-# execute on waydroid shell
 def shell(arg: str, env: Optional[str] = None):
-    a = subprocess.Popen(
+    cmd = ["sudo", "waydroid", "shell"]
-        args=["sudo", "waydroid", "shell"],
+    process = subprocess.Popen(
+        args=cmd,
         stdin=subprocess.PIPE,
         stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE
+        stderr=subprocess.PIPE,
+        text=True
     )
-    subprocess.Popen(
-        args=["echo", "export BOOTCLASSPATH=/apex/com.android.art/javalib/core-oj.jar:/apex/com.android.art/javalib/core-libart.jar:/apex/com.android.art/javalib/core-icu4j.jar:/apex/com.android.art/javalib/okhttp.jar:/apex/com.android.art/javalib/bouncycastle.jar:/apex/com.android.art/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/system/framework/framework-atb-backward-compatibility.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.media/javalib/updatable-media.jar:/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar:/apex/com.android.os.statsd/javalib/framework-statsd.jar:/apex/com.android.permission/javalib/framework-permission.jar:/apex/com.android.sdkext/javalib/framework-sdkextensions.jar:/apex/com.android.wifi/javalib/framework-wifi.jar:/apex/com.android.tethering/javalib/framework-tethering.jar"],
-        stdout=a.stdin,
-        stdin=subprocess.PIPE
-    ).communicate()
 
+    boot_classpath = "export BOOTCLASSPATH=/apex/com.android.art/javalib/core-oj.jar:/apex/com.android.art/javalib/core-libart.jar:/apex/com.android.art/javalib/core-icu4j.jar:/apex/com.android.art/javalib/okhttp.jar:/apex/com.android.art/javalib/bouncycastle.jar:/apex/com.android.art/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/system/framework/framework-atb-backward-compatibility.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.media/javalib/updatable-media.jar:/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar:/apex/com.android.os.statsd/javalib/framework-statsd.jar:/apex/com.android.permission/javalib/framework-permission.jar:/apex/com.android.sdkext/javalib/framework-sdkextensions.jar:/apex/com.android.wifi/javalib/framework-wifi.jar:/apex/com.android.tethering/javalib/framework-tethering.jar"
+    
+    full_script = f"{boot_classpath}\n"
     if env:
-        subprocess.Popen(
+        full_script += f"{env}\n"
-            args=["echo", env],
+    full_script += f"{arg}\n"
-            stdout=a.stdin,
-            stdin=subprocess.PIPE
-        ).communicate()
 
-    subprocess.Popen(
+    stdout, stderr = process.communicate(input=full_script)
-        args=["echo", arg],
-        stdout=a.stdin,
-        stdin=subprocess.PIPE
-    ).communicate()
 
-    a.stdin.close()
+    if process.returncode != 0 and stderr:
-    if a.stderr.read():
+        Logger.error(stderr.strip())
-        Logger.error(a.stderr.read().decode('utf-8'))
         raise subprocess.CalledProcessError(
-            returncode=a.returncode,
+            returncode=process.returncode,
-            cmd=a.args,
+            cmd=cmd,
-            stderr=a.stderr
+            stderr=stderr.encode()
         )
-    return a.stdout.read().decode("utf-8")
+    return stdout
 
 def download_file(url, f_name):
-    md5 = ""
     response = requests.get(url, stream=True)
     total_size_in_bytes = int(response.headers.get('content-length', 0))
-    block_size = 1024  # 1 Kibibyte
+    block_size = 1024 
+    
     progress_bar = tqdm(total=total_size_in_bytes, unit='iB', unit_scale=True)
     with open(f_name, 'wb') as file:
         for data in response.iter_content(block_size):
             progress_bar.update(len(data))
             file.write(data)
     progress_bar.close()
+
+    hash_md5 = hashlib.md5()
     with open(f_name, "rb") as f:
-        bytes = f.read()
+        for chunk in iter(lambda: f.read(4096), b""):
-        md5 = hashlib.md5(bytes).hexdigest()
+            hash_md5.update(chunk)
+    
     if total_size_in_bytes != 0 and progress_bar.n != total_size_in_bytes:
-        raise ValueError("Something went wrong while downloading")
+        raise ValueError("Download incomplete or corrupted")
-    return md5
+    
+    return hash_md5.hexdigest()
 
 def host():
     machine = platform.machine()
-
     mapping = {
         "i686": ("x86", 32),
         "x86_64": ("x86_64", 64),
@@ -117,30 +108,37 @@ def host():
         "armv7l": ("armeabi-v7a", 32),
         "armv8l": ("armeabi-v7a", 32)
     }
+    
     if machine in mapping:
-        if mapping[machine] == "x86_64":
+        if machine == "x86_64":
-            with open("/proc/cpuinfo") as f:
+            try:
-                if "sse4_2" not in f.read():
+                with open("/proc/cpuinfo", "r") as f:
-                    Logger.warning("x86_64 CPU does not support SSE4.2, falling back to x86...")
+                    if "sse4_2" not in f.read():
-                    return ("x86", 32)
+                        Logger.warning("CPU does not support SSE4.2, falling back to x86...")
+                        return ("x86", 32)
+            except Exception:
+                pass
         return mapping[machine]
-    raise ValueError("platform.machine '" + machine + "'"
+    
-                     " architecture is not supported")
+    raise ValueError(f"Architecture '{machine}' is not supported")
-
 
 def check_root():
     if os.geteuid() != 0:
-        Logger.error("This script must be run as root. Aborting.")
+        Logger.error("This script must be run as root (sudo). Aborting.")
         sys.exit(1)
 
 def backup(path):
-    gz_filename = path+".gz"
+    if not os.path.exists(path):
-    with gzip.open(gz_filename, 'wb') as f_gz:
+        return
-        with open(path, "rb") as f:
+    gz_filename = path + ".gz"
-            f_gz.write(f.read())
+    with open(path, "rb") as f_in:
+        with gzip.open(gz_filename, "wb") as f_out:
+            f_out.writelines(f_in)
 
 def restore(path):
-    gz_filename = path+".gz"
+    gz_filename = path + ".gz"
-    with gzip.GzipFile(gz_filename) as f_gz:
+    if not os.path.exists(gz_filename):
-        with open(path, "wb") as f:
+        return
-            f.writelines(f_gz)
+    with gzip.open(gz_filename, "rb") as f_in:
+        with open(path, "wb") as f_out:
+            f_out.write(f_in.read())

tools/images.py

@@ -28,7 +28,6 @@ def resize(img_file, size):
     run(["sudo", "resize2fs", img_file, size], ignore="^resize2fs \d+\.\d+\.\d (.+)\n$")
 
 def get_image_dir():
-    # Read waydroid config to get image location
     cfg = configparser.ConfigParser()
     cfg_file = os.environ.get("WAYDROID_CONFIG", "/var/lib/waydroid/waydroid.cfg")
     if not os.path.isfile(cfg_file):
@@ -36,6 +35,6 @@ def get_image_dir():
         sys.exit(1)
     cfg.read(cfg_file)
     if "waydroid" not in cfg:
-        Logger.error("Required entry in config was not found, Cannot continue!") #magisk
+        Logger.error("Required entry in config was not found, Cannot continue!")
         sys.exit(1)
-    return cfg["waydroid"]["images_path"]
+    return cfg["waydroid"]["images_path"]