From: Alessandro Astone Date: Tue, 19 Jul 2022 08:46:34 +0000 (+0200) Subject: Revert "Add first-launch command" X-Git-Tag: 1.3.0~12 X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/28453601379e7561c0a798b2e3d178a53d3fc346?ds=sidebyside Revert "Add first-launch command" Will revisit later to not depend on polkit and xwayland This reverts commit a2804841ed52f812b1d666cb3df01239ee906f5f. --- diff --git a/data/Waydroid.desktop b/data/Waydroid.desktop index 4a4521d..df05c5f 100644 --- a/data/Waydroid.desktop +++ b/data/Waydroid.desktop @@ -1,5 +1,5 @@ [Desktop Entry] Type=Application Name=Waydroid -Exec=waydroid first-launch +Exec=waydroid show-full-ui Icon=/usr/lib/waydroid/data/AppIcon.png diff --git a/debian/control b/debian/control index 63ddbc6..0279888 100644 --- a/debian/control +++ b/debian/control @@ -15,8 +15,7 @@ Depends: ${misc:Depends}, ${python3:Depends}, lxc, python3-gbinder, - python3-gi, - python3-tk + python3-gi Description: Android™ application support waydroid allows running a separate Android™ environment confined to a LXC container. diff --git a/debian/waydroid.install b/debian/waydroid.install index 3285363..c15d09e 100644 --- a/debian/waydroid.install +++ b/debian/waydroid.install @@ -2,4 +2,3 @@ waydroid.py /usr/lib/waydroid tools /usr/lib/waydroid data /usr/lib/waydroid gbinder/anbox.conf /etc/gbinder.d -polkit/org.waydro.id.policy /usr/share/polkit-1/actions diff --git a/polkit/org.waydro.id.policy b/polkit/org.waydro.id.policy deleted file mode 100644 index f8cd1bc..0000000 --- a/polkit/org.waydro.id.policy +++ /dev/null @@ -1,18 +0,0 @@ - - - - - Waydroid - Authentication is required to initialize Waydroid - system-software-install - - auth_admin - auth_admin - auth_admin - - /usr/bin/waydroid - true - - diff --git a/tools/__init__.py b/tools/__init__.py index df42752..2443e6e 100644 --- a/tools/__init__.py +++ b/tools/__init__.py @@ -5,7 +5,6 @@ import sys import logging import os import traceback -import subprocess from . import actions from . import config @@ -33,7 +32,7 @@ def main(): args.timeout = 1800 if not actions.initializer.is_initialized(args): - if args.action and (args.action not in ("init", "first-launch", "log")): + if args.action and (args.action != "init" and args.action != "log"): if not args.wait_for_init: print('ERROR: WayDroid is not initialized, run "waydroid init"') return 0 @@ -117,10 +116,6 @@ def main(): helpers.lxc.logcat(args) elif args.action == "show-full-ui": actions.app_manager.showFullUI(args) - elif args.action == "first-launch": - subprocess.run(["pkexec", sys.argv[0], "init", "--gui"]) - if actions.initializer.is_initialized(args): - actions.app_manager.showFullUI(args) elif args.action == "status": actions.status.print_status(args) elif args.action == "log": diff --git a/tools/actions/initializer.py b/tools/actions/initializer.py index 89bbf57..158f6bc 100644 --- a/tools/actions/initializer.py +++ b/tools/actions/initializer.py @@ -5,16 +5,6 @@ import os from tools import helpers import tools.config -from tkinter import * -from tkinter import ttk - -import sys -import threading -class Daemon(threading.Thread): - def __init__(self): - super().__init__() - self.daemon = True - def is_initialized(args): return os.path.isfile(args.config) and os.path.isdir(tools.config.defaults["rootfs"]) @@ -97,7 +87,7 @@ def setup_config(args): cfg["waydroid"]["hwbinder"] = args.HWBINDER_DRIVER tools.config.save(args, cfg) -def do_init(args): +def init(args): if not is_initialized(args) or args.force: setup_config(args) status = "STOPPED" @@ -122,87 +112,3 @@ def do_init(args): helpers.ipc.notify(channel="init", msg="done") else: logging.info("Already initialized") - -def init(args): - if args.gui: - gui_init(args) - else: - do_init(args) - -def gui_init(args): - if is_initialized(args) and not args.force: - return - - root = Tk() - root.title("Initialize Waydroid") - root.iconphoto(True, PhotoImage(file="/usr/lib/waydroid/data/AppIcon.png")) - frm = ttk.Frame(root, padding=10) - frm.grid() - - systemChannel = StringVar(frm, args.system_channel or tools.config.channels_defaults["system_channel"]) - ttk.Label(frm, text="System OTA").grid(row=0, column=0) - ttk.Entry(frm, textvariable=systemChannel).grid(row=0, column=1, ipadx=20) - - vendorChannel = StringVar(frm, args.vendor_channel or tools.config.channels_defaults["vendor_channel"]) - ttk.Label(frm, text="Vendor OTA").grid(row=1, column=0) - ttk.Entry(frm, textvariable=vendorChannel).grid(row=1, column=1, ipadx=20) - - systemType = StringVar(frm) - systemTypes = ["VANILLA", "GAPPS"] - ttk.Label(frm, text="Android Type").grid(row=2, column=0) - ttk.OptionMenu(frm, systemType, args.system_type or systemTypes[0], *systemTypes).grid(row=2, column=1) - - done = ttk.Button(frm, text="Done", command=root.destroy) - - logBox = Text(frm, borderwidth=3, relief="sunken", height=5) - logBox.bind("", lambda e: "break") - - class StdoutRedirect(logging.StreamHandler): - def write(self, s): - if s.startswith('\r'): - logBox.delete("end-1l", "end") - logBox.insert(END, '\n') - s = s[1:] - - logBox.insert(END, s) - logBox.see(END) - def flush(self): - pass - def emit(self, record): - if record.levelno >= logging.INFO: - self.write(self.format(record) + self.terminator) - - out = StdoutRedirect() - sys.stdout = sys.stderr = out - logging.getLogger().addHandler(out) - - def runInit(): - download["state"] = DISABLED - logBox.grid(row=4, columnspan=2) - - args.system_channel = systemChannel.get() - args.vendor_channel = vendorChannel.get() - args.system_type = systemType.get() - - class Runner(Daemon): - def run(self): - try: - do_init(args) - if is_initialized(args): - done.grid(row=5, columnspan=2) - print("Done") - else: - download["state"] = NORMAL - except Exception as e: - print("ERROR: " + str(e)) - download["state"] = NORMAL - - Runner().start() - - download = ttk.Button(frm, text="Download", command=runInit) - download.grid(row=3, columnspan=2) - root.mainloop() - - sys.stdout = sys.__stdout__ - sys.stderr = sys.__stderr__ - logging.getLogger().removeHandler(out) diff --git a/tools/helpers/arguments.py b/tools/helpers/arguments.py index 953c1b5..79ab853 100644 --- a/tools/helpers/arguments.py +++ b/tools/helpers/arguments.py @@ -33,8 +33,6 @@ def arguments_init(subparser): help="rom type (options: \"lineage\", \"bliss\" or OTA channel URL; default is LineageOS)") ret.add_argument("-s", "--system_type", help="system type (options: VANILLA, FOSS or GAPPS; default is VANILLA)") - ret.add_argument("-g", "--gui", action="store_true", - help="run as a graphical interface") return ret def arguments_status(subparser): @@ -106,10 +104,6 @@ def arguments_fullUI(subparser): ret = subparser.add_parser("show-full-ui", help="show android full screen in window") return ret -def arguments_firstLaunch(subparser): - ret = subparser.add_parser("first-launch", help="initialize waydroid and start it") - return ret - def arguments_shell(subparser): ret = subparser.add_parser("shell", help="run remote shell command") ret.add_argument('COMMAND', nargs='?', help="command to run") @@ -153,7 +147,6 @@ def arguments(): arguments_app(sub) arguments_prop(sub) arguments_fullUI(sub) - arguments_firstLaunch(sub) arguments_shell(sub) arguments_logcat(sub)