jacob.eva/openCom-Companion
1
0
Fork 0
mirror of https://github.com/liberatedsystems/openCom-Companion.git synced 2024-11-29 08:40:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved conversation list performance. Improved connectivity status formatting.

Browse Source
This commit is contained in:
Mark Qvist 2022-11-23 10:38:56 +01:00
parent 44c864d3eb
commit 475dfb4447
3 changed files with 108 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sbapp/main.py
View File

@ -724,11 +724,13 @@ class SidebandApp(MDApp):
self.open_conversation(context_dest) self.open_conversation(context_dest)
def conversation_action(self, sender): def conversation_action(self, sender):
def cb(dt): def cb(dt):
self.open_conversation(sender.sb_uid) self.open_conversation(sender.sb_uid)
def cbu(dt):
self.conversations_view.update()
Clock.schedule_once(cb, 0.15) Clock.schedule_once(cb, 0.15)
Clock.schedule_once(cbu, 0.15+0.25)
def open_conversation(self, context_dest): def open_conversation(self, context_dest):
self.outbound_mode_paper = False self.outbound_mode_paper = False
@ -915,9 +917,9 @@ class SidebandApp(MDApp):
else: else:
if self.sideband.reticulum.is_connected_to_shared_instance: if self.sideband.reticulum.is_connected_to_shared_instance:
connectivity_status = "[size=22dp][b]Connectivity Status[/b][/size]\n\nSideband is connected via a shared Reticulum instance running on this system. Use the rnstatus utility to obtain full connectivity info." connectivity_status = "Sideband is connected via a shared Reticulum instance running on this system. Use the rnstatus utility to obtain full connectivity info."
else: else:
connectivity_status = "[size=22dp][b]Connectivity Status[/b][/size]\n\nSideband is currently running a standalone or master Reticulum instance on this system. Use the rnstatus utility to obtain full connectivity info." connectivity_status = "Sideband is currently running a standalone or master Reticulum instance on this system. Use the rnstatus utility to obtain full connectivity info."
return connectivity_status return connectivity_status
@ -927,6 +929,7 @@ class SidebandApp(MDApp):
yes_button = MDRectangleFlatButton(text="OK",font_size=dp(18)) yes_button = MDRectangleFlatButton(text="OK",font_size=dp(18))
dialog = MDDialog( dialog = MDDialog(
title="Connectivity Status",
text=self.get_connectivity_text(), text=self.get_connectivity_text(),
buttons=[ yes_button ], buttons=[ yes_button ],
# elevation=0, # elevation=0,

3
sbapp/services/sidebandservice.py
View File

@ -203,7 +203,8 @@ class SidebandService():
ts = "Disabled" ts = "Disabled"
i2s = "Disabled" i2s = "Disabled"
stat = "[size=22dp][b]Connectivity Status[/b][/size]\n\n" # stat = "[size=22dp][b]Connectivity Status[/b][/size]\n\n"
stat = ""
if self.sideband.interface_local != None: if self.sideband.interface_local != None:
netdevs = self.sideband.interface_local.adopted_interfaces netdevs = self.sideband.interface_local.adopted_interfaces

160
sbapp/ui/conversations.py
View File

@ -18,24 +18,25 @@ from kivymd.uix.dialog import MDDialog
class NewConv(BoxLayout): class NewConv(BoxLayout):
pass pass
class MsgSync(BoxLayout): class MsgSync(BoxLayout):
pass pass
class ConvSettings(BoxLayout): class ConvSettings(BoxLayout):
disp_name = StringProperty() disp_name = StringProperty()
context_dest = StringProperty() context_dest = StringProperty()
trusted = BooleanProperty() trusted = BooleanProperty()
class Conversations(): class Conversations():
def __init__(self, app): def __init__(self, app):
self.app = app self.app = app
self.context_dests = [] self.context_dests = []
self.added_item_dests = [] self.added_item_dests = []
self.list = None self.list = None
self.conversation_dropdown = None self.conversation_dropdown = None
self.delete_dialog = None
self.clear_dialog = None
self.update() self.update()
def reload(self): def reload(self):
@ -50,8 +51,8 @@ class Conversations():
self.added_item_dests = [] self.added_item_dests = []
def update(self): def update(self):
if self.app.sideband.getstate("app.flags.unread_conversations"): # if self.app.sideband.getstate("app.flags.unread_conversations"):
self.clear_list() # self.clear_list()
self.context_dests = self.app.sideband.list_conversations() self.context_dests = self.app.sideband.list_conversations()
self.update_widget() self.update_widget()
@ -60,36 +61,57 @@ class Conversations():
self.app.sideband.setstate("app.flags.new_conversations", False) self.app.sideband.setstate("app.flags.new_conversations", False)
self.app.sideband.setstate("wants.viewupdate.conversations", False) self.app.sideband.setstate("wants.viewupdate.conversations", False)
def trust_icon(self, context_dest, unread):
trust_icon = "account-question"
if self.app.sideband.is_trusted(context_dest):
if unread:
trust_icon = "email-seal"
else:
trust_icon = "account-check"
else:
if unread:
trust_icon = "email"
else:
trust_icon = "account-question"
return trust_icon
def update_widget(self): def update_widget(self):
us = time.time() us = time.time()
RNS.log("Updating conversation list widgets", RNS.LOG_DEBUG) RNS.log("Updating conversation list widgets", RNS.LOG_DEBUG)
if self.list == None: if self.list == None:
self.list = MDList() self.list = MDList()
remove_widgets = []
for w in self.list.children:
if not w.sb_uid in [e["dest"] for e in self.context_dests]:
RNS.log("Should remove "+RNS.prettyhexrep(w.sb_uid)+" from list")
remove_widgets.append(w)
self.added_item_dests.remove(w.sb_uid)
for w in remove_widgets:
RNS.log("Removing "+str(w))
self.list.remove_widget(w)
for conv in self.context_dests: for conv in self.context_dests:
context_dest = conv["dest"] context_dest = conv["dest"]
unread = conv["unread"] unread = conv["unread"]
if not context_dest in self.added_item_dests: if not context_dest in self.added_item_dests:
if self.app.sideband.is_trusted(context_dest): i_s = time.time()
if unread:
trust_icon = "email-seal"
else:
trust_icon = "account-check"
else:
if unread:
trust_icon = "email"
else:
trust_icon = "account-question"
iconl = IconLeftWidget(icon=trust_icon, on_release=self.app.conversation_action) iconl = IconLeftWidget(icon=self.trust_icon(context_dest, unread), on_release=self.app.conversation_action)
item = OneLineAvatarIconListItem(text=self.app.sideband.peer_display_name(context_dest), on_release=self.app.conversation_action) item = OneLineAvatarIconListItem(text=self.app.sideband.peer_display_name(context_dest), on_release=self.app.conversation_action)
item.add_widget(iconl) item.add_widget(iconl)
item.iconl = iconl
item.sb_uid = context_dest item.sb_uid = context_dest
item.sb_unread = unread
iconl.sb_uid = context_dest iconl.sb_uid = context_dest
def gen_edit(dest, item): def gen_edit(item):
def x(): def x():
t_s = time.time()
dest = self.conversation_dropdown.context_dest dest = self.conversation_dropdown.context_dest
try: try:
disp_name = self.app.sideband.raw_display_name(dest) disp_name = self.app.sideband.raw_display_name(dest)
@ -127,7 +149,7 @@ class Conversations():
dialog.dismiss() dialog.dismiss()
def cb(dt): def cb(dt):
self.reload() self.update()
Clock.schedule_once(cb, 0.2) Clock.schedule_once(cb, 0.2)
def dl_no(s): def dl_no(s):
@ -137,61 +159,66 @@ class Conversations():
no_button.bind(on_release=dl_no) no_button.bind(on_release=dl_no)
item.dmenu.dismiss() item.dmenu.dismiss()
dialog.open() dialog.open()
RNS.log("Generated edit dialog in "+str(RNS.prettytime(time.time()-t_s)))
except Exception as e: except Exception as e:
RNS.log("Error while creating conversation settings: "+str(e), RNS.LOG_ERROR) RNS.log("Error while creating conversation settings: "+str(e), RNS.LOG_ERROR)
return x return x
def gen_clear(dest, item): def gen_clear(item):
def x(): def x():
dest = self.conversation_dropdown.context_dest if self.clear_dialog == None:
yes_button = MDRectangleFlatButton(text="Yes",font_size=dp(18), theme_text_color="Custom", line_color=self.app.color_reject, text_color=self.app.color_reject) yes_button = MDRectangleFlatButton(text="Yes",font_size=dp(18), theme_text_color="Custom", line_color=self.app.color_reject, text_color=self.app.color_reject)
no_button = MDRectangleFlatButton(text="No",font_size=dp(18)) no_button = MDRectangleFlatButton(text="No",font_size=dp(18))
dialog = MDDialog( self.clear_dialog = MDDialog(
title="Clear all messages in conversation?", title="Clear all messages in conversation?",
buttons=[ yes_button, no_button ], buttons=[ yes_button, no_button ],
# elevation=0, # elevation=0,
) )
def dl_yes(s): def dl_yes(s):
dialog.dismiss() self.clear_dialog.dismiss()
self.app.sideband.clear_conversation(dest) self.app.sideband.clear_conversation(self.conversation_dropdown.context_dest)
def dl_no(s): def dl_no(s):
dialog.dismiss() self.clear_dialog.dismiss()
yes_button.bind(on_release=dl_yes)
no_button.bind(on_release=dl_no)
yes_button.bind(on_release=dl_yes)
no_button.bind(on_release=dl_no)
item.dmenu.dismiss() item.dmenu.dismiss()
dialog.open() self.clear_dialog.open()
return x return x
def gen_del(dest, item): def gen_del(item):
def x(): def x():
yes_button = MDRectangleFlatButton(text="Yes",font_size=dp(18), theme_text_color="Custom", line_color=self.app.color_reject, text_color=self.app.color_reject) if self.delete_dialog == None:
no_button = MDRectangleFlatButton(text="No",font_size=dp(18)) yes_button = MDRectangleFlatButton(text="Yes",font_size=dp(18), theme_text_color="Custom", line_color=self.app.color_reject, text_color=self.app.color_reject)
dialog = MDDialog( no_button = MDRectangleFlatButton(text="No",font_size=dp(18))
title="Delete conversation?", self.delete_dialog = MDDialog(
buttons=[ yes_button, no_button ], title="Delete conversation?",
# elevation=0, buttons=[ yes_button, no_button ],
) # elevation=0,
def dl_yes(s): )
dialog.dismiss() def dl_yes(s):
self.app.sideband.delete_conversation(self.conversation_dropdown.context_dest) self.delete_dialog.dismiss()
def cb(dt): self.app.sideband.delete_conversation(self.conversation_dropdown.context_dest)
self.reload() def cb(dt):
Clock.schedule_once(cb, 0.2) self.update()
def dl_no(s): Clock.schedule_once(cb, 0.2)
dialog.dismiss() def dl_no(s):
self.delete_dialog.dismiss()
yes_button.bind(on_release=dl_yes)
no_button.bind(on_release=dl_no)
yes_button.bind(on_release=dl_yes)
no_button.bind(on_release=dl_no)
item.dmenu.dismiss() item.dmenu.dismiss()
dialog.open() self.delete_dialog.open()
return x return x
def gen_copy_addr(dest, item): def gen_copy_addr(item):
def x(): def x():
Clipboard.copy(RNS.hexrep(dest, delimit=False)) Clipboard.copy(RNS.hexrep(self.conversation_dropdown.context_dest, delimit=False))
item.dmenu.dismiss() item.dmenu.dismiss()
return x return x
@ -202,25 +229,25 @@ class Conversations():
"viewclass": "OneLineListItem", "viewclass": "OneLineListItem",
"text": "Edit", "text": "Edit",
"height": dp(dmi_h), "height": dp(dmi_h),
"on_release": gen_edit(context_dest, item) "on_release": gen_edit(item)
}, },
{ {
"text": "Copy Address", "text": "Copy Address",
"viewclass": "OneLineListItem", "viewclass": "OneLineListItem",
"height": dp(dmi_h), "height": dp(dmi_h),
"on_release": gen_copy_addr(context_dest, item) "on_release": gen_copy_addr(item)
}, },
{ {
"text": "Clear Messages", "text": "Clear Messages",
"viewclass": "OneLineListItem", "viewclass": "OneLineListItem",
"height": dp(dmi_h), "height": dp(dmi_h),
"on_release": gen_clear(context_dest, item) "on_release": gen_clear(item)
}, },
{ {
"text": "Delete Conversation", "text": "Delete Conversation",
"viewclass": "OneLineListItem", "viewclass": "OneLineListItem",
"height": dp(dmi_h), "height": dp(dmi_h),
"on_release": gen_del(context_dest, item) "on_release": gen_del(item)
} }
] ]
@ -253,6 +280,19 @@ class Conversations():
self.added_item_dests.append(context_dest) self.added_item_dests.append(context_dest)
self.list.add_widget(item) self.list.add_widget(item)
RNS.log("Created item in "+RNS.prettytime(time.time()-i_s), RNS.LOG_DEBUG)
else:
for w in self.list.children:
if w.sb_uid == context_dest:
disp_name = self.app.sideband.peer_display_name(context_dest)
trust_icon = self.trust_icon(context_dest, unread)
if w.iconl.icon != trust_icon:
w.iconl.icon = trust_icon
w.sb_unread = unread
if w.text != disp_name:
w.text = disp_name
RNS.log("Updated conversation list widgets in "+RNS.prettytime(time.time()-us), RNS.LOG_DEBUG) RNS.log("Updated conversation list widgets in "+RNS.prettytime(time.time()-us), RNS.LOG_DEBUG)
def get_widget(self): def get_widget(self):