Updated dependencies

spelling fix

README.md

@@ -1,5 +1,4 @@
-Nomad Network - Communicate Freely
-==========
+# Nomad Network - Communicate Freely
 
 Off-grid, resilient mesh communication with strong encryption, forward secrecy and extreme privacy.
 
@@ -26,11 +25,6 @@ If you'd rather want to use an LXMF client with a graphical user interface, you
 ## Current Status
 The current version of the program should be considered a beta release. The program works well, but there will most probably be bugs and possibly sub-optimal performance in some scenarios. On the other hand, this is the ideal time to have an influence on the direction of the development of Nomad Network. To do so, join the discussion, report bugs and request features here on the GitHub project.
 
-### Feature roadmap
- - Network-wide propagated bulletins and discussion threads
- - Collaborative maps and geospatial information sharing
- - Facilitation of trade and barter
-
 ## How do I get started?
 The easiest way to install Nomad Network is via pip:
 
@@ -119,6 +113,29 @@ You can help support the continued development of open, free and private communi
   ```
 - Ko-Fi: https://ko-fi.com/markqvist
 
+## Development Roadmap
+
+- New major features
+    - Network-wide propagated bulletins and discussion threads
+    - Collaborative maps and geospatial information sharing
+    - Facilitation of trade and barter
+- Minor improvements and fixes
+    - Link status (RSSI and SNR) in conversation or conv list
+    - Ctrl-M shorcut for jumping to menu
+    - Share node with other users / send node info to user
+    - Fix internal editor failing on some OSes with no "editor" alias
+    - Possibly add a required-width header
+    - Improve browser handling of remote link close
+    - Better navigation handling when requests fail (also because of closed links)
+    - Retry failed messages mechanism
+    - Re-arrange buttons to be more consistent
+    - Input field for pages
+    - Post mechanism
+    - Term compatibility notice in readme
+    - Selected icon in conversation list
+    - Possibly a Search Local Nodes function
+    - Possibly add via entry in node info box, next to distance
+
 ## Caveat Emptor
 Nomad Network is beta software, and should be considered as such. While it has been built with cryptography best-practices very foremost in mind, it _has not_ been externally security audited, and there could very well be privacy-breaking bugs. If you want to help out, or help sponsor an audit, please do get in touch.
 

nomadnet/Conversation.py

@@ -227,6 +227,35 @@ class Conversation:
             RNS.log("Destination is not known, cannot create LXMF Message.", RNS.LOG_VERBOSE)
             return False
 
+    def paper_output(self, content="", title=""):
+        if self.send_destination:
+            try:
+                dest = self.send_destination
+                source = self.app.lxmf_destination
+                desired_method = LXMF.LXMessage.PAPER
+
+                lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=desired_method)
+                qr_code = lxm.as_qr()
+                qr_tmp_path = self.app.tmpfilespath+"/"+str(RNS.hexrep(lxm.hash, delimit=False))
+                qr_code.save(qr_tmp_path)
+
+                print_result = self.app.print_file(qr_tmp_path)
+                os.unlink(qr_tmp_path)
+                
+                if print_result:
+                    message_path = Conversation.ingest(lxm, self.app, originator=True)
+                    self.messages.append(ConversationMessage(message_path))
+
+                return print_result
+
+            except Exception as e:
+                RNS.log("An error occurred while generating paper message, the contained exception was: "+str(e), RNS.LOG_ERROR)
+                return False
+
+        else:
+            RNS.log("Destination is not known, cannot create LXMF Message.", RNS.LOG_VERBOSE)
+            return False
+
     def message_notification(self, message):
         if message.state == LXMF.LXMessage.FAILED and hasattr(message, "try_propagation_on_fail") and message.try_propagation_on_fail:
             RNS.log("Direct delivery of "+str(message)+" failed. Retrying as propagated message.", RNS.LOG_VERBOSE)

nomadnet/Directory.py

@@ -5,6 +5,29 @@ import time
 import nomadnet
 import RNS.vendor.umsgpack as msgpack
 
+class PNAnnounceHandler:
+    def __init__(self, owner):
+        self.aspect_filter = "lxmf.propagation"
+        self.owner = owner
+
+    def received_announce(self, destination_hash, announced_identity, app_data):
+        try:
+            if type(app_data) == bytes:
+                data = msgpack.unpackb(app_data)
+
+                if data[0] == True:
+                    RNS.log("Received active propagation node announce from "+RNS.prettyhexrep(destination_hash))
+
+                    associated_peer = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", announced_identity)
+                    associated_node = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", announced_identity)
+
+                    self.owner.app.directory.pn_announce_received(destination_hash, app_data, associated_peer, associated_node)
+                    self.owner.app.autoselect_propagation_node()
+
+        except Exception as e:
+            RNS.log("Error while evaluating propagation node announce, ignoring announce.", RNS.LOG_DEBUG)
+            RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)
+
 class Directory:
     ANNOUNCE_STREAM_MAXLENGTH = 64
 
@@ -14,8 +37,6 @@ class Directory:
         app = nomadnet.NomadNetworkApp.get_shared_instance()
 
         if not destination_hash in app.ignored_list:
-            destination_hash_text = RNS.hexrep(destination_hash, delimit=False)
-
             associated_peer = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", announced_identity)
 
             app.directory.node_announce_received(destination_hash, app_data, associated_peer)
@@ -31,6 +52,9 @@ class Directory:
         self.app = app
         self.load_from_disk()
 
+        self.pn_announce_handler = PNAnnounceHandler(self)
+        RNS.Transport.register_announce_handler(self.pn_announce_handler)
+
 
     def save_to_disk(self):
         try:
@@ -90,7 +114,7 @@ class Directory:
     def lxmf_announce_received(self, source_hash, app_data):
         if app_data != None:
             timestamp = time.time()
-            self.announce_stream.insert(0, (timestamp, source_hash, app_data, False))
+            self.announce_stream.insert(0, (timestamp, source_hash, app_data, "peer"))
             while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
                 self.announce_stream.pop()
 
@@ -100,7 +124,7 @@ class Directory:
     def node_announce_received(self, source_hash, app_data, associated_peer):
         if app_data != None:
             timestamp = time.time()
-            self.announce_stream.insert(0, (timestamp, source_hash, app_data, True))
+            self.announce_stream.insert(0, (timestamp, source_hash, app_data, "node"))
             while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
                 self.announce_stream.pop()
 
@@ -113,6 +137,27 @@ class Directory:
             if hasattr(self.app.ui, "main_display"):
                 self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
 
+    def pn_announce_received(self, source_hash, app_data, associated_peer, associated_node):
+        found_node = None
+        for sh in self.directory_entries:
+            if sh == associated_node:
+                found_node = True
+                break
+
+        for e in self.announce_stream:
+            if e[1] == associated_node:
+                found_node = True
+                break
+
+        if not found_node:
+            timestamp = time.time()
+            self.announce_stream.insert(0, (timestamp, source_hash, app_data, "pn"))
+            while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
+                self.announce_stream.pop()
+            
+            if hasattr(self.app.ui, "main_display"):
+                self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
+
     def remove_announce_with_timestamp(self, timestamp):
         selected_announce = None
         for announce in self.announce_stream:
@@ -250,11 +295,6 @@ class DirectoryEntry:
     def __init__(self, source_hash, display_name=None, trust_level=UNKNOWN, hosts_node=False, preferred_delivery=None, identify_on_connect=False):
         if len(source_hash) == RNS.Identity.TRUNCATED_HASHLENGTH//8:
             self.source_hash  = source_hash
-
-            # TODO: Clean
-            # if display_name  == None:
-            #     display_name  = source_hash
-
             self.display_name = display_name
 
             if preferred_delivery == None:

nomadnet/NomadNetworkApp.py

@@ -105,6 +105,7 @@ class NomadNetworkApp:
         self.conversationpath  = self.configdir+"/storage/conversations"
         self.directorypath     = self.configdir+"/storage/directory"
         self.peersettingspath  = self.configdir+"/storage/peersettings"
+        self.tmpfilespath      = self.configdir+"/storage/tmp"
 
         self.pagespath         = self.configdir+"/storage/pages"
         self.filespath         = self.configdir+"/storage/files"
@@ -145,6 +146,11 @@ class NomadNetworkApp:
         if not os.path.isdir(self.cachepath):
             os.makedirs(self.cachepath)
 
+        if not os.path.isdir(self.tmpfilespath):
+            os.makedirs(self.tmpfilespath)
+        else:
+            self.clear_tmp_dir()
+
         if os.path.isfile(self.configpath):
             try:
                 self.config = ConfigObj(self.configpath)
@@ -256,7 +262,7 @@ class NomadNetworkApp:
                             RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)
 
             except Exception as e:
-                RNS.log("Error while fetching loading list of ignored destinations: "+str(e), RNS.LOG_ERROR)
+                RNS.log("Error while loading list of ignored destinations: "+str(e), RNS.LOG_ERROR)
 
         self.directory = nomadnet.Directory(self)
 
@@ -436,8 +442,9 @@ class NomadNetworkApp:
     def autoselect_propagation_node(self):
         selected_node = None
 
-        if "propagation_node" in self.peer_settings and self.directory.find(self.peer_settings["propagation_node"]):
-            selected_node = self.directory.find(self.peer_settings["propagation_node"])
+        if "propagation_node" in self.peer_settings:
+            selected_node = self.peer_settings["propagation_node"]
+        
         else:
             nodes = self.directory.known_nodes()
             trusted_nodes = []
@@ -450,19 +457,14 @@ class NomadNetworkApp:
 
                     if hops < best_hops:
                         best_hops = hops
-                        selected_node = node
+                        selected_node = node.source_hash
 
         if selected_node == None:
-            RNS.log("Could not autoselect a propagation node! LXMF propagation will not be available until a trusted node announces on the network.", RNS.LOG_WARNING)
+            RNS.log("Could not autoselect a propagation node! LXMF propagation will not be available until a trusted node announces on the network, or a propagation node is manually selected.", RNS.LOG_WARNING)
         else:
-            node_identity = RNS.Identity.recall(selected_node.source_hash)
-            if node_identity != None:
-                propagation_hash = RNS.Destination.hash_from_name_and_identity("lxmf.propagation", node_identity)
-                RNS.log("Selecting "+selected_node.display_name+" "+RNS.prettyhexrep(propagation_hash)+" as default LXMF propagation node", RNS.LOG_INFO)
-                self.message_router.set_outbound_propagation_node(propagation_hash)
-            else:
-                RNS.log("Could not recall identity for autoselected LXMF propagation node "+RNS.prettyhexrep(selected_node.source_hash), RNS.LOG_WARNING)
-                RNS.log("LXMF propagation will not be available until a trusted node announces on the network.", RNS.LOG_WARNING)
+            pn_name_str = ""
+            RNS.log("Selecting "+RNS.prettyhexrep(selected_node)+pn_name_str+" as default LXMF propagation node", RNS.LOG_INFO)
+            self.message_router.set_outbound_propagation_node(selected_node)
 
     def get_user_selected_propagation_node(self):
         if "propagation_node" in self.peer_settings:
@@ -518,6 +520,26 @@ class NomadNetworkApp:
 
         return False
 
+    def print_file(self, filename):
+        print_command = self.print_command+" "+filename
+
+        try:
+            return_code = subprocess.call(shlex.split(print_command), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+
+        except Exception as e:
+            RNS.log("An error occurred while executing print command: "+str(print_command), RNS.LOG_ERROR)
+            RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
+            return False
+
+        if return_code == 0:
+            RNS.log("Successfully printed "+str(filename)+" using print command: "+print_command, RNS.LOG_DEBUG)
+            return True
+
+        else:
+            RNS.log("Printing "+str(filename)+" failed using print command: "+print_command, RNS.LOG_DEBUG)
+            return False
+
+
     def print_message(self, message, received = None):
         try:
             template = self.printing_template_msg
@@ -551,8 +573,7 @@ class NomadNetworkApp:
                 f.write(output.encode("utf-8"))
                 f.close()
 
-            print_command = "lp -d thermal -o cpi=16 -o lpi=8 "+filename
-            return_code = subprocess.call(shlex.split(print_command), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+            self.print_file(filename)
 
             os.unlink(filename)
 
@@ -580,6 +601,12 @@ class NomadNetworkApp:
             if os.path.isfile(self.conversationpath + "/" + source_hash + "/unread"):
                 os.unlink(self.conversationpath + "/" + source_hash + "/unread")
 
+    def clear_tmp_dir(self):
+        if os.path.isdir(self.tmpfilespath):
+            for file in os.listdir(self.tmpfilespath):
+                fpath = self.tmpfilespath+"/"+file
+                os.unlink(fpath)
+
     def createDefaultConfig(self):
         self.config = ConfigObj(__default_nomadnet_config__)
         self.config.filename = self.configpath

nomadnet/_version.py

@@ -1 +1 @@
-__version__ = "0.2.5"
+__version__ = "0.2.8"

nomadnet/ui/TextUI.py

@@ -121,7 +121,9 @@ GLYPHS = {
     ("decoration_menu", " +",        " +",          " \uf93a"),
     ("unread_menu",     " !",        " \u2709",     urm_char),
     ("globe",           "",          "",            "\uf484"),
-    ("sent",            "/\\",       "\u2191",      "\ufbf4")
+    ("sent",            "/\\",       "\u2191",      "\ufbf4"),
+    ("papermsg",        "P",         "\u25a4",      "\uf719"),
+    ("qrcode",          "QR",        "\u25a4",      "\uf029"),
 }
 
 class TextUI:

nomadnet/ui/textui/Conversations.py

@@ -14,13 +14,13 @@ class ConversationListDisplayShortcuts():
     def __init__(self, app):
         self.app = app
 
-        self.widget = urwid.AttrMap(urwid.Text("[C-e] Peer Info  [C-x] Delete  [C-r] Sync  [C-n] New  [C-g] Fullscreen"), "shortcutbar")
+        self.widget = urwid.AttrMap(urwid.Text("[C-e] Peer Info  [C-x] Delete  [C-r] Sync  [C-n] New  [C-u] Ingest URI  [C-g] Fullscreen"), "shortcutbar")
 
 class ConversationDisplayShortcuts():
     def __init__(self, app):
         self.app = app
 
-        self.widget = urwid.AttrMap(urwid.Text("[C-d] Send  [C-k] Clear  [C-w] Close  [C-t] Title  [C-p] Purge  [C-x] Clear History  [C-o] Sort"), "shortcutbar")
+        self.widget = urwid.AttrMap(urwid.Text("[C-d] Send  [C-p] Paper Msg  [C-t] Title  [C-k] Clear  [C-w] Close  [C-u] Purge  [C-x] Clear History  [C-o] Sort"), "shortcutbar")
 
 class ConversationsArea(urwid.LineBox):
     def keypress(self, size, key):
@@ -30,6 +30,8 @@ class ConversationsArea(urwid.LineBox):
             self.delegate.delete_selected_conversation()
         elif key == "ctrl n":
             self.delegate.new_conversation()
+        elif key == "ctrl u":
+            self.delegate.ingest_lxm_uri()
         elif key == "ctrl r":
             self.delegate.sync_conversations()
         elif key == "ctrl g":
@@ -330,6 +332,110 @@ class ConversationsDisplay():
         options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
+    def ingest_lxm_uri(self):
+        self.dialog_open = True
+        lxm_uri = ""
+        e_uri = urwid.Edit(caption="URI : ",edit_text=lxm_uri)
+
+        def dismiss_dialog(sender):
+            self.update_conversation_list()
+            self.dialog_open = False
+
+        def confirmed(sender):
+            try:
+                local_delivery_signal = "local_delivery_occurred"
+                duplicate_signal = "duplicate_lxm"
+                lxm_uri = e_uri.get_edit_text()
+
+                ingest_result = self.app.message_router.ingest_lxm_uri(
+                    lxm_uri,
+                    signal_local_delivery=local_delivery_signal,
+                    signal_duplicate=duplicate_signal
+                )
+
+                if ingest_result == False:
+                    raise ValueError("The URI contained no decodable messages")
+                
+                elif ingest_result == local_delivery_signal:
+                    rdialog_pile = urwid.Pile([
+                        urwid.Text("Message was decoded, decrypted successfully, and added to your conversation list."),
+                        urwid.Text(""),
+                        urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+                    ])
+                    rdialog_pile.error_display = False
+
+                    rdialog = DialogLineBox(rdialog_pile, title="Ingest message URI")
+                    rdialog.delegate = self
+                    bottom = self.listbox
+
+                    roverlay = urwid.Overlay(rdialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+                    options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+                    self.columns_widget.contents[0] = (roverlay, options)
+                
+                elif ingest_result == duplicate_signal:
+                    rdialog_pile = urwid.Pile([
+                        urwid.Text("The decoded message has already been processed by the LXMF Router, and will not be ingested again."),
+                        urwid.Text(""),
+                        urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+                    ])
+                    rdialog_pile.error_display = False
+
+                    rdialog = DialogLineBox(rdialog_pile, title="Ingest message URI")
+                    rdialog.delegate = self
+                    bottom = self.listbox
+
+                    roverlay = urwid.Overlay(rdialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+                    options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+                    self.columns_widget.contents[0] = (roverlay, options)
+                
+                else:
+                    if self.app.enable_node:
+                        propagation_text = "The decoded message was not addressed to this LXMF address, but has been added to the propagation node queues, and will be distributed on the propagation network."
+                    else:
+                        propagation_text = "The decoded message was not addressed to this LXMF address, and has been discarded."
+
+                    rdialog_pile = urwid.Pile([
+                        urwid.Text(propagation_text),
+                        urwid.Text(""),
+                        urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+                    ])
+                    rdialog_pile.error_display = False
+
+                    rdialog = DialogLineBox(rdialog_pile, title="Ingest message URI")
+                    rdialog.delegate = self
+                    bottom = self.listbox
+
+                    roverlay = urwid.Overlay(rdialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+                    options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+                    self.columns_widget.contents[0] = (roverlay, options)
+
+            except Exception as e:
+                RNS.log("Could not ingest LXM URI. The contained exception was: "+str(e), RNS.LOG_VERBOSE)
+                if not dialog_pile.error_display:
+                    dialog_pile.error_display = True
+                    options = dialog_pile.options(height_type="pack")
+                    dialog_pile.contents.append((urwid.Text(""), options))
+                    dialog_pile.contents.append((urwid.Text(("error_text", "Could ingest LXM from URI data. Check your input."), align="center"), options))
+
+        dialog_pile = urwid.Pile([
+            e_uri,
+            urwid.Text(""),
+            urwid.Columns([("weight", 0.45, urwid.Button("Ingest", on_press=confirmed)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Back", on_press=dismiss_dialog))])
+        ])
+        dialog_pile.error_display = False
+
+        dialog = DialogLineBox(dialog_pile, title="Ingest message URI")
+        dialog.delegate = self
+        bottom = self.listbox
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+        self.columns_widget.contents[0] = (overlay, options)
+
     def delete_conversation(self, source_hash):
         if source_hash in ConversationsDisplay.cached_conversation_widgets:
             conversation = ConversationsDisplay.cached_conversation_widgets[source_hash]
@@ -398,10 +504,15 @@ class ConversationsDisplay():
         if pn_ident != None:
             node_hash = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", pn_ident)
             pn_entry = self.app.directory.find(node_hash)
+            pn_display_str = " "
+            if pn_entry != None:
+                pn_display_str += " "+str(pn_entry.display_name)
+            else:
+                pn_display_str += " "+RNS.prettyhexrep(pn_hash)
 
             dialog = DialogLineBox(
                 urwid.Pile([
-                    urwid.Text(""+g["node"]+" "+str(pn_entry.display_name), align="center"),
+                    urwid.Text(""+g["node"]+pn_display_str, align="center"),
                     urwid.Divider(g["divider1"]),
                     sync_progress,
                     urwid.Divider(g["divider1"]),
@@ -417,7 +528,7 @@ class ConversationsDisplay():
                 urwid.Pile([
                     urwid.Text(""),
                     urwid.Text("No trusted nodes found, cannot sync!\n", align="center"),
-                    urwid.Text("To syncronise messages from the network, one or more nodes must be marked as trusted in the Known Nodes list. Nomad Network will then automatically sync from the nearest trusted node.", align="left"),
+                    urwid.Text("To syncronise messages from the network, one or more nodes must be marked as trusted in the Known Nodes list, or a node must manually be selected as the default propagation node. Nomad Network will then automatically sync from the nearest trusted node, or the manually selected one.", align="left"),
                     urwid.Text(""),
                     button_columns
                 ]), title="Message Sync"
@@ -631,6 +742,8 @@ class MessageEdit(urwid.Edit):
     def keypress(self, size, key):
         if key == "ctrl d":
             self.delegate.send_message()
+        elif key == "ctrl p":
+            self.delegate.paper_message()
         elif key == "ctrl k":
             self.delegate.clear_editor()
         elif key == "up":
@@ -795,7 +908,7 @@ class ConversationWidget(urwid.WidgetWrap):
             self.toggle_focus_area()
         elif key == "ctrl w":
             self.close()
-        elif key == "ctrl p":
+        elif key == "ctrl u":
             self.conversation.purge_failed()
             self.conversation_changed(None)
         elif key == "ctrl t":
@@ -855,6 +968,34 @@ class ConversationWidget(urwid.WidgetWrap):
             else:
                 pass
 
+    def paper_message(self):
+        content = self.content_editor.get_edit_text()
+        title = self.title_editor.get_edit_text()
+        if not content == "":
+            if self.conversation.paper_output(content, title):
+                self.clear_editor()
+            else:
+                self.paper_message_failed()
+
+    def paper_message_failed(self):
+        def dismiss_dialog(sender):
+            self.dialog_open = False
+            self.conversation_changed(None)
+
+        dialog = DialogLineBox(
+            urwid.Pile([
+                urwid.Text("Could not output paper message,\ncheck your settings. See the log\nfile for any error messages.\n", align="center"),
+                urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+            ]), title="!"
+        )
+        dialog.delegate = self
+        bottom = self.messagelist
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=34, valign="middle", height="pack", left=2, right=2)
+
+        self.frame.contents["body"] = (overlay, self.frame.options())
+        self.frame.set_focus("body")
+
     def close(self):
         self.delegate.close_conversation(self)
 
@@ -885,6 +1026,9 @@ class LXMessageWidget(urwid.WidgetWrap):
             elif message.lxm.method == LXMF.LXMessage.PROPAGATED and message.lxm.state == LXMF.LXMessage.SENT:
                 header_style = "msg_header_propagated"
                 title_string = g["sent"]+" "+title_string
+            elif message.lxm.method == LXMF.LXMessage.PAPER and message.lxm.state == LXMF.LXMessage.PAPER:
+                header_style = "msg_header_propagated"
+                title_string = g["papermsg"]+" "+title_string
             elif message.lxm.state == LXMF.LXMessage.SENT:
                 header_style = "msg_header_sent"
                 title_string = g["sent"]+" "+title_string

nomadnet/ui/textui/Guide.py

@@ -272,7 +272,7 @@ In the `![ Conversations ]`! part of the program you can view and interact with
 
 By default, Nomad Network will attempt to deliver messages to a peer directly. This happens by first establishing an encrypted link directly to the peer, and then delivering the message over it.
 
-If the desired peer is not available because it has disconnected from the network, this method will obviously fail. In this case, Nomad Network will attempt to deliver the message to a node, which will store and forward it over the network, for later retrieval by the destination peer. The message is encrypted with an ephemeral key before being transmitted to the network, and is only readable by the intended recipient.
+If the desired peer is not available because it has disconnected from the network, this method will obviously fail. In this case, Nomad Network will attempt to deliver the message to a node, which will store and forward it over the network, for later retrieval by the destination peer. The message is encrypted before being transmitted to the network, and is only readable by the intended recipient.
 
 For propagated delivery to work, one or more nodes must be available on the network. If one or more trusted nodes are available, Nomad Network will automatically select the most suitable node to send the message via, but you can also manually specify what node to use.
 

nomadnet/ui/textui/Network.py

@@ -71,11 +71,17 @@ class AnnounceInfo(urwid.WidgetWrap):
         trust_str    = ""
         display_str  = self.app.directory.simplest_display_str(source_hash)
         addr_str     = "<"+RNS.hexrep(source_hash, delimit=False)+">"
-        is_node      = announce[3]
+        info_type    = announce[3]
 
-        if is_node:
-            type_string = "Node " + g["node"]
-        else:
+        is_node = False
+        is_pn   = False
+        if info_type == "node" or info_type == True:
+            type_string = "Nomad Network Node " + g["node"]
+            is_node = True
+        elif info_type == "pn":
+            type_string = "LXMF Propagation Node " + g["sent"]
+            is_pn = True
+        elif info_type == "peer" or info_type == False:
             type_string = "Peer " + g["peer"]
 
         try:
@@ -174,10 +180,20 @@ class AnnounceInfo(urwid.WidgetWrap):
             except Exception as e:
                 RNS.log("Error while starting conversation from announce. The contained exception was: "+str(e), RNS.LOG_ERROR)
 
+        def use_pn(sender):
+            show_announce_stream(None)
+            try:
+                self.app.set_user_selected_propagation_node(source_hash)
+            except Exception as e:
+                RNS.log("Error while setting active propagation node from announce. The contained exception was: "+str(e), RNS.LOG_ERROR)
+
         if is_node:
             type_button = ("weight", 0.45, urwid.Button("Connect", on_press=connect))
             msg_button =  ("weight", 0.45, urwid.Button("Msg Op", on_press=msg_op))
             save_button = ("weight", 0.45, urwid.Button("Save", on_press=save_node))
+        elif is_pn:
+            type_button = ("weight", 0.45, urwid.Button("Use as default", on_press=use_pn))
+            save_button = None
         else:
             type_button = ("weight", 0.45, urwid.Button("Converse", on_press=converse))
             save_button = None
@@ -187,21 +203,33 @@ class AnnounceInfo(urwid.WidgetWrap):
         else:
             button_columns = urwid.Columns([("weight", 0.45, urwid.Button("Back", on_press=show_announce_stream)), ("weight", 0.1, urwid.Text("")), type_button])
 
-        pile_widgets = [
-            urwid.Text("Time  : "+ts_string, align="left"),
-            urwid.Text("Addr  : "+addr_str, align="left"),
-            urwid.Text("Type  : "+type_string, align="left"),
-            urwid.Text("Name  : "+display_str, align="left"),
-            urwid.Text(["Trust : ", (style, trust_str)], align="left"),
-            urwid.Divider(g["divider1"]),
-            urwid.Text(["Announce Data: \n", (data_style, data_str)], align="left"),
-            urwid.Divider(g["divider1"]),
-            button_columns
-        ]
+        pile_widgets = []
 
-        if is_node:
-            operator_entry = urwid.Text("Oprtr : "+op_str, align="left")
-            pile_widgets.insert(4, operator_entry)
+        if is_pn:
+            pile_widgets = [
+                urwid.Text("Time  : "+ts_string, align="left"),
+                urwid.Text("Addr  : "+addr_str, align="left"),
+                urwid.Text("Type  : "+type_string, align="left"),
+                urwid.Divider(g["divider1"]),
+                button_columns
+            ]
+
+        else:
+            pile_widgets = [
+                urwid.Text("Time  : "+ts_string, align="left"),
+                urwid.Text("Addr  : "+addr_str, align="left"),
+                urwid.Text("Type  : "+type_string, align="left"),
+                urwid.Text("Name  : "+display_str, align="left"),
+                urwid.Text(["Trust : ", (style, trust_str)], align="left"),
+                urwid.Divider(g["divider1"]),
+                urwid.Text(["Announce Data: \n", (data_style, data_str)], align="left"),
+                urwid.Divider(g["divider1"]),
+                button_columns
+            ]
+
+            if is_node:
+                operator_entry = urwid.Text("Oprtr : "+op_str, align="left")
+                pile_widgets.insert(4, operator_entry)
 
         pile = urwid.Pile(pile_widgets)
 
@@ -220,7 +248,7 @@ class AnnounceStreamEntry(urwid.WidgetWrap):
 
         timestamp = announce[0]
         source_hash = announce[1]
-        is_node = announce[3]
+        announce_type = announce[3]
         self.app = app
         self.timestamp = timestamp
         time_format = app.time_format
@@ -257,10 +285,12 @@ class AnnounceStreamEntry(urwid.WidgetWrap):
             style         = "list_untrusted"
             focus_style   = "list_focus_untrusted"
 
-        if is_node:
+        if announce_type == "node" or announce_type == True:
             type_symbol = g["node"]
-        else:
+        elif announce_type == "peer" or announce_type == False:
             type_symbol = g["peer"]
+        elif announce_type == "pn":
+            type_symbol = g["sent"]
 
         widget = ListEntry(ts_string+" "+type_symbol+" "+display_str)
         urwid.connect_signal(widget, "click", self.display_announce, announce)
@@ -425,13 +455,15 @@ class KnownNodeInfo(urwid.WidgetWrap):
         if display_str == None:
             display_str = addr_str
 
+        pn_hash = RNS.Destination.hash_from_name_and_identity("lxmf.propagation", node_ident)
+
         if node_ident != None:
-            lxmf_addr_str = g["sent"]+" LXMF Propagation Node Address is "+RNS.prettyhexrep(RNS.Destination.hash_from_name_and_identity("lxmf.propagation", node_ident))
+            lxmf_addr_str = g["sent"]+" LXMF Propagation Node Address is "+RNS.prettyhexrep(pn_hash)
         else:
             lxmf_addr_str = "No associated Propagation Node known"
 
 
-        type_string = "Node " + g["node"]
+        type_string = "Nomad Network Node " + g["node"]
 
         if trust_level == DirectoryEntry.UNTRUSTED:
             trust_str     = "Untrusted"
@@ -525,7 +557,7 @@ class KnownNodeInfo(urwid.WidgetWrap):
         def save_node(sender):
             if self.pn_changed:
                 if propagation_node_checkbox.get_state():
-                    self.app.set_user_selected_propagation_node(source_hash)
+                    self.app.set_user_selected_propagation_node(pn_hash)
                 else:
                     self.app.set_user_selected_propagation_node(None)
 
@@ -862,7 +894,7 @@ class NodeActiveConnections(urwid.WidgetWrap):
         if self.app.node != None:
             self.stat_string = str(len(self.app.node.destination.links))
 
-        self.display_widget.set_text("Conneced Now   : "+self.stat_string)
+        self.display_widget.set_text("Connected Now  : "+self.stat_string)
 
     def update_stat_callback(self, loop=None, user_data=None):
         self.update_stat()

setup.py

@@ -23,6 +23,6 @@ setuptools.setup(
     entry_points= {
         'console_scripts': ['nomadnet=nomadnet.nomadnet:main']
     },
-    install_requires=['rns>=0.3.16', 'lxmf>=0.2.1', 'urwid>=2.1.2'],
-    python_requires='>=3.6',
+    install_requires=["rns>=0.4.2", "lxmf>=0.2.6", "urwid>=2.1.2", "qrcode"],
+    python_requires=">=3.6",
 )