Call unload with ui arg

This commit is contained in:
dadav 2019-11-30 09:43:39 +01:00
parent f973997cdb
commit 608904daf8
3 changed files with 6 additions and 6 deletions
pwnagotchi/plugins

@ -3,6 +3,7 @@ import glob
import _thread
import importlib, importlib.util
import logging
from pwnagotchi.ui import view
default_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "default")
loaded = {}
@ -27,14 +28,14 @@ def toggle_plugin(name, enable=True):
global loaded, database
if not enable and name in loaded:
if getattr(loaded[name], 'on_unload', None):
loaded[name].on_unload()
loaded[name].on_unload(view.ROOT)
del loaded[name]
return True
if enable and name in database and name not in loaded:
load_from_file(database[name])
one(name, 'loaded')
one(name, 'ui_setup')
one(name, 'ui_setup', view.ROOT)
return True
return False

@ -466,11 +466,10 @@ class BTTether(plugins.Plugin):
logging.info("BT-TETHER: Successfully loaded ...")
self.ready = True
def on_unload(self):
self.ui.remove_element('bluetooth')
def on_unload(self, ui):
ui.remove_element('bluetooth')
def on_ui_setup(self, ui):
self.ui = ui
ui.add_element('bluetooth', LabeledValue(color=BLACK, label='BT', value='-', position=(ui.width() / 2 - 15, 0),
label_font=fonts.Bold, text_font=fonts.Medium))

@ -26,7 +26,7 @@ class Example(plugins.Plugin):
logging.warning("WARNING: this plugin should be disabled! options = " % self.options)
# called before the plugin is unloaded
def on_unload(self):
def on_unload(self, ui):
pass
# called hen there's internet connectivity