From df6245be67587629d631b0078e259f0935344d89 Mon Sep 17 00:00:00 2001 From: zenith <157907903+RFnexus@users.noreply.github.com> Date: Wed, 20 May 2026 22:28:32 -0400 Subject: [PATCH 1/2] Append data vars to URL in browser. Fixes for Conversation list dialog not closing after save --- nomadnet/ui/textui/Browser.py | 21 +++++++++++++++------ nomadnet/ui/textui/Conversations.py | 23 ++++++++++++++++++----- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/nomadnet/ui/textui/Browser.py b/nomadnet/ui/textui/Browser.py index 20c6e20..678c695 100644 --- a/nomadnet/ui/textui/Browser.py +++ b/nomadnet/ui/textui/Browser.py @@ -141,12 +141,21 @@ class Browser: def current_url(self): if self.destination_hash == None: return "" - else: - if self.path == None: - path = "" - else: - path = self.path - return RNS.hexrep(self.destination_hash, delimit=False)+":"+path + path = "" if self.path == None else self.path + url = RNS.hexrep(self.destination_hash, delimit=False)+":"+path + + if isinstance(self.request_data, dict) and self.request_data: + parts = [] + for k, v in self.request_data.items(): + if not isinstance(k, str): + continue + if not k.startswith("var_"): + continue + parts.append(k[4:]+"="+str(v)) + if parts: + url += "`" + "|".join(parts) + + return url def url_hash(self, url): if url == None: diff --git a/nomadnet/ui/textui/Conversations.py b/nomadnet/ui/textui/Conversations.py index d48edc6..1946042 100644 --- a/nomadnet/ui/textui/Conversations.py +++ b/nomadnet/ui/textui/Conversations.py @@ -809,10 +809,23 @@ class ConversationsDisplay(): self.dialog_open = True item = self.ilb.get_selected_item() if item == None: + self.dialog_open = False return - source_hash_text = item.source_hash - display_name = self.ilb.get_selected_item().display_name - if display_name == None: + source_hash_text = getattr(item, "source_hash", None) + if source_hash_text is None: + blocked = getattr(item, "blocked_dest_hash", None) + if isinstance(blocked, (bytes, bytearray)): + source_hash_text = RNS.hexrep(blocked, delimit=False) + if source_hash_text is None: + self.dialog_open = False + return + display_name = getattr(item, "display_name", None) + if display_name is None: + try: + display_name = self.app.directory.display_name(bytes.fromhex(source_hash_text)) + except Exception: + display_name = None + if display_name is None: display_name = "" e_id = urwid.Edit(caption="Addr : ",edit_text=source_hash_text) @@ -872,8 +885,8 @@ class ConversationsDisplay(): r_propagated = urwid.RadioButton(method_button_group, "Use propagation nodes", state=propagated_selected) def dismiss_dialog(sender): - self.update_conversation_list() self.dialog_open = False + self.update_conversation_list() def confirmed(sender): try: @@ -894,8 +907,8 @@ class ConversationsDisplay(): entry = DirectoryEntry(source_hash, display_name, trust_level, preferred_delivery=delivery, sort_rank=sort_rank, notes=notes_value) self.app.directory.remember(entry) self._refresh_open_conversation_widget(source_hash_text) - self.update_conversation_list() self.dialog_open = False + self.update_conversation_list() self.app.ui.main_display.sub_displays.network_display.directory_change_callback() except Exception as e: RNS.log("Could not save directory entry. The contained exception was: "+str(e), RNS.LOG_VERBOSE) From 4560f038b1c278d96f93aa3f13245022da366023 Mon Sep 17 00:00:00 2001 From: zenith <157907903+RFnexus@users.noreply.github.com> Date: Thu, 21 May 2026 04:11:11 -0400 Subject: [PATCH 2/2] Fix Guide.py to allow for scroll_line_up and out of the reader --- nomadnet/ui/textui/Guide.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/nomadnet/ui/textui/Guide.py b/nomadnet/ui/textui/Guide.py index 712b2a1..4b1a71b 100644 --- a/nomadnet/ui/textui/Guide.py +++ b/nomadnet/ui/textui/Guide.py @@ -72,6 +72,22 @@ def _rows_above(attrmaps, index, cols): return total +class GuideColumns(urwid.Columns): + def keypress(self, size, key): + if key == "up" and self.focus_position == 1: + disp = getattr(self, "guide_display", None) + if disp is not None: + scrollable = getattr(disp, "_content_scrollable", None) + if scrollable is not None: + try: + if scrollable.get_scrollpos() <= 0: + nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.focus_position = "header" + return None + except Exception: + pass + return super().keypress(size, key) + + class GuideLinkDelegate: def __init__(self, app, reader=None): self.app = app @@ -190,13 +206,14 @@ class GuideDisplay(): self.right_area = urwid.LineBox(urwid.Filler(topic_text, urwid.TOP)) - self.columns = urwid.Columns( + self.columns = GuideColumns( [ (urwid.WEIGHT, GuideDisplay.list_width, self.left_area), (urwid.WEIGHT, 1-GuideDisplay.list_width, self.right_area) ], dividechars=0, focus_column=0 ) + self.columns.guide_display = self self.shortcuts_display = GuideDisplayShortcuts(self.app) self.widget = self.columns