Updated readme

Makefile

@@ -0,0 +1,25 @@
+all: release
+
+clean:
+	@echo Cleaning...
+	-rm -r ./build
+	-rm -r ./dist
+
+remove_symlinks:
+	@echo Removing symlinks for build...
+	-rm ./LXMF
+	-rm ./RNS
+
+create_symlinks:
+	@echo Creating symlinks...
+	-ln -s ../Reticulum/RNS ./
+	-ln -s ../LXMF/LXMF ./
+
+build_wheel:
+	python3 setup.py sdist bdist_wheel
+
+release: remove_symlinks build_wheel create_symlinks
+
+upload:
+	@echo Uploading to PyPi...
+	twine upload dist/*

README.md

@@ -1,31 +1,34 @@
-Nomad Network
+Nomad Network - Communicate Freely
 ==========
 
-Communicate Freely.
+Off-grid, resilient mesh communication with strong encryption, forward secrecy and extreme privacy.
 
 ![Screenshot](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/1.png)
 
-The intention with this program is to provide a tool to that allows you to build private and resilient communications platforms that are in complete control and ownership of the people that use them.
+Nomad Network Allows you to build private and resilient communications platforms that are in complete control and ownership of the people that use them. No signups, no agreements, no handover of any data, no permissions and gatekeepers.
 
-Nomad Network is build on [LXMF](https://github.com/markqvist/LXMF) and [Reticulum](https://github.com/markqvist/Reticulum), which together provides the cryptographic mesh functionality and peer-to-peer message routing that Nomad Network relies on. This foundation also makes it possible to use the program over a very wide variety of communication mediums, from packet radio to fiber.
+Nomad Network is build on [LXMF](https://github.com/markqvist/LXMF) and [Reticulum](https://github.com/markqvist/Reticulum), which together provides the cryptographic mesh functionality and peer-to-peer message routing that Nomad Network relies on. This foundation also makes it possible to use the program over a very wide variety of communication mediums, from packet radio to fiber optics.
 
-Nomad Network does not need any connections to the public internet to work. In fact, it doesn't even need an IP or Ethernet network. You can use it entirely over packet radio, LoRa or even serial lines. But if you wish, you can bridge islanded Reticulum networks over the Internet or private ethernet networks, or you can build networks running completely over the Internet. The choice is yours.
+Nomad Network does not need any connections to the public internet to work. In fact, it doesn't even need an IP or Ethernet network. You can use it entirely over packet radio, LoRa or even serial lines. But if you wish, you can bridge islanded networks over the Internet or private ethernet networks, or you can build networks running completely over the Internet. The choice is yours.
 
 ## Notable Features
  - Encrypted messaging over packet-radio, LoRa, WiFi or anything else [Reticulum](https://github.com/markqvist/Reticulum) supports.
  - Zero-configuration, minimal-infrastructure mesh communication
+ - Distributed and encrypted message store holds messages for offline users
  - Connectable nodes that can host pages and files
+ - Node-side generated pages with PHP, Python, bash or others
  - Built-in text-based browser for interacting with contents on nodes
  - An easy to use and bandwidth efficient markup language for writing pages
+ - Page caching in browser
 
 ## 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
- - Page caching in browser
+ - Access control and authentication for nodes, pages and files
- - Node-side generated pages with PHP, Python, bash or others
+ - Network-wide propagated bulletins and discussion threads
- - Access control and authentication for pages and files
+ - Collaborative maps
- - Propagated messaging and discussion threads
+ - Facilitation of trade and barter
 
 ## Dependencies:
  - Python 3
@@ -43,7 +46,31 @@ pip3 install nomadnet
 nomadnet
 ```
 
-To use Nomad Network on packet radio or LoRa, you will need to configure your Reticulum installation to use any relevant packet radio TNCs or LoRa devices on your system. See the Reticulum documentation for info.
+The first time the program is running, you will be presented with the guide section, which contains all the information you need to start using Nomad Network.
+
+To use Nomad Network on packet radio or LoRa, you will need to configure your Reticulum installation to use any relevant packet radio TNCs or LoRa devices on your system. See the [Reticulum documentation](https://markqvist.github.io/Reticulum/manual/interfaces.html) for info.
+
+### Installing on Android
+You can install Nomad Network on Android using Termux, but there's a few extra commands involved than the above one-liner. The process is documented in the [Android Installation](https://markqvist.github.io/Reticulum/manual/gettingstartedfast.html#reticulum-on-android) section of the Reticulum Manual. Once the Reticulum has been installed according to the linked documentation, Nomad Network can be installed as usual with pip.
+
+## Support Nomad Network
+You can help support the continued development of open, free and private communications systems by donating via one of the following channels:
+
+- Ethereum: 0x81F7B979fEa6134bA9FD5c701b3501A2e61E897a
+- Bitcoin: 3CPmacGm34qYvR6XWLVEJmi2aNe3PZqUuq
+- Ko-Fi: https://ko-fi.com/markqvist
 
 ## Caveat Emptor
-Nomad Network is experimental 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.
+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.
+
+## Screenshots
+
+![Screenshot 1](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/1.png)
+
+![Screenshot 2](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/2.png)
+
+![Screenshot 3](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/3.png)
+
+![Screenshot 4](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/4.png)
+
+![Screenshot 5](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/5.png)

nomadnet/Conversation.py

@@ -196,9 +196,18 @@ class Conversation:
         if self.send_destination:
             dest = self.send_destination
             source = self.app.lxmf_destination
-            lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=LXMF.LXMessage.DIRECT)
+            desired_method = LXMF.LXMessage.DIRECT
+            if self.app.directory.preferred_delivery(dest.hash) == DirectoryEntry.PROPAGATED:
+                if self.app.message_router.get_outbound_propagation_node() != None:
+                    desired_method = LXMF.LXMessage.PROPAGATED
+
+            lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=desired_method)
             lxm.register_delivery_callback(self.message_notification)
             lxm.register_failed_callback(self.message_notification)
+
+            if self.app.message_router.get_outbound_propagation_node() != None:
+                lxm.try_propagation_on_fail = self.app.try_propagation_on_fail
+
             self.app.message_router.handle_outbound(lxm)
 
             message_path = Conversation.ingest(lxm, self.app, originator=True)
@@ -210,7 +219,16 @@ class Conversation:
             return False
 
     def message_notification(self, message):
-        message_path = Conversation.ingest(message, self.app, originator=True)
+        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)
+            message.try_propagation_on_fail = None
+            message.delivery_attempts = 0
+            del message.next_delivery_attempt
+            message.packed = None
+            message.desired_method = LXMF.LXMessage.PROPAGATED
+            self.app.message_router.handle_outbound(message)
+        else:
+            message_path = Conversation.ingest(message, self.app, originator=True)
 
     def __str__(self):
         string = self.source_hash
@@ -236,6 +254,7 @@ class ConversationMessage:
             self.lxm = LXMF.LXMessage.unpack_from_file(open(self.file_path, "rb"))
             self.loaded = True
             self.timestamp = self.lxm.timestamp
+            self.sort_timestamp = os.path.getmtime(self.file_path)
 
             if self.lxm.state > LXMF.LXMessage.DRAFT and self.lxm.state < LXMF.LXMessage.SENT:
                 found = False

nomadnet/Directory.py

@@ -17,6 +17,7 @@ class Directory:
         associated_peer = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", announced_identity)
 
         app.directory.node_announce_received(destination_hash, app_data, associated_peer)
+        app.autoselect_propagation_node()
 
 
     def __init__(self, app):
@@ -31,7 +32,7 @@ class Directory:
             packed_list = []
             for source_hash in self.directory_entries:
                 e = self.directory_entries[source_hash]
-                packed_list.append((e.source_hash, e.display_name, e.trust_level, e.hosts_node))
+                packed_list.append((e.source_hash, e.display_name, e.trust_level, e.hosts_node, e.preferred_delivery))
 
             directory = {
                 "entry_list": packed_list,
@@ -59,7 +60,12 @@ class Directory:
                     else:
                         hosts_node = False
 
-                    entries[e[0]] = DirectoryEntry(e[0], e[1], e[2], hosts_node)
+                    if len(e) > 4:
+                        preferred_delivery = e[4]
+                    else:
+                        preferred_delivery = None
+
+                    entries[e[0]] = DirectoryEntry(e[0], e[1], e[2], hosts_node, preferred_delivery=preferred_delivery)
 
                 self.directory_entries = entries
 
@@ -85,9 +91,12 @@ class Directory:
                 self.announce_stream.pop()
 
             if self.trust_level(associated_peer) == DirectoryEntry.TRUSTED:
-                node_entry = DirectoryEntry(source_hash, display_name=app_data.decode("utf-8"), trust_level=DirectoryEntry.TRUSTED, hosts_node=True)
+                existing_entry = self.find(source_hash)
-                self.remember(node_entry)
+                if not existing_entry:
-                self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
+                    node_entry = DirectoryEntry(source_hash, display_name=app_data.decode("utf-8"), trust_level=DirectoryEntry.TRUSTED, hosts_node=True)
+                    self.remember(node_entry)
+            
+            self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
 
     def remove_announce_with_timestamp(self, timestamp):
         selected_announce = None
@@ -114,6 +123,13 @@ class Directory:
             else:
                 return "<"+RNS.hexrep(source_hash, delimit=False)+">"
 
+    def alleged_display_str(self, source_hash):
+        if source_hash in self.directory_entries:
+            return self.directory_entries[source_hash].display_name
+        else:
+            return None
+
+
     def trust_level(self, source_hash, announced_display_name=None):
         if source_hash in self.directory_entries:
             if announced_display_name == None:
@@ -129,14 +145,21 @@ class Directory:
         else:
             return DirectoryEntry.UNKNOWN
 
+    def preferred_delivery(self, source_hash):
+        if source_hash in self.directory_entries:
+            return self.directory_entries[source_hash].preferred_delivery
+        else:
+            return DirectoryEntry.DIRECT
+
     def remember(self, entry):
         self.directory_entries[entry.source_hash] = entry
 
         identity = RNS.Identity.recall(entry.source_hash)
-        associated_node = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", identity)
+        if identity != None:
-        if associated_node in self.directory_entries:
+            associated_node = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", identity)
-            node_entry = self.directory_entries[associated_node]
+            if associated_node in self.directory_entries:
-            node_entry.trust_level = entry.trust_level
+                node_entry = self.directory_entries[associated_node]
+                node_entry.trust_level = entry.trust_level
 
     def forget(self, source_hash):
         if source_hash in self.directory_entries:
@@ -188,13 +211,21 @@ class DirectoryEntry:
     UNKNOWN   = 0x02
     TRUSTED   = 0xFF
 
-    def __init__(self, source_hash, display_name=None, trust_level=UNKNOWN, hosts_node=False):
+    DIRECT     = 0x01
+    PROPAGATED = 0x02
+
+    def __init__(self, source_hash, display_name=None, trust_level=UNKNOWN, hosts_node=False, preferred_delivery=None):
         if len(source_hash) == RNS.Identity.TRUNCATED_HASHLENGTH//8:
             self.source_hash  = source_hash
             self.display_name = display_name
             if display_name  == None:
                 display_name  = source_hash
 
+            if preferred_delivery == None:
+                self.preferred_delivery = DirectoryEntry.DIRECT
+            else:
+                self.preferred_delivery = preferred_delivery
+
             self.trust_level  = trust_level
             self.hosts_node   = hosts_node
         else:

nomadnet/Node.py

@@ -2,17 +2,19 @@ import os
 import RNS
 import time
 import threading
+import subprocess
 import RNS.vendor.umsgpack as msgpack
 
 class Node:
     JOB_INTERVAL = 5
+    START_ANNOUNCE_DELAY = 6
 
     def __init__(self, app):
         RNS.log("Nomad Network Node starting...", RNS.LOG_VERBOSE)
         self.app = app
         self.identity = self.app.identity
         self.destination = RNS.Destination(self.identity, RNS.Destination.IN, RNS.Destination.SINGLE, "nomadnetwork", "node")
-        self.last_announce = None
+        self.last_announce = time.time()
         self.announce_interval = self.app.node_announce_interval
         self.job_interval = Node.JOB_INTERVAL
         self.should_run_jobs = True
@@ -28,7 +30,17 @@ class Node:
         RNS.log("Node \""+self.name+"\" ready for incoming connections on "+RNS.prettyhexrep(self.destination.hash), RNS.LOG_VERBOSE)
 
         if self.app.node_announce_at_start:
-            self.announce()
+            def delayed_announce():
+                time.sleep(Node.START_ANNOUNCE_DELAY)
+                self.announce()
+
+            da_thread = threading.Thread(target=delayed_announce)
+            da_thread.setDaemon(True)
+            da_thread.start()
+
+        job_thread = threading.Thread(target=self.__jobs)
+        job_thread.setDaemon(True)
+        job_thread.start()
 
 
     def register_pages(self):
@@ -87,10 +99,14 @@ class Node:
         file_path = path.replace("/page", self.app.pagespath, 1)
         try:
             RNS.log("Serving page: "+file_path, RNS.LOG_VERBOSE)
-            fh = open(file_path, "rb")
+            if os.access(file_path, os.X_OK):
-            response_data = fh.read()
+                generated = subprocess.run([file_path], stdout=subprocess.PIPE)
-            fh.close()
+                return generated.stdout
-            return response_data
+            else:
+                fh = open(file_path, "rb")
+                response_data = fh.read()
+                fh.close()
+                return response_data
 
         except Exception as e:
             RNS.log("Error occurred while handling request "+RNS.prettyhexrep(request_id)+" for: "+str(path), RNS.LOG_ERROR)
@@ -121,13 +137,15 @@ class Node:
     def announce(self):
         self.app_data = self.name.encode("utf-8")
         self.last_announce = time.time()
+        self.app.peer_settings["node_last_announce"] = self.last_announce
         self.destination.announce(app_data=self.app_data)
+        self.app.message_router.announce_propagation_node()
 
     def __jobs(self):
         while self.should_run_jobs:
             now = time.time()
             
-            if now > self.last_announce + self.announce_interval:
+            if now > self.last_announce + self.announce_interval*60:
                 self.announce()
 
             time.sleep(self.job_interval)

nomadnet/NomadNetworkApp.py

@@ -1,11 +1,18 @@
 import os
+import io
+import sys
 import time
 import atexit
+import threading
+import traceback
+import contextlib
 
 import RNS
 import LXMF
 import nomadnet
 
+from nomadnet.Directory import DirectoryEntry
+
 import RNS.vendor.umsgpack as msgpack
 
 from ._version import __version__
@@ -17,12 +24,26 @@ class NomadNetworkApp:
 
     configdir = os.path.expanduser("~")+"/.nomadnetwork"
 
+    START_ANNOUNCE_DELAY = 3
+
     def exit_handler(self):
         RNS.log("Nomad Network Client exit handler executing...", RNS.LOG_VERBOSE)
         RNS.log("Saving directory...", RNS.LOG_VERBOSE)
         self.directory.save_to_disk()
         RNS.log("Nomad Network Client exiting now", RNS.LOG_VERBOSE)
 
+    def exception_handler(self, e_type, e_value, e_traceback):
+        RNS.log("An unhandled exception occurred, the details of which will be dumped below", RNS.LOG_ERROR)
+        RNS.log("Type  : "+str(e_type), RNS.LOG_ERROR)
+        RNS.log("Value : "+str(e_value), RNS.LOG_ERROR)
+        t_string = ""
+        for line in traceback.format_tb(e_traceback):
+            t_string += line
+        RNS.log("Trace : \n"+t_string, RNS.LOG_ERROR)
+
+        if issubclass(e_type, KeyboardInterrupt):
+            sys.__excepthook__(e_type, e_value, e_traceback)
+
     def __init__(self, configdir = None, rnsconfigdir = None):
         self.version       = __version__
         self.enable_client = False
@@ -43,6 +64,7 @@ class NomadNetworkApp:
 
         self.configpath        = self.configdir+"/config"
         self.logfilepath       = self.configdir+"/logfile"
+        self.errorfilepath     = self.configdir+"/errors"
         self.storagepath       = self.configdir+"/storage"
         self.identitypath      = self.configdir+"/storage/identity"
         self.cachepath         = self.configdir+"/storage/cache"
@@ -53,11 +75,15 @@ class NomadNetworkApp:
 
         self.pagespath         = self.configdir+"/storage/pages"
         self.filespath         = self.configdir+"/storage/files"
+        self.cachepath         = self.configdir+"/storage/cache"
 
         self.downloads_path    = os.path.expanduser("~/Downloads")
 
         self.firstrun          = False
 
+        self.peer_announce_at_start  = True
+        self.try_propagation_on_fail = True
+
         if not os.path.isdir(self.storagepath):
             os.makedirs(self.storagepath)
 
@@ -76,6 +102,9 @@ class NomadNetworkApp:
         if not os.path.isdir(self.filespath):
             os.makedirs(self.filespath)
 
+        if not os.path.isdir(self.cachepath):
+            os.makedirs(self.cachepath)
+
         if os.path.isfile(self.configpath):
             try:
                 self.config = ConfigObj(self.configpath)
@@ -123,6 +152,13 @@ class NomadNetworkApp:
                 file = open(self.peersettingspath, "rb")
                 self.peer_settings = msgpack.unpackb(file.read())
                 file.close()
+
+                if not "node_last_announce" in self.peer_settings:
+                    self.peer_settings["node_last_announce"] = None
+
+                if not "propagation_node" in self.peer_settings:
+                    self.peer_settings["propagation_node"] = None
+
             except Exception as e:
                 RNS.log("Could not load local peer settings from "+self.peersettingspath, RNS.LOG_ERROR)
                 RNS.log("The contained exception was: %s" % (str(e)), RNS.LOG_ERROR)
@@ -134,6 +170,8 @@ class NomadNetworkApp:
                     "display_name": "Anonymous Peer",
                     "announce_interval": None,
                     "last_announce": None,
+                    "node_last_announce": None,
+                    "propagation_node": None
                 }
                 self.save_peer_settings()
                 RNS.log("Created new peer settings file")
@@ -143,9 +181,9 @@ class NomadNetworkApp:
                 nomadnet.panic()
 
 
-        atexit.register(self.exit_handler)
+        self.directory = nomadnet.Directory(self)
 
-        self.message_router = LXMF.LXMRouter()
+        self.message_router = LXMF.LXMRouter(identity = self.identity, storagepath = self.storagepath, autopeer = True)
         self.message_router.register_delivery_callback(self.lxmf_delivery)
 
         self.lxmf_destination = self.message_router.register_delivery_identity(self.identity, display_name=self.peer_settings["display_name"])
@@ -160,9 +198,9 @@ class NomadNetworkApp:
 
         RNS.log("LXMF Router ready to receive on: "+RNS.prettyhexrep(self.lxmf_destination.hash))
 
-        self.directory = nomadnet.Directory(self)
-
         if self.enable_node:
+            self.message_router.enable_propagation()
+            RNS.log("LXMF Propagation Node started on: "+RNS.prettyhexrep(self.message_router.propagation_destination.hash))
             self.node = nomadnet.Node(self)
         else:
             self.node = None
@@ -170,7 +208,40 @@ class NomadNetworkApp:
         RNS.Transport.register_announce_handler(nomadnet.Conversation)
         RNS.Transport.register_announce_handler(nomadnet.Directory)
 
-        nomadnet.ui.spawn(self.uimode)
+        self.autoselect_propagation_node()
+
+        if self.peer_announce_at_start:
+            def delayed_announce():
+                time.sleep(NomadNetworkApp.START_ANNOUNCE_DELAY)
+                self.announce_now()
+
+            da_thread = threading.Thread(target=delayed_announce)
+            da_thread.setDaemon(True)
+            da_thread.start()
+
+        atexit.register(self.exit_handler)
+        sys.excepthook = self.exception_handler
+
+        # This stderr redirect is needed to stop urwid
+        # from spewing KeyErrors to the console and thus,
+        # messing up the UI. A pull request to fix the
+        # bug in urwid was submitted, but until it is
+        # merged, this hack will mitigate it.
+        strio = io.StringIO()
+        with contextlib.redirect_stderr(strio):
+            nomadnet.ui.spawn(self.uimode)
+
+        if strio.tell() > 0:
+            try:
+                strio.seek(0)
+                err_file = open(self.errorfilepath, "w")
+                err_file.write(strio.read())
+                err_file.close()
+
+            except Exception as e:
+                RNS.log("Could not write stderr output to error log file at "+str(self.errorfilepath)+".", RNS.LOG_ERROR)
+                RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
+
 
     def set_display_name(self, display_name):
         self.peer_settings["display_name"] = display_name
@@ -183,11 +254,111 @@ class NomadNetworkApp:
     def get_display_name_bytes(self):
         return self.peer_settings["display_name"].encode("utf-8")
 
+    def get_sync_status(self):
+        if self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_IDLE:
+            return "Idle"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_PATH_REQUESTED:
+            return "Path requested"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_LINK_ESTABLISHING:
+            return "Establishing link"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_LINK_ESTABLISHED:
+            return "Link established"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_REQUEST_SENT:
+            return "Sync request sent"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RECEIVING:
+            return "Receiving messages"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RESPONSE_RECEIVED:
+            return "Messages received"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_COMPLETE:
+            new_msgs = self.message_router.propagation_transfer_last_result
+            if new_msgs == 0:
+                return "Done, no new messages"
+            else:
+                return "Downloaded "+str(new_msgs)+" new messages"
+        else:
+            return "Unknown"
+
+    def sync_status_show_percent(self):
+        if self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_IDLE:
+            return False
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_PATH_REQUESTED:
+            return True
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_LINK_ESTABLISHING:
+            return True
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_LINK_ESTABLISHED:
+            return True
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_REQUEST_SENT:
+            return True
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RECEIVING:
+            return True
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RESPONSE_RECEIVED:
+            return True
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_COMPLETE:
+            return False
+        else:
+            return False
+
+    def get_sync_progress(self):
+        return self.message_router.propagation_transfer_progress
+
+    def request_lxmf_sync(self, limit = None):
+        if self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_IDLE or self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_COMPLETE:
+            self.message_router.request_messages_from_propagation_node(self.identity, max_messages = limit)
+
+    def cancel_lxmf_sync(self):
+        if self.message_router.propagation_transfer_state != LXMF.LXMRouter.PR_IDLE:
+            self.message_router.cancel_propagation_node_requests()
+
     def announce_now(self):
         self.lxmf_destination.announce()
         self.peer_settings["last_announce"] = time.time()
         self.save_peer_settings()
 
+    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"])
+        else:
+            nodes = self.directory.known_nodes()
+            trusted_nodes = []
+
+            best_hops = RNS.Transport.PATHFINDER_M+1
+
+            for node in nodes:
+                if node.trust_level == DirectoryEntry.TRUSTED:
+                    hops = RNS.Transport.hops_to(node.source_hash)
+
+                    if hops < best_hops:
+                        best_hops = hops
+                        selected_node = node
+
+        if selected_node == None:
+            RNS.log("Could not autoselect a prepagation node! LXMF propagation will not be available until a trusted node announces on the network.", 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)
+
+    def get_user_selected_propagation_node(self):
+        if "propagation_node" in self.peer_settings:
+            return self.peer_settings["propagation_node"]
+        else:
+            return None
+
+    def set_user_selected_propagation_node(self, node_hash):
+        self.peer_settings["propagation_node"] = node_hash
+        self.save_peer_settings()
+        self.autoselect_propagation_node()
+    
+    def get_default_propagation_node(self):
+        return self.message_router.get_outbound_propagation_node()
+
     def save_peer_settings(self):
         file = open(self.peersettingspath, "wb")
         file.write(msgpack.packb(self.peer_settings))
@@ -209,6 +380,12 @@ class NomadNetworkApp:
     def conversations(self):
         return nomadnet.Conversation.conversation_list(self)
 
+    def has_unread_conversations(self):
+        if len(nomadnet.Conversation.unread_conversations) > 0:
+            return True
+        else:
+            return False
+
     def conversation_is_unread(self, source_hash):
         if bytes.fromhex(source_hash) in nomadnet.Conversation.unread_conversations:
             return True
@@ -262,6 +439,14 @@ class NomadNetworkApp:
                     value = self.config["client"]["downloads_path"]
                     self.downloads_path = os.path.expanduser(value)
 
+                if option == "announce_at_start":
+                    value = self.config["client"].as_bool(option)
+                    self.peer_announce_at_start = value
+
+                if option == "try_propagation_on_send_fail":
+                    value = self.config["client"].as_bool(option)
+                    self.try_propagation_on_fail = value
+
                 if option == "user_interface":
                     value = value.lower()
                     if value == "none":
@@ -347,7 +532,8 @@ class NomadNetworkApp:
             if not "announce_at_start" in self.config["node"]:
                 self.node_announce_at_start = False
             else:
-                self.node_announce_at_start = self.config["node"]["announce_at_start"]
+                value = self.config["node"].as_bool("announce_at_start")
+                self.node_announce_at_start = value
 
             if not "announce_interval" in self.config["node"]:
                 self.node_announce_interval = 720
@@ -401,11 +587,25 @@ enable_client = yes
 user_interface = text
 downloads_path = ~/Downloads
 
+# By default, the peer is announced at startup
+# to let other peers reach it immediately.
+announce_at_start = yes
+
+# By default, the client will try to deliver a
+# message via the LXMF propagation network, if
+# a direct delivery to the recipient is not
+# possible.
+try_propagation_on_send_fail = yes
+
 [textui]
 
 # Amount of time to show intro screen
 intro_time = 1
 
+# You can specify the display theme.
+# theme = light
+theme = dark
+
 # Specify the number of colors to use
 # valid colormodes are:
 # monochrome, 16, 88, 256 and 24bit
@@ -459,12 +659,12 @@ enable_node = no
 node_name = None
 
 # Automatic announce interval in minutes.
-# 12 hours by default.
+# 6 hours by default.
 
-announce_interval = 720
+announce_interval = 360
 
 # Whether to announce when the node starts
 
-announce_at_start = No
+announce_at_start = Yes
 
 '''.splitlines()

nomadnet/_version.py

@@ -1 +1 @@
-__version__ = "0.0.8"
+__version__ = "0.1.5"

nomadnet/nomadnet.py

@@ -2,6 +2,7 @@
 
 from ._version import __version__
 
+import io
 import argparse
 import nomadnet
 

nomadnet/ui/TextUI.py

@@ -1,6 +1,8 @@
 import RNS
-import importlib
+import urwid
 import time
+import os
+import platform
 
 import nomadnet
 from nomadnet.ui.textui import *
@@ -31,6 +33,7 @@ THEMES = {
             ("msg_header_ok",               "black", "light green",                 "standout",                 "#111", "#6b2"),
             ("msg_header_caution",          "black", "yellow",                      "standout",                 "#111", "#fd3"),
             ("msg_header_sent",             "black", "light gray",                  "standout",                 "#111", "#ddd"),
+            ("msg_header_propagated",       "black", "light blue",                  "standout",                 "#111", "#28b"),
             ("msg_header_delivered",        "black", "light blue",                  "standout",                 "#111", "#28b"),
             ("msg_header_failed",           "black", "dark gray",                   "standout",                 "#000", "#777"),
             ("msg_warning_untrusted",       "black", "dark red",                    "standout",                 "#111", "dark red"),
@@ -47,6 +50,39 @@ THEMES = {
             ("progress_full",               "black", "light gray",                  "standout",                 "#111", "#bbb"),
             ("progress_empty",              "light gray", "default",                "default",                  "#ddd", "default"),
         ],        
+    },
+    THEME_LIGHT: {
+        "urwid_theme": [
+            # Style name                    # 16-color style                        # Monochrome style          # 88, 256 and true-color style
+            ("heading",                     "dark gray,underline", "default",      "underline",                "g93,underline", "default"),
+            ("menubar",                     "black", "dark gray",                  "standout",                 "#111", "#bbb"),
+            ("scrollbar",                   "dark gray", "default",                "standout",                 "#444", "default"),
+            ("shortcutbar",                 "black", "dark gray",                  "standout",                 "#111", "#bbb"),
+            ("body_text",                   "black", "default",                    "default",                  "#222", "default"),
+            ("error_text",                  "dark red", "default",                 "default",                  "dark red", "default"),
+            ("warning_text",                "yellow", "default",                   "default",                  "#ba4", "default"),
+            ("inactive_text",               "light gray", "default",               "default",                  "dark gray", "default"),
+            ("buttons",                     "light green,bold", "default",         "default",                  "#00a533", "default"),
+            ("msg_editor",                  "black", "dark cyan",                  "standout",                 "#111", "#0bb"),
+            ("msg_header_ok",               "black", "dark green",                 "standout",                 "#111", "#6b2"),
+            ("msg_header_caution",          "black", "yellow",                     "standout",                 "#111", "#fd3"),
+            ("msg_header_sent",             "black", "dark gray",                  "standout",                 "#111", "#ddd"),
+            ("msg_header_delivered",        "black", "light blue",                 "standout",                 "#111", "#28b"),
+            ("msg_header_failed",           "black", "dark gray",                  "standout",                 "#000", "#777"),
+            ("msg_warning_untrusted",       "black", "dark red",                   "standout",                 "#111", "dark red"),
+            ("list_focus",                  "black", "dark gray",                  "standout",                 "#111", "#aaa"),
+            ("list_off_focus",              "black", "dark gray",                  "standout",                 "#111", "#777"),
+            ("list_trusted",                "dark green", "default",               "default",                  "#4a0", "default"),
+            ("list_focus_trusted",          "black", "dark gray",                  "standout",                 "#150", "#aaa"),
+            ("list_unknown",                "dark gray", "default",                "default",                  "#444", "default"),
+            ("list_normal",                 "dark gray", "default",                "default",                  "#444", "default"),
+            ("list_untrusted",              "dark red", "default",                 "default",                  "#a22", "default"),
+            ("list_focus_untrusted",        "black", "dark gray",                  "standout",                 "#810", "#aaa"),
+            ("topic_list_normal",           "black", "default",                    "default",                  "#222", "default"),
+            ("browser_controls",            "dark gray", "default",                "default",                  "#444", "default"),
+            ("progress_full",               "black", "dark gray",                  "standout",                 "#111", "#bbb"),
+            ("progress_empty",              "dark gray", "default",                "default",                  "#ddd", "default"),
+        ],        
     }
 }
 
@@ -56,26 +92,36 @@ GLYPHSETS = {
     "nerdfont": 3
 }
 
+if platform.system() == "Darwin":
+    urm_char = " \uf0e0 "
+    ur_char = "\uf0e0 "
+else:
+    urm_char = " \uf003 "
+    ur_char = "\uf003 "
+
 GLYPHS = {
     # Glyph name        # Plain      # Unicode      # Nerd Font
     ("check",           "=",         "\u2713",      "\u2713"),
     ("cross",           "X",         "\u2715",      "\u2715"),
     ("unknown",         "?",         "?",           "?"),
-    ("lock",            "E",         "\U0001f512",  "\uf023"),
+    ("encrypted",       "",          "\u26BF",      "\uf023"),
-    ("unlock",          "!",         "\U0001f513",  "\uf09c"),
+    ("plaintext",       "!",         "!",           "\uf06e "),
     ("arrow_r",         "->",        "\u2192",      "\u2192"),
     ("arrow_l",         "<-",        "\u2190",      "\u2190"),
     ("arrow_u",         "/\\",       "\u2191",      "\u2191"),
     ("arrow_d",         "\\/",       "\u2193",      "\u2193"),
     ("warning",         "!",         "\u26a0",      "\uf12a"),
     ("info",            "i",         "\u2139",      "\ufb4d"),
-    ("unread",          "N",         "\u2709",      "\uf003 "),
+    ("unread",          "[!]",       "\u2709",      ur_char),
     ("divider1",        "-",         "\u2504",      "\u2504"),
-    ("peer",            "P",         "\U0001F464",  "\uf415"),
+    ("peer",            "[P]",       "\u24c5 ",     "\uf415"),
-    ("node",            "N",         "\U0001F5A5",  "\uf502"),
+    ("node",            "[N]",       "\u24c3 ",     "\uf502"),
-    ("page",            "",          "\U0001F5B9",  "\uf719 "),
+    ("page",            "",          "\u25a4 ",     "\uf719 "),
-    ("speed",           "",          "\U0001F5B9",  "\uf9c4"),
+    ("speed",           "",          "\u25F7 ",     "\uf9c4"),
-    ("decoration_menu", "",          "",            " \uf93a"),
+    ("decoration_menu", " +",        " +",          " \uf93a"),
+    ("unread_menu",     " !",        " \u2709",     urm_char),
+    ("globe",           "",          "",            "\uf484"),
+    ("sent",            "/\\",       "\u2191",      "\ufbf4")
 }
 
 class TextUI:
@@ -85,13 +131,6 @@ class TextUI:
         self.app.ui = self
         self.loop = None
 
-        if importlib.util.find_spec("urwid") != None:
-            import urwid
-        else:
-            RNS.log("The text-mode user interface requires Urwid to be installed on your system.", RNS.LOG_ERROR)
-            RNS.log("You can install it with the command: pip3 install urwid", RNS.LOG_ERROR)
-            nomadnet.panic()
-
         urwid.set_encoding("UTF-8")
 
         intro_timeout  = self.app.config["textui"]["intro_time"]
@@ -130,13 +169,24 @@ class TextUI:
         if intro_timeout > 0:
             self.loop.set_alarm_in(intro_timeout, self.display_main)
 
-        # TODO: Probably remove this at some point when better terminal
+        if "KONSOLE_VERSION" in os.environ:
-        # color capability detection has been implemented
+            if colormode > 16:
-        if colormode > 16:
+                RNS.log("", RNS.LOG_WARNING, _override_destination = True)
-            RNS.log("Starting Text UI in "+str(colormode)+" color mode. If no UI appears, try adjusting your color settings in "+str(self.app.configdir)+"/config", RNS.LOG_INFO, _override_destination = True)
+                RNS.log("", RNS.LOG_WARNING, _override_destination = True)
-        
+                RNS.log("You are using the terminal emulator Konsole.", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("If you are not seeing the user interface, it is due to a bug in Konsole/urwid.", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("", RNS.LOG_WARNING, _override_destination = True)
+
+                RNS.log("To circumvent this, use another terminal emulator, or launch nomadnet within a", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("screen session, using a command like the following:", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("screen nomadnet", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("Press ctrl-c to exit now and try again.", RNS.LOG_WARNING, _override_destination = True)
+
         self.set_colormode(colormode)
 
+        self.main_display.start()
         self.loop.run()
 
     def set_colormode(self, colormode):

nomadnet/ui/textui/Browser.py

@@ -3,6 +3,7 @@ import os
 import time
 import urwid
 import nomadnet
+import subprocess
 import threading
 from .MicronParser import markup_to_attrmaps
 from nomadnet.vendor.Scrollable import *
@@ -11,6 +12,14 @@ class BrowserFrame(urwid.Frame):
     def keypress(self, size, key):
         if key == "ctrl w":
             self.delegate.disconnect()
+        elif key == "ctrl d":
+            self.delegate.back()
+        elif key == "ctrl f":
+            self.delegate.forward()
+        elif key == "ctrl r":
+            self.delegate.reload()
+        elif key == "ctrl u":
+            self.delegate.url_dialog()
         elif self.get_focus() == "body":
             return super(BrowserFrame, self).keypress(size, key)
             # if key == "up" and self.delegate.messagelist.top_is_visible:
@@ -25,6 +34,7 @@ class BrowserFrame(urwid.Frame):
 class Browser:
     DEFAULT_PATH       = "/page/index.mu"
     DEFAULT_TIMEOUT    = 10
+    DEFAULT_CACHE_TIME = 12*60*60
 
     NO_PATH            = 0x00
     PATH_REQUESTED     = 0x01
@@ -51,6 +61,7 @@ class Browser:
         self.last_keypress = None
 
         self.link = None
+        self.loopback = None
         self.status = Browser.DISCONECTED
         self.response_progress = 0
         self.response_size = None
@@ -66,12 +77,21 @@ class Browser:
         self.attr_maps = []
         self.build_display()
 
+        self.history = []
+        self.history_ptr = 0
+        self.history_inc = False
+        self.history_dec = False
+        self.reloading = False
+        self.loaded_from_cache = False
+
         if self.path == None:
             self.path = Browser.DEFAULT_PATH
 
         if self.destination_hash != None:
             self.load_page()
 
+        self.clean_cache()
+
     def current_url(self):
         if self.destination_hash == None:
             return ""
@@ -82,10 +102,18 @@ class Browser:
                 path = self.path
             return RNS.hexrep(self.destination_hash, delimit=False)+":"+path
 
+    def url_hash(self, url):
+        if url == None:
+            return None
+        else:
+            url = url.encode("utf-8")
+            return RNS.hexrep(RNS.Identity.full_hash(url), delimit=False)
+
 
     def marked_link(self, link_target):
-        self.link_target = link_target
+        if self.status == Browser.DONE:
-        self.app.ui.loop.set_alarm_in(0.1, self.marked_link_job)
+            self.link_target = link_target
+            self.app.ui.loop.set_alarm_in(0.1, self.marked_link_job)
 
     def marked_link_job(self, sender, event):
         link_target = self.link_target
@@ -175,7 +203,15 @@ class Browser:
         else:
             self.display_widget.set_attr_map({None: "body_text"})
             self.browser_header = self.make_control_widget()
-            self.linebox.set_title(self.app.directory.simplest_display_str(self.destination_hash))
+            if self.destination_hash != None:
+                remote_display_string = self.app.directory.simplest_display_str(self.destination_hash)
+            else:
+                remote_display_string = ""
+
+            if self.loopback != None and remote_display_string == RNS.prettyhexrep(self.loopback):
+                remote_display_string = self.app.node.name
+
+            self.linebox.set_title(remote_display_string)
 
             if self.status == Browser.DONE:
                 self.browser_footer = self.make_status_widget()
@@ -226,6 +262,11 @@ class Browser:
         self.response_size = None
         self.response_transfer_size = None
 
+        self.history = []
+        self.history_ptr = 0
+        self.history_inc = False
+        self.history_dec = False
+
         self.update_display()
 
 
@@ -271,11 +312,14 @@ class Browser:
 
         if destination_hash != None and path != None:
             if path.startswith("/file/"):
-                if destination_hash == self.destination_hash:
+                if destination_hash != self.loopback:
-                    self.download_file(destination_hash, path)
+                    if destination_hash == self.destination_hash:
+                        self.download_file(destination_hash, path)
+                    else:
+                        RNS.log("Cannot request file download from a node that is not currently connected.", RNS.LOG_ERROR)
+                        RNS.log("The requested URL was: "+str(url), RNS.LOG_ERROR)
                 else:
-                    RNS.log("Cannot request file download from a node that is not currently connected.", RNS.LOG_ERROR)
+                    self.download_local_file(path)
-                    RNS.log("The requested URL was: "+str(url), RNS.LOG_ERROR)
             else:
                 self.set_destination_hash(destination_hash)
                 self.set_path(path)
@@ -296,6 +340,35 @@ class Browser:
     def set_timeout(self, timeout):
         self.timeout = timeout
 
+    def download_local_file(self, path):
+        try:
+            file_path = self.app.filespath+path.replace("/file", "", 1)
+            if os.path.isfile(file_path):
+                file_name = os.path.basename(file_path)
+                file_destination = self.app.downloads_path+"/"+file_name
+
+                counter = 0
+                while os.path.isfile(file_destination):
+                    counter += 1
+                    file_destination = self.app.downloads_path+"/"+file_name+"."+str(counter)
+
+                fs = open(file_path, "rb")
+                fd = open(file_destination, "wb")
+                fd.write(fs.read())
+                fd.close()
+                fs.close()
+
+                self.saved_file_name = file_destination.replace(self.app.downloads_path+"/", "", 1)
+                
+                self.update_display()
+            else:
+                RNS.log("The requested local download file does not exist: "+str(file_path), RNS.LOG_ERROR)
+
+            self.status = Browser.DONE
+            self.response_progress = 0
+            
+        except Exception as e:
+            RNS.log("An error occurred while handling file response. The contained exception was: "+str(e), RNS.LOG_ERROR)
 
     def download_file(self, destination_hash, path):
         if self.link != None and self.link.destination.hash == self.destination_hash:
@@ -323,11 +396,133 @@ class Browser:
             else:
                 self.link.teardown()
 
+    def write_history(self):
+        entry = [self.destination_hash, self.path]
+        self.history.insert(self.history_ptr, entry)
+        self.history_ptr += 1
+
+        if len(self.history) > self.history_ptr:
+            self.history = self.history[:self.history_ptr]
+
+    def back(self):
+        target_ptr = self.history_ptr-1
+        if not self.history_inc and not self.history_dec:
+            if target_ptr > 0:
+                self.history_dec = True
+                entry = self.history[target_ptr-1]
+                url = RNS.hexrep(entry[0], delimit=False)+":"+entry[1]
+                self.history_ptr = target_ptr
+                self.retrieve_url(url)
+
+    def forward(self):
+        target_ptr = self.history_ptr+1
+        if not self.history_inc and not self.history_dec:
+            if target_ptr <= len(self.history):
+                self.history_dec = True
+                entry = self.history[target_ptr-1]
+                url = RNS.hexrep(entry[0], delimit=False)+":"+entry[1]
+                self.history_ptr = target_ptr
+                self.retrieve_url(url)
+
+    def reload(self):
+        if not self.reloading and self.status == Browser.DONE:
+            self.reloading = True
+            self.uncache_page(self.current_url())
+            self.load_page()
+
+    def close_dialogs(self):
+        options = self.delegate.columns.options("weight", self.delegate.right_area_width)
+        self.delegate.columns.contents[1] = (self.display_widget, options)
+
+    def url_dialog(self):
+        e_url = UrlEdit(caption="URL : ", edit_text=self.current_url())
+
+        def dismiss_dialog(sender):
+            self.close_dialogs()
+
+        def confirmed(sender):
+            self.retrieve_url(e_url.get_edit_text())
+            self.close_dialogs()
+
+        dialog = UrlDialogLineBox(
+            urwid.Pile([
+                e_url,
+                urwid.Columns([("weight", 0.45, urwid.Button("Cancel", on_press=dismiss_dialog)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Go", on_press=confirmed))])
+            ]), title="Enter URL"
+        )
+        e_url.confirmed = confirmed
+        dialog.confirmed = confirmed
+        dialog.delegate = self
+        bottom = self.display_widget
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 65), valign="middle", height="pack", left=2, right=2)
+
+        options = self.delegate.columns.options("weight", self.delegate.right_area_width)
+        self.delegate.columns.contents[1] = (overlay, options)
+        self.delegate.columns.focus_position = 1
+
 
     def load_page(self):
-        load_thread = threading.Thread(target=self.__load)
+        cached = self.get_cached(self.current_url())
-        load_thread.setDaemon(True)
+        if cached:
-        load_thread.start()
+            self.status = Browser.DONE
+            self.page_data = cached
+            self.markup = self.page_data.decode("utf-8")
+            self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self)
+            
+            self.response_progress = 0
+            self.response_size = None
+            self.response_transfer_size = None
+            self.saved_file_name = None
+            self.loaded_from_cache = True
+
+            self.update_display()
+
+            if not self.history_inc and not self.history_dec and not self.reloading:
+                self.write_history()
+            else:
+                self.history_dec = False
+                self.history_inc = False
+                self.reloading = False
+
+        else:
+            if self.destination_hash != self.loopback:
+                load_thread = threading.Thread(target=self.__load)
+                load_thread.setDaemon(True)
+                load_thread.start()
+            else:
+                RNS.log("Browser handling local page: "+str(self.path), RNS.LOG_DEBUG)
+                page_path = self.app.pagespath+self.path.replace("/page", "", 1)
+
+                page_data = b"The requested local page did not exist in the file system"
+                if os.path.isfile(page_path):
+                    if os.access(page_path, os.X_OK):
+                        generated = subprocess.run([page_path], stdout=subprocess.PIPE)
+                        page_data = generated.stdout
+                    else:
+                        file = open(page_path, "rb")
+                        page_data = file.read()
+                        file.close()
+
+                self.status = Browser.DONE
+                self.page_data = page_data
+                self.markup = self.page_data.decode("utf-8")
+                self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self)
+                
+                self.response_progress = 0
+                self.response_size = None
+                self.response_transfer_size = None
+                self.saved_file_name = None
+                self.loaded_from_cache = False
+
+                self.update_display()
+
+                if not self.history_inc and not self.history_dec and not self.reloading:
+                    self.write_history()
+                else:
+                    self.history_dec = False
+                    self.history_inc = False
+                    self.reloading = False
 
 
     def __load(self):
@@ -436,11 +631,114 @@ class Browser:
             self.markup = self.page_data.decode("utf-8")
             self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self)
             self.response_progress = 0
+            self.loaded_from_cache = False
+
+            # Simple header handling. Should be expanded when more
+            # header tags are added.
+            cache_time = Browser.DEFAULT_CACHE_TIME
+            if self.markup[:4] == "#!c=":
+                endpos = self.markup.find("\n")
+                if endpos == -1:
+                    endpos = len(self.markup)
+                cache_time = int(self.markup[4:endpos])
 
             self.update_display()
+
+            if not self.history_inc and not self.history_dec and not self.reloading:
+                self.write_history()
+            else:
+                self.history_dec = False
+                self.history_inc = False
+                self.reloading = False
+
+            if cache_time == 0:
+                RNS.log("Received page "+str(self.current_url())+", not caching due to header.", RNS.LOG_DEBUG)
+            else:
+                RNS.log("Received page "+str(self.current_url())+", caching for %.3f hours." % (cache_time/60/60), RNS.LOG_DEBUG)    
+                self.cache_page(cache_time)
+
         except Exception as e:
             RNS.log("An error occurred while handling response. The contained exception was: "+str(e))
 
+    def uncache_page(self, url):
+        url_hash = self.url_hash(url)
+        files = os.listdir(self.app.cachepath)
+        for file in files:
+            if file.startswith(url_hash):
+                cachefile = self.app.cachepath+"/"+file
+                os.unlink(cachefile)
+                RNS.log("Removed "+str(cachefile)+" from cache.", RNS.LOG_DEBUG)
+
+    def get_cached(self, url):
+        url_hash = self.url_hash(url)
+        files = os.listdir(self.app.cachepath)
+        for file in files:
+            cachepath = self.app.cachepath+"/"+file
+            try:
+                components = file.split("_")
+                if len(components) == 2 and len(components[0]) == 64 and len(components[1]) > 0:
+                    expires = float(components[1])
+
+                    if time.time() > expires:
+                        RNS.log("Removing stale cache entry "+str(file), RNS.LOG_DEBUG)
+                        os.unlink(cachepath)
+                    else:
+                        if file.startswith(url_hash):
+                            RNS.log("Found "+str(file)+" in cache.", RNS.LOG_DEBUG)
+                            RNS.log("Returning cached page", RNS.LOG_DEBUG)
+                            file = open(cachepath, "rb")
+                            data = file.read()
+                            file.close()
+                            return data
+
+            except Exception as e:
+                RNS.log("Error while parsing cache entry "+str(cachepath)+", removing it.", RNS.LOG_ERROR)
+                RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
+                try:
+                    os.unlink(cachepath)
+                except Exception as e:
+                    RNS.log("Additionally, an exception occurred while unlinking the entry: "+str(e), RNS.LOG_ERROR)
+                    RNS.log("You will probably need to remove this entry manually by deleting the file: "+str(cachepath), RNS.LOG_ERROR)
+
+                
+        return None
+
+    def clean_cache(self):
+        files = os.listdir(self.app.cachepath)
+        for file in files:
+            cachepath = self.app.cachepath+"/"+file
+            try:
+                components = file.split("_")
+                if len(components) == 2 and len(components[0]) == 64 and len(components[1]) > 0:
+                    expires = float(components[1])
+
+                    if time.time() > expires:
+                        RNS.log("Removing stale cache entry "+str(file), RNS.LOG_DEBUG)
+                        os.unlink(cachepath)
+
+            except Exception as e:
+                pass
+
+
+    def cache_page(self, cache_time):
+        url_hash = self.url_hash(self.current_url())
+        if url_hash == None:
+            RNS.log("Could not cache page "+str(self.current_url()), RNS.LOG_ERROR)
+        else:
+            try:
+                self.uncache_page(self.current_url())
+                cache_expires = time.time()+cache_time
+                filename = url_hash+"_"+str(cache_expires)
+                cachefile = self.app.cachepath+"/"+filename
+                file = open(cachefile, "wb")
+                file.write(self.page_data)
+                file.close()
+                RNS.log("Cached page "+str(self.current_url())+" to "+str(cachefile), RNS.LOG_DEBUG)
+
+            except Exception as e:
+                RNS.log("Could not write cache file for page "+str(self.current_url()), RNS.LOG_ERROR)
+                RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
+
 
     def file_received(self, request_receipt):
         try:
@@ -463,7 +761,7 @@ class Browser:
 
             self.update_display()
         except Exception as e:
-            RNS.log("An error occurred while handling file response. The contained exception was: "+str(e))
+            RNS.log("An error occurred while handling file response. The contained exception was: "+str(e), RNS.LOG_ERROR)
 
     
     def request_failed(self, request_receipt=None):
@@ -511,6 +809,8 @@ class Browser:
             stats_string = "  "+self.g["page"]+size_str(self.response_size)
             stats_string += "   "+self.g["arrow_d"]+size_str(self.response_transfer_size)+" in "+response_time_str
             stats_string += "s   "+self.g["speed"]+size_str(self.response_transfer_size/self.response_time, suffix="b")+"/s"
+        elif self.loaded_from_cache:
+            stats_string = " (cached)"
         else:
             stats_string = ""
 
@@ -568,4 +868,18 @@ def size_str(num, suffix='B'):
                 return "%.2f%s%s" % (num, unit, suffix)
         num /= 1000.0
 
-    return "%.2f%s%s" % (num, last_unit, suffix)
+    return "%.2f%s%s" % (num, last_unit, suffix)
+
+class UrlDialogLineBox(urwid.LineBox):
+    def keypress(self, size, key):
+        if key == "esc":
+            self.delegate.close_dialogs()
+        else:
+            return super(UrlDialogLineBox, self).keypress(size, key)
+
+class UrlEdit(urwid.Edit):
+    def keypress(self, size, key):
+        if key == "enter":
+            self.confirmed(self)
+        else:
+            return super(UrlEdit, self).keypress(size, key)

nomadnet/ui/textui/Conversations.py

@@ -14,13 +14,13 @@ class ConversationListDisplayShortcuts():
     def __init__(self, app):
         self.app = app
 
-        self.widget = urwid.AttrMap(urwid.Text("[Enter] Open  [C-e] Peer Info  [C-x] Delete  [C-n] New"), "shortcutbar")
+        self.widget = urwid.AttrMap(urwid.Text("[Enter] Open  [C-e] Peer Info  [C-x] Delete  [C-r] Sync  [C-n] New"), "shortcutbar")
 
 class ConversationDisplayShortcuts():
     def __init__(self, app):
         self.app = app
 
-        self.widget = urwid.AttrMap(urwid.Text("[C-d] Send  [C-k] Clear Editor  [C-w] Close  [C-t] Editor Type  [C-p] Purge  [C-x] Clear History"), "shortcutbar")
+        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")
 
 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 r":
+            self.delegate.sync_conversations()
         elif key == "tab":
             self.delegate.app.ui.main_display.frame.set_focus("header")
         elif key == "up" and (self.delegate.ilb.first_item_is_selected() or self.delegate.ilb.body_is_empty()):
@@ -51,6 +53,7 @@ class ConversationsDisplay():
     def __init__(self, app):
         self.app = app
         self.dialog_open = False
+        self.sync_dialog = None
         self.currently_displayed_conversation = None
 
         def disp_list_shortcuts(sender, arg1, arg2):
@@ -95,7 +98,7 @@ class ConversationsDisplay():
             highlight_offFocus="list_off_focus"
         )
 
-        self.listbox = ConversationsArea(urwid.Filler(self.ilb, height=("relative", 100)))
+        self.listbox = ConversationsArea(urwid.Filler(self.ilb, height=("relative", 100)), title="Conversations")
         self.listbox.delegate = self
 
     def delete_selected_conversation(self):
@@ -140,9 +143,12 @@ class ConversationsDisplay():
 
         selected_id_widget = t_id
 
-        untrusted_selected = False
+        untrusted_selected  = False
-        unknown_selected   = True
+        unknown_selected    = True
-        trusted_selected   = False
+        trusted_selected    = False
+
+        direct_selected     = True
+        propagated_selected = False
 
         try:
             if self.app.directory.find(bytes.fromhex(source_hash_text)):
@@ -159,6 +165,11 @@ class ConversationsDisplay():
                     untrusted_selected = False
                     unknown_selected   = False
                     trusted_selected   = True
+
+                if self.app.directory.preferred_delivery(bytes.fromhex(source_hash_text)) == DirectoryEntry.PROPAGATED:
+                    direct_selected = False
+                    propagated_selected = True
+                    
         except Exception as e:
             pass
 
@@ -167,6 +178,10 @@ class ConversationsDisplay():
         r_unknown   = urwid.RadioButton(trust_button_group, "Unknown", state=unknown_selected)
         r_trusted   = urwid.RadioButton(trust_button_group, "Trusted", state=trusted_selected)
 
+        method_button_group = []
+        r_direct     = urwid.RadioButton(method_button_group, "Deliver directly", state=direct_selected)
+        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
@@ -181,7 +196,11 @@ class ConversationsDisplay():
                 elif r_trusted.state == True:
                     trust_level = DirectoryEntry.TRUSTED
 
-                entry = DirectoryEntry(source_hash, display_name, trust_level)
+                delivery = DirectoryEntry.DIRECT
+                if r_propagated.state == True:
+                    delivery = DirectoryEntry.PROPAGATED
+
+                entry = DirectoryEntry(source_hash, display_name, trust_level, preferred_delivery=delivery)
                 self.app.directory.remember(entry)
                 self.update_conversation_list()
                 self.dialog_open = False
@@ -216,6 +235,9 @@ class ConversationsDisplay():
             r_untrusted,
             r_unknown,
             r_trusted,
+            urwid.Divider(g["divider1"]),
+            r_direct,
+            r_propagated,
             known_section,
             urwid.Columns([("weight", 0.45, urwid.Button("Save", on_press=confirmed)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Back", on_press=dismiss_dialog))])
         ])
@@ -304,6 +326,111 @@ class ConversationsDisplay():
             conversation = ConversationsDisplay.cached_conversation_widgets[source_hash]
             self.close_conversation(conversation)
 
+    def sync_conversations(self):
+        g = self.app.ui.glyphs
+        self.dialog_open = True
+        
+        def dismiss_dialog(sender):
+            self.dialog_open = False
+            self.sync_dialog = None
+            self.update_conversation_list()
+            if self.app.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_COMPLETE:
+                self.app.cancel_lxmf_sync()
+
+        max_messages_group = []
+        r_mall = urwid.RadioButton(max_messages_group, "Download all", state=True)
+        r_mlim = urwid.RadioButton(max_messages_group, "Limit to", state=False)
+        ie_lim = urwid.IntEdit("", 5)
+        rbs = urwid.GridFlow([r_mlim, ie_lim], 12, 1, 0, align="left")
+
+        def sync_now(sender):
+            limit = None
+            if r_mlim.get_state():
+                limit = ie_lim.value()
+            self.app.request_lxmf_sync(limit)
+            self.update_sync_dialog()
+
+        def cancel_sync(sender):
+            self.app.cancel_lxmf_sync()
+            self.update_sync_dialog()
+
+        cancel_button = urwid.Button("Close", on_press=dismiss_dialog)
+        sync_progress = SyncProgressBar("progress_empty" , "progress_full", current=self.app.get_sync_progress(), done=1.0, satt=None)
+
+        real_sync_button = urwid.Button("Sync Now", on_press=sync_now)
+        hidden_sync_button = urwid.Button("Cancel Sync", on_press=cancel_sync)
+
+        if self.app.get_sync_status() == "Idle" or self.app.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_COMPLETE:
+            sync_button = real_sync_button
+        else:
+            sync_button = hidden_sync_button
+
+        button_columns = urwid.Columns([("weight", 0.45, sync_button), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, cancel_button)])
+        real_sync_button.bc = button_columns
+
+        pn_ident = None
+        if self.app.get_default_propagation_node() != None:
+            pn_hash = self.app.get_default_propagation_node()
+            pn_ident = RNS.Identity.recall(pn_hash)
+
+            if pn_ident == None:
+                RNS.log("Propagation node identity is unknown, requesting from network...", RNS.LOG_DEBUG)
+                RNS.Transport.request_path(pn_hash)
+
+        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)
+
+            dialog = DialogLineBox(
+                urwid.Pile([
+                    urwid.Text(""+g["node"]+" "+str(pn_entry.display_name), align="center"),
+                    urwid.Divider(g["divider1"]),
+                    sync_progress,
+                    urwid.Divider(g["divider1"]),
+                    r_mall,
+                    rbs,
+                    urwid.Text(""),
+                    button_columns
+                ]), title="Message Sync"
+            )
+        else:
+            button_columns = urwid.Columns([("weight", 0.45, urwid.Text("" )), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, cancel_button)])
+            dialog = DialogLineBox(
+                urwid.Pile([
+                    urwid.Text(""),
+                    urwid.Text("No trusted nodes found, cannot sync", align="center"),
+                    urwid.Text(""),
+                    button_columns
+                ]), title="Message Sync"
+            )
+
+        dialog.delegate = self
+        dialog.sync_progress = sync_progress
+        dialog.cancel_button = cancel_button
+        dialog.real_sync_button = real_sync_button
+        dialog.hidden_sync_button = hidden_sync_button
+        dialog.bc = button_columns
+
+        self.sync_dialog = dialog
+        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("weight", ConversationsDisplay.list_width)
+        self.columns_widget.contents[0] = (overlay, options)
+
+    def update_sync_dialog(self, loop = None, sender = None):
+        if self.dialog_open and self.sync_dialog != None:
+            self.sync_dialog.sync_progress.set_completion(self.app.get_sync_progress())
+
+            if self.app.get_sync_status() == "Idle" or self.app.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_COMPLETE:
+                self.sync_dialog.bc.contents[0] = (self.sync_dialog.real_sync_button, self.sync_dialog.bc.options("weight", 0.45))
+            else:
+                self.sync_dialog.bc.contents[0] = (self.sync_dialog.hidden_sync_button, self.sync_dialog.bc.options("weight", 0.45))
+
+            self.app.ui.loop.set_alarm_in(0.2, self.update_sync_dialog)
+
+
     def conversation_list_selection(self, arg1, arg2):
         pass
 
@@ -311,19 +438,26 @@ class ConversationsDisplay():
         ilb_position = self.ilb.get_selected_position()
         self.update_listbox()
         options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
-        self.columns_widget.contents[0] = (self.listbox, options)
+        if not (self.dialog_open and self.sync_dialog != None):
+            self.columns_widget.contents[0] = (self.listbox, options)
+        else:
+            bottom = self.listbox
+            overlay = urwid.Overlay(self.sync_dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+            self.columns_widget.contents[0] = (overlay, options)
+
         if ilb_position != None:
             self.ilb.select_item(ilb_position)
         nomadnet.NomadNetworkApp.get_shared_instance().ui.loop.draw_screen()
 
-        if self.currently_displayed_conversation != None:
+        if self.app.ui.main_display.sub_displays.active_display == self.app.ui.main_display.sub_displays.conversations_display:
-            if self.app.conversation_is_unread(self.currently_displayed_conversation):
+            if self.currently_displayed_conversation != None:
-                self.app.mark_conversation_read(self.currently_displayed_conversation)
+                if self.app.conversation_is_unread(self.currently_displayed_conversation):
-                try:
+                    self.app.mark_conversation_read(self.currently_displayed_conversation)
-                    if os.path.isfile(self.app.conversationpath + "/" + self.currently_displayed_conversation + "/unread"):
+                    try:
-                        os.unlink(self.app.conversationpath + "/" + self.currently_displayed_conversation + "/unread")
+                        if os.path.isfile(self.app.conversationpath + "/" + self.currently_displayed_conversation + "/unread"):
-                except Exception as e:
+                            os.unlink(self.app.conversationpath + "/" + self.currently_displayed_conversation + "/unread")
-                    raise e
+                    except Exception as e:
+                        raise e
 
 
 
@@ -422,7 +556,8 @@ class ConversationsDisplay():
 
         if trust_level != DirectoryEntry.TRUSTED:
             display_text += " <"+source_hash+">"
-        else:
+        
+        if trust_level != DirectoryEntry.UNTRUSTED:
             if unread:
                 if source_hash != self.currently_displayed_conversation:
                     display_text += " "+g["unread"]
@@ -520,6 +655,7 @@ class ConversationWidget(urwid.WidgetWrap):
                 self.source_hash = source_hash
                 self.conversation = nomadnet.Conversation(source_hash, nomadnet.NomadNetworkApp.get_shared_instance())
                 self.message_widgets = []
+                self.sort_by_timestamp = False
                 self.updating_message_widgets = False
 
                 self.update_message_widgets()
@@ -644,6 +780,9 @@ class ConversationWidget(urwid.WidgetWrap):
             self.toggle_editor()
         elif key == "ctrl x":
             self.clear_history_dialog()
+        elif key == "ctrl o":
+            self.sort_by_timestamp ^= True
+            self.conversation_changed(None)
         else:
             return super(ConversationWidget, self).keypress(size, key)
 
@@ -664,7 +803,10 @@ class ConversationWidget(urwid.WidgetWrap):
                 message_widget = LXMessageWidget(message)
                 self.message_widgets.append(message_widget)
         
-        self.message_widgets.sort(key=lambda m: m.timestamp, reverse=False)
+        if self.sort_by_timestamp:
+            self.message_widgets.sort(key=lambda m: m.timestamp, reverse=False)
+        else:
+            self.message_widgets.sort(key=lambda m: m.sort_timestamp, reverse=False)
 
         from nomadnet.vendor.additional_urwid_widgets import IndicativeListBox
         self.messagelist = IndicativeListBox(self.message_widgets, position = len(self.message_widgets)-1)
@@ -698,13 +840,14 @@ class LXMessageWidget(urwid.WidgetWrap):
         app = nomadnet.NomadNetworkApp.get_shared_instance()
         g = app.ui.glyphs
         self.timestamp = message.get_timestamp()
+        self.sort_timestamp = message.sort_timestamp
         time_format = app.time_format
         message_time = datetime.fromtimestamp(self.timestamp)
         encryption_string = ""
         if message.get_transport_encrypted():
-            encryption_string = " ["+g["lock"]+" "+str(message.get_transport_encryption())+"]"
+            encryption_string = " ["+g["encrypted"]+" "+str(message.get_transport_encryption())+"]"
         else:
-            encryption_string = " ["+g["unlock"]+" "+str(message.get_transport_encryption())+"]"
+            encryption_string = " ["+g["plaintext"]+" "+str(message.get_transport_encryption())+"]"
         
         title_string = message_time.strftime(time_format)+encryption_string
 
@@ -715,6 +858,12 @@ class LXMessageWidget(urwid.WidgetWrap):
             elif message.lxm.state == LXMF.LXMessage.FAILED:
                 header_style = "msg_header_failed"
                 title_string = g["cross"]+" "+title_string
+            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.state == LXMF.LXMessage.SENT:
+                header_style = "msg_header_sent"
+                title_string = g["sent"]+" "+title_string
             else:
                 header_style = "msg_header_sent"
                 title_string = g["arrow_r"]+" "+title_string
@@ -737,4 +886,13 @@ class LXMessageWidget(urwid.WidgetWrap):
             urwid.Text("")
         ])
 
-        urwid.WidgetWrap.__init__(self, display_widget)
+        urwid.WidgetWrap.__init__(self, display_widget)
+
+class SyncProgressBar(urwid.ProgressBar):
+    def get_text(self):
+        status = nomadnet.NomadNetworkApp.get_shared_instance().get_sync_status()
+        show_percent = nomadnet.NomadNetworkApp.get_shared_instance().sync_status_show_percent()
+        if show_percent:
+            return status+" "+super().get_text()
+        else:
+            return status

nomadnet/ui/textui/Guide.py

@@ -108,9 +108,12 @@ class TopicList(urwid.WidgetWrap):
 
         self.topic_list = [
             GuideEntry(self.app, self, guide_display, "Introduction"),
+            GuideEntry(self.app, self, guide_display, "Concepts & Terminology"),
             GuideEntry(self.app, self, guide_display, "Hosting a Node"),
             GuideEntry(self.app, self, guide_display, "Markup"),
             self.first_run_entry,
+            GuideEntry(self.app, self, guide_display, "Network Configuration"),
+            GuideEntry(self.app, self, guide_display, "Display Test"),
             GuideEntry(self.app, self, guide_display, "Credits & Licenses"),
         ]
 
@@ -182,13 +185,15 @@ TOPIC_INTRODUCTION = '''>Nomad Network
 
 The intention with this program is to provide a tool to that allows you to build private and resilient communications platforms that are in complete control and ownership of the people that use them.
 
-Nomad Network is build on LXMF and Reticulum, which together provides the cryptographic mesh functionality and peer-to-peer message routing that Nomad Network relies on. This foundation also makes it possible to use the program over a very wide variety of communication mediums, from packet radio to gigabit fiber.
+Nomad Network is build on LXMF and Reticulum, which together provides the cryptographic mesh functionality and peer-to-peer message routing that Nomad Network relies on. This foundation also makes it possible to use the program over a very wide variety of communication mediums, from packet radio to fiber.
 
 Nomad Network does not need any connections to the public internet to work. In fact, it doesn't even need an IP or Ethernet network. You can use it entirely over packet radio, LoRa or even serial lines. But if you wish, you can bridge islanded Reticulum networks over the Internet or private ethernet networks, or you can build networks running completely over the Internet. The choice is yours.
 
-The current version of the program should be considered an alpha 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 best time to have an influence on the direction of the development of Nomad Network. To do so, join the discussion on the Nomad Network project on GitHub.
+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 best time to have an influence on the direction of the development of Nomad Network. To do so, join the discussion on the Nomad Network project on GitHub.
 
->Concepts and Terminology
+'''
+
+TOPIC_CONCEPTS = '''>Concepts and Terminology
 
 The following section will briefly introduce various concepts and terms used in the program.
 
@@ -196,9 +201,20 @@ The following section will briefly introduce various concepts and terms used in
 
 A `*peer`* refers to another Nomad Network client, which will generally be operated by another person. But since Nomad Network is a general LXMF client, it could also be any other LXMF client, program, automated system or machine that can communicate over LXMF.
 
+All peers (and nodes) are identified by their `*address`* (which is, technically speaking, a Reticulum destination hash). An address consist of 20 hexadecimal characters, and looks like this:
+
+`c<b8ea8f92541c9a275f0e>
+`l
+
+Anyone can choose whatever display name they want, but addresses are always unique, and generated from the unique cryptographic keys of the peer. This is an important point to understand. Since there is not anyone controlling naming or address spaces in Nomad Network, you can easily come across another user with the same display name as you.
+
+Your addresses will always be unique though, and you must always verify that the address you are communicating with is matching the address of the peer you expect to be in the other end.
+
+To make this easier, Nomad Network allows you to mark peers and nodes as either `*trusted`*, `*unknown`* or `*untrusted`*. In this way, you can mark the peers and nodes that you know to be legitimate, and easily spot peers with similar names as unrelated.
+
 >>Announces
 
-An `*announce`* can be sent by any peer on the network, which will notify other peers of its existence, and contains the cryptographic keys that allows other peers to communicate with it.
+An `*announce`* can be sent by any peer or node on the network, which will notify other peers of its existence, and contains the cryptographic keys that allows other peers to communicate with it.
 
 In the `![ Network ]`! section of the program, you can monitor announces on the network, initiate conversations with announced peers, and announce your own peer on the network. You can also connect to nodes on the network and browse information shared by them.
 
@@ -206,33 +222,55 @@ In the `![ Network ]`! section of the program, you can monitor announces on the
 
 Nomad Network uses the term `*conversation`* to signify both direct peer-to-peer messaging threads, and also discussion threads with an arbitrary number of participants that might change over time.
 
-Both things like discussion forums and chat threads can be encapsulated as conversations in Nomad Network. The user interface will indicate the different characteristics a conversation can take, and also what form of transport encryption messages within used.
+Both things like discussion forums and chat threads can be encapsulated as conversations in Nomad Network. The user interface will indicate the different characteristics a conversation can take, and also what form of transport encryption was used for messages within.
 
-In the `![ Conversations ]`! part of the program you can view and interact with all currently active conversations. You can also edit nickname and trust settings for peers here.
+In the `![ Conversations ]`! part of the program you can view and interact with all currently active conversations. You can also edit nickname and trust settings for peers belonging to these conversations here. To edit settings for a peer, select it in the conversation list, and press `!Ctrl-E`!.
+
+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.
+
+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.
+
+To select a node manually, go to the `![ Network ]`! part of the program, choose the desired node in the `*Known Nodes`* list, and select the `!< Info >`! button. In the `!Node Info`! dialog, you can specify the selected node as the default propagation node.
 
 >>Node
 
 A Nomad Network `*node`* is an instance of the Nomad Network program that has been configured to host information for other peers and help propagate messages and information on the network.
 
-Nodes can host pages (similar to webpages) written in a markup-language called `*micron`*, as well as make files and other resources available for download for peers on the network. Nodes are also integral in allowing forum/discussion threads to exist and propagate on the network.
+Nodes can host pages (similar to webpages) written in a markup-language called `*micron`*, as well as make files and other resources available for download for peers on the network. Nodes also form a distributed message store for offline users, and allows messages to be exchanged between peers that are not online at the same time.
 
-If no nodes exist on a network, all peers will still be able to communicate directly peer-to-peer, but both endpoints of a conversation will need to be online at the same time to converse. When nodes exist on the network, messages will be held and syncronised between nodes for deferred delivery if the destination peer is unavailable.
+If no nodes exist on a network, all peers will still be able to communicate directly peer-to-peer, but both endpoints of a conversation will need to be available at the same time to converse. When nodes exist on the network, messages will be held and syncronised between nodes for deferred delivery if the destination peer is unavailable. Nodes will automatically discover and peer with each other, and handle synchronisation of message stores.
+
+To learn how to host your own node, read the `*Hosting a Node`* section of this guide.
 
 '''
 
 TOPIC_HOSTING = '''>Hosting a Node
 
-To host a node on the network, you must enable it in the configuration file, by setting `*enable_node`* directive to `*yes`*. You should also configure the other node-related parameters such as the node name and announce interval settings. Once node hosting has been enabled in the configuration, Nomad Network will start hosting your node as soon as the program is lauched, and other peers on the network will be able to connect and interact with content on your node.
+To host a node on the network, you must enable it in the configuration file, by setting `*enable_node`* directive to `*yes`*. You should also configure the other node-related parameters such as the node name and announce interval settings. Once node hosting has been enabled in the configuration, Nomad Network will start hosting your node as soon as the program is launched, and other peers on the network will be able to connect and interact with content on your node.
 
 By default, no content is defined, apart from a short placeholder home page. To learn how to add your own content, read on.
 
+>>Distributed Message Store
+
+All nodes on the network automatically form a distributed message store that allows users to exchange messages, even when they are not available at the same time.
+
+When Nomad Network is configured to host a node, it also configures itself as an LXMF Propagation Node, and automatically discovers and peers with other propagation nodes on the network. This process is completely automatic and requires no configuration from the node operator.
+
+To view LXMF Propagation nodes that are currently peered with your node, go to the `![ Network ]`! part of the program and press `!Ctrl-P`!.
+
+The distributed message store is resilient to intermittency, and will remain functional as long as at least one node remains on the network. Nodes that were offline for a time will automatically be synced up to date when they regain connectivity.
+
 >>Pages
 
 Nomad Network nodes can host pages similar to web pages, that other peers can read and interact with. Pages are written in a compact markup language called `*micron`*. To learn how to write formatted pages with micron, see the `*Markup`* section of this guide (which is, itself, written in micron). Pages can be linked arbitrarily with hyperlinks, that can also link to pages (or other resources) on other nodes.
 
 To add pages to your node, place micron files in the `*pages`* directory of your Nomad Network programs `*storage`* directory. By default, the path to this will be `!~/.nomadnetwork/storage/pages`!. You should probably create the file `!index.mu`! first, as this is the page that will get served by default to a connecting peer.
 
-Pages are static in this version, but the next release of Nomad Network will add the ability to use a preprocessor such as PHP, bash, Python (or whatever you prefer) to generate dynamic pages.
+You can control how long a peer will cache your pages by including the cache header in a page. To do so, the first line of your page must start with `!#!c=X`!, where `!X`! is the cache time in seconds. To tell the peer to always load the page from your node, and never cache it, set the cache time to zero. You should only do this if there is a real need, for example if your page displays dynamic content that `*must`* be updated at every page view. The default caching time is 12 hours. In most cases, you should not need to include the cache control header in your pages.
+
+You can use a preprocessor such as PHP, bash, Python (or whatever you prefer) to generate dynamic pages. To do so, just set executable permissions on the relevant page file, and be sure to include the interpreter at the beginning of the file, for example `!#!/usr/bin/python3`!.
 
 >>Files
 
@@ -274,9 +312,11 @@ You're currently located in the guide section of the program. I'm sorry I had to
 
 To get the most out of Nomad Network, you will need a terminal that supports UTF-8 and at least 256 colors, ideally true-color. If your terminal supports true-color, you can go to the `![ Config ]`! menu item, launch the editor and change the configuration.
 
+It is recommended to use a terminal size of at least 122x32. Nomad Network will work with smaller terminal sizes, but the interface might feel a bit cramped.
+
 If you don't already have a Nerd Font installed (see https://www.nerdfonts.com/), I also highly recommend to do so, since it will greatly expand the amount of glyphs, icons and graphics that Nomad Network can use. Once you have your terminal set up with a Nerd Font, go to the `![ Config ]`! menu item and enable Nerd Fonts in the configuration instead of normal unicode glyphs.
 
-Nomad Network expects that you are already connected to some form of Reticulum network. That could be as simple as the default UDP-based demo interface on your local ethernet network. This short guide won't go into any details on building, but you will find other entries in the guide that deal with network setup and configuration.
+Nomad Network expects that you are already connected to some form of Reticulum network. That could be as simple as the default UDP-based demo interface on your local ethernet network. This short guide won't go into any details on building networks, but you will find other entries in the guide that deal with network setup and configuration.
 
 At least, if Nomad Network launches, it means that it is connected to a running Reticulum instance, that should in turn be connected to `*something`*, which should get you started.
 
@@ -290,6 +330,79 @@ Now go out there and explore. This is still early days. See what you can find an
 
 '''
 
+TOPIC_NETWORKS = '''>Network Configuration
+
+Nomad Network uses the Reticulum Network Stack for communication and encryption. This means that it will use any interfaces and communications channels already defined in your Reticulum configuration.
+
+Reticulum supports using many kinds of devices as networking interfaces, and allows you to mix and match them in any way you choose. The number of distinct network topologies you can create with Reticulum is more or less endless, but common to them all is that you will need to define one or more interfaces for Reticulum to use.
+
+If you have not changed the default Reticulum configuration, which should be located at `!~/.reticulum/config`!, you will have one interface active right now. With it, you should be able to communicate with any other peers and nodes that exist on your local ethernet or WiFi network, if your system is connected to one, and most probably nothing else outside of that.
+
+To learn how to configure your Reticulum setup to use LoRa radios, packet radio or other interfaces, or connect to other Reticulum networks via the Internet, the best places to start is to read the relevant parts of the Reticulum Manual, which can be found on GitHub:
+
+`c`_https://markqvist.github.io/Reticulum/manual/interfaces.html`_
+`l
+
+If you don't currently have access to the Internet, the default Reticulum configuration file is also full of examples of all the supported interface types, and it should be relatively simple to get a working setup going just from those examples.
+
+For future reference, you can download the Reticulum Manual in PDF format here:
+
+`c`_https://github.com/markqvist/Reticulum/raw/master/docs/Reticulum%20Manual.pdf`_
+`l
+
+It might be nice to keep that handy when you are not connected to the Internet, as it is full of information and examples that are also very relevant to Nomad Network.
+
+>The Unsigned.io Testnet
+
+If you have Internet access, and just want to get started experimenting, you are welcome to join the Unsigned.io RNS Testnet. The testnet is just that, an informal network for testing and experimenting. It will be up most of the time, and anyone can join, but it also means that there's no guarantees for service availability.
+
+The Testnet also runs the latest version of Reticulum, often even a short while before it is publicly released, which means strange behaviour might occur. If none of that scares you, add the following interface to your Reticulum configuration file to join:
+
+>>
+[[RNS Testnet Frankfurt]]
+  type = TCPClientInterface
+  interface_enabled = yes
+  outgoing = True
+  target_host = frankfurt.rns.unsigned.io
+  target_port = 4965
+
+'''
+
+TOPIC_DISPLAYTEST = '''>Markup & Color Display Test
+
+
+`cYou can use this section to gauge how well your terminal reproduces the various types of formatting used by Nomad Network.
+``
+
+
+>>>>>>>>>>>>>>>>>>>>
+-\u223f
+<
+
+
+>>
+`a`!This line should be bold, and aligned to the left`!
+
+`c`*This one should be italic and centered`*
+
+`r`_And this one should be underlined, aligned right`_
+``
+
+The following line should contain a red gradient bar:
+`B100 `B200 `B300 `B400 `B500 `B600 `B700 `B800 `B900 `Ba00 `Bb00 `Bc00 `Bd00 `Be00 `Bf00`b
+
+The following line should contain a green gradient bar:
+`B010 `B020 `B030 `B040 `B050 `B060 `B070 `B080 `B090 `B0a0 `B0b0 `B0c0 `B0d0 `B0e0 `B0f0`b
+
+The following line should contain a blue gradient bar:
+`B001 `B002 `B003 `B004 `B005 `B006 `B007 `B008 `B009 `B00a `B00b `B00c `B00d `B00e `B00f`b
+
+Unicode Glyphs   : \u2713  \u2715  \u26a0  \u24c3  \u2193
+
+Nerd Font Glyphs : \uf484  \uf9c4 \uf719  \uf502  \uf415  \uf023  \uf06e
+'''
+
+
 TOPIC_LICENSES = '''>Thanks, Acknowledgements and Licenses
 
 This program uses various other software components, without which Nomad Network would not have been possible. Sincere thanks to the authors and contributors of the following projects
@@ -553,6 +666,29 @@ Here is `F00f`_`[a more visible link`1385edace36466a6b3dd:/page/index.mu]`_`f
 
 When links like these are displayed in the built-in browser, clicking on them or activating them using the keyboard will cause the browser to load the specified URL.
 
+>Comments
+
+You can insert comments that will not be displayed in the output by starting a line with the # character.
+
+Here's an example:
+
+`Faaa
+`=
+# This line will not be displayed
+This line will
+`=
+``
+
+The above markup produces the following output:
+
+`Faaa`B333
+
+# This line will not be displayed
+This line will
+
+``
+
+
 >Literals
 
 To display literal content, for example source-code, or blocks of text that should not be interpreted by micron, you can use literal blocks, specified by the \\`= tag. Below is the source code of this entire document, presented as a literal block.
@@ -567,9 +703,12 @@ TOPIC_MARKUP += "\n`=\n\n>Closing Remarks\n\nIf you made it all the way here, yo
 
 TOPICS = {
     "Introduction": TOPIC_INTRODUCTION,
+    "Concepts & Terminology": TOPIC_CONCEPTS,
     "Conversations": TOPIC_CONVERSATIONS,
     "Hosting a Node": TOPIC_HOSTING,
     "Markup": TOPIC_MARKUP,
     "First Run": TOPIC_FIRST_RUN,
+    "Display Test": TOPIC_DISPLAYTEST,
+    "Network Configuration": TOPIC_NETWORKS,
     "Credits & Licenses": TOPIC_LICENSES,
-}
+}

nomadnet/ui/textui/Main.py

@@ -125,15 +125,21 @@ class MainDisplay():
     def update_active_sub_display(self):
         self.frame.contents["body"] = (self.sub_displays.active().widget, None)
         self.update_active_shortcuts()
+        # TODO: Remove when new mitigation has been tested
+        # self.app.ui.main_display.request_redraw(extra_delay=0.0)
 
     def update_active_shortcuts(self):
         self.frame.contents["footer"] = (self.sub_displays.active().shortcuts().widget, None)
 
-    def request_redraw(self):
+    def request_redraw(self, extra_delay=0.0):
-        self.app.ui.loop.set_alarm_in(0.25, self.redraw_now)
+        self.app.ui.loop.set_alarm_in(0.25+extra_delay, self.redraw_now)
     
     def redraw_now(self, sender=None, data=None):
-        self.app.ui.loop.draw_screen()
+        self.app.ui.loop.screen.clear()
+        #self.app.ui.loop.draw_screen()
+
+    def start(self):
+        self.menu_display.start()
 
     def quit(self, sender=None):
         raise urwid.ExitMainLoop
@@ -147,11 +153,16 @@ class MenuColumns(urwid.Columns):
         return super(MenuColumns, self).keypress(size, key)
 
 class MenuDisplay():
+    UPDATE_INTERVAL = 2
+
     def __init__(self, app, handler):
         self.app = app
-        g = self.app.ui.glyphs
+        self.update_interval = MenuDisplay.UPDATE_INTERVAL
+        self.g = self.app.ui.glyphs
 
-        menu_text            = ("pack", urwid.Text(g["decoration_menu"]))
+        self.menu_indicator  = urwid.Text("")
+
+        menu_text            = ("pack", self.menu_indicator)
         button_network       = (11, MenuButton("Network", on_press=handler.show_network))
         button_conversations = (17, MenuButton("Conversations", on_press=handler.show_conversations))
         button_directory     = (13, MenuButton("Directory", on_press=handler.show_directory))
@@ -170,4 +181,25 @@ class MenuDisplay():
         columns = MenuColumns(buttons, dividechars=1)
         columns.handler = handler
 
+        self.update_display()
+
         self.widget = urwid.AttrMap(columns, "menubar")
+
+    def start(self):
+        self.update_display_job()
+
+    def update_display_job(self, event = None, sender = None):
+        self.update_display()
+        self.app.ui.loop.set_alarm_in(self.update_interval, self.update_display_job)
+
+    def update_display(self):
+        if self.app.has_unread_conversations():
+            self.indicate_unread()
+        else:
+            self.indicate_normal()
+
+    def indicate_normal(self):
+        self.menu_indicator.set_text(self.g["decoration_menu"])
+
+    def indicate_unread(self):
+        self.menu_indicator.set_text(self.g["unread_menu"])

nomadnet/ui/textui/MicronParser.py

@@ -5,16 +5,26 @@ from urwid.util import is_mouse_press
 from urwid.text_layout import calc_coords
 import re
 
-DEFAULT_FG = "ddd"
+DEFAULT_FG_DARK  = "ddd"
+DEFAULT_FG_LIGHT = "222"
 DEFAULT_BG = "default"
 
-STYLES = {
+SELECTED_STYLES = None
-    "plain":    { "fg": DEFAULT_FG, "bg": DEFAULT_BG, "bold": False, "underline": False, "italic": False },
+
+STYLES_DARK = {
+    "plain":    { "fg": DEFAULT_FG_DARK, "bg": DEFAULT_BG, "bold": False, "underline": False, "italic": False },
     "heading1": { "fg": "222", "bg": "bbb", "bold": False, "underline": False, "italic": False },
     "heading2": { "fg": "111", "bg": "999", "bold": False, "underline": False, "italic": False },
     "heading3": { "fg": "000", "bg": "777", "bold": False, "underline": False, "italic": False },
 }
 
+STYLES_LIGHT = {
+    "plain":    { "fg": DEFAULT_FG_LIGHT, "bg": DEFAULT_BG, "bold": False, "underline": False, "italic": False },
+    "heading1": { "fg": "000", "bg": "777", "bold": False, "underline": False, "italic": False },
+    "heading2": { "fg": "111", "bg": "aaa", "bold": False, "underline": False, "italic": False },
+    "heading3": { "fg": "222", "bg": "ccc", "bold": False, "underline": False, "italic": False },
+}
+
 SYNTH_STYLES = []
 SYNTH_SPECS  = {}
 
@@ -22,12 +32,18 @@ SECTION_INDENT = 2
 INDENT_RIGHT   = 1
 
 def markup_to_attrmaps(markup, url_delegate = None):
+    global SELECTED_STYLES
+    if nomadnet.NomadNetworkApp.get_shared_instance().config["textui"]["theme"] == nomadnet.ui.TextUI.THEME_DARK:
+        SELECTED_STYLES = STYLES_DARK
+    else:
+        SELECTED_STYLES = STYLES_LIGHT
+
     attrmaps = []
 
     state = {
         "literal": False,
         "depth": 0,
-        "fg_color": DEFAULT_FG,
+        "fg_color": SELECTED_STYLES["plain"]["fg"],
         "bg_color": DEFAULT_BG,
         "formatting": {
             "bold": False,
@@ -72,6 +88,10 @@ def parse_line(line, state, url_delegate):
             if first_char == "\\":
                 line = line[1:]
 
+            # Check for comments
+            elif first_char == "#":
+                return None
+
             # Check for section heading reset
             elif first_char == "<":
                 state["depth"] = 0
@@ -86,8 +106,8 @@ def parse_line(line, state, url_delegate):
                 
                     for j in range(1, i+1):
                         wanted_style = "heading"+str(i)
-                        if wanted_style in STYLES:
+                        if wanted_style in SELECTED_STYLES:
-                            style = STYLES[wanted_style]
+                            style = SELECTED_STYLES[wanted_style]
 
                 line = line[state["depth"]:]
                 if len(line) > 0:
@@ -229,7 +249,7 @@ def make_output(state, line, url_delegate):
                             state["fg_color"] = color
                             skip = 3
                     elif c == "f":
-                        state["fg_color"] = DEFAULT_FG
+                        state["fg_color"] = SELECTED_STYLES["plain"]["fg"]
                     elif c == "B":
                         if len(line) >= i+4:
                             color = line[i+1:i+4]
@@ -241,7 +261,7 @@ def make_output(state, line, url_delegate):
                         state["formatting"]["bold"]      = False 
                         state["formatting"]["underline"] = False
                         state["formatting"]["italic"]    = False
-                        state["fg_color"] = DEFAULT_FG
+                        state["fg_color"] = SELECTED_STYLES["plain"]["fg"]
                         state["bg_color"] = DEFAULT_BG
                         state["align"] = state["default_align"]
                     elif c == "c":

nomadnet/ui/textui/Network.py

@@ -13,7 +13,7 @@ class NetworkDisplayShortcuts():
         self.app = app
         g = app.ui.glyphs
 
-        self.widget = urwid.AttrMap(urwid.Text("[C-l] Toggle Nodes/Announces view  [C-x] Remove entry  [C-w] Disconnect remote"), "shortcutbar")
+        self.widget = urwid.AttrMap(urwid.Text("[C-l] Nodes/Announces  [C-x] Remove  [C-w] Disconnect  [C-d] Back  [C-f] Forward  [C-r] Reload  [C-u] URL"), "shortcutbar")
         #   "[C-"+g["arrow_u"]+g["arrow_d"]+"] Navigate Lists"
 
 
@@ -67,9 +67,9 @@ class AnnounceInfo(urwid.WidgetWrap):
         is_node      = announce[3]
 
         if is_node:
-            type_string = g["node"] + " Node"
+            type_string = "Node " + g["node"]
         else:
-            type_string = g["peer"] + " Peer"
+            type_string = "Peer " + g["peer"]
 
         try:
             data_str = announce[2].decode("utf-8")
@@ -107,9 +107,17 @@ class AnnounceInfo(urwid.WidgetWrap):
             self.parent.left_pile.contents[0] = (self.parent.announce_stream_display, options)
 
         def connect(sender):
+            # TODO: Remove when new mitigation has been tested
+            # self.app.ui.main_display.request_redraw(extra_delay=0.75)
             self.parent.browser.retrieve_url(RNS.hexrep(source_hash, delimit=False))
             show_announce_stream(None)
 
+        def save_node(sender):
+            node_entry = DirectoryEntry(source_hash, display_name=data_str, trust_level=trust_level, hosts_node=True)
+            self.app.directory.remember(node_entry)
+            self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
+            show_announce_stream(None)
+
         def converse(sender):
             show_announce_stream(None)
             try:
@@ -133,8 +141,15 @@ class AnnounceInfo(urwid.WidgetWrap):
 
         if is_node:
             type_button = ("weight", 0.45, urwid.Button("Connect", on_press=connect))
+            save_button = ("weight", 0.45, urwid.Button("Save", on_press=save_node))
         else:
             type_button = ("weight", 0.45, urwid.Button("Converse", on_press=converse))
+            save_button = None
+
+        if is_node:
+            button_columns = urwid.Columns([("weight", 0.45, urwid.Button("Back", on_press=show_announce_stream)), ("weight", 0.1, urwid.Text("")), save_button, ("weight", 0.1, urwid.Text("")), type_button])
+        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"),
@@ -145,7 +160,7 @@ class AnnounceInfo(urwid.WidgetWrap):
             urwid.Divider(g["divider1"]),
             urwid.Text(["Announce Data: \n", (data_style, data_str)], align="left"),
             urwid.Divider(g["divider1"]),
-            urwid.Columns([("weight", 0.45, urwid.Button("Back", on_press=show_announce_stream)), ("weight", 0.1, urwid.Text("")), type_button])
+            button_columns
         ]
 
         if is_node:
@@ -241,7 +256,7 @@ class AnnounceStream(urwid.WidgetWrap):
         self.widget_list = []
         self.update_widget_list()
 
-        self.ilb = IndicativeListBox(
+        self.ilb = ExceptionHandlingListBox(
             self.widget_list,
             on_selection_change=self.list_selection,
             initialization_is_selection_change=False,
@@ -346,6 +361,160 @@ class ListDialogLineBox(urwid.LineBox):
         else:
             return super(ListDialogLineBox, self).keypress(size, key)
 
+class KnownNodeInfo(urwid.WidgetWrap):
+    def __init__(self, node_hash):
+        self.app = nomadnet.NomadNetworkApp.get_shared_instance()
+        self.parent = self.app.ui.main_display.sub_displays.network_display
+        self.pn_changed = False
+        g = self.app.ui.glyphs
+
+        source_hash  = node_hash
+        node_ident   = RNS.Identity.recall(node_hash)
+        time_format  = self.app.time_format
+        trust_level  = self.app.directory.trust_level(source_hash)
+        trust_str    = ""
+        node_entry   = self.app.directory.find(source_hash)
+        if node_entry == None:
+            display_str = self.app.directory.simplest_display_str(source_hash)
+        else:
+            display_str = node_entry.display_name
+
+        addr_str     = "<"+RNS.hexrep(source_hash, delimit=False)+">"
+
+        if node_ident != None:
+            lxmf_addr_str = RNS.prettyhexrep(RNS.Destination.hash_from_name_and_identity("lxmf.propagation", node_ident))
+        else:
+            lxmf_addr_str = "Unknown"
+
+
+        type_string = "Node " + g["node"]
+
+        if trust_level == DirectoryEntry.UNTRUSTED:
+            trust_str     = "Untrusted"
+            symbol        = g["cross"]
+            style         = "list_untrusted"
+        elif trust_level == DirectoryEntry.UNKNOWN:
+            trust_str     = "Unknown"
+            symbol        = g["unknown"]
+            style         = "list_unknown"
+        elif trust_level == DirectoryEntry.TRUSTED:
+            trust_str     = "Trusted"
+            symbol        = g["check"]
+            style         = "list_trusted"
+        elif trust_level == DirectoryEntry.WARNING:
+            trust_str     = "Warning"
+            symbol        = g["warning"]
+            style         = "list_warning"
+        else:
+            trust_str     = "Warning"
+            symbol        = g["warning"]
+            style         = "list_untrusted"
+
+        if trust_level == DirectoryEntry.UNTRUSTED:
+            untrusted_selected = True
+            unknown_selected   = False
+            trusted_selected   = False
+        elif trust_level == DirectoryEntry.UNKNOWN:
+            untrusted_selected = False
+            unknown_selected   = True
+            trusted_selected   = False
+        elif trust_level == DirectoryEntry.TRUSTED:
+            untrusted_selected = False
+            unknown_selected   = False
+            trusted_selected   = True
+
+        trust_button_group = []
+        r_untrusted = urwid.RadioButton(trust_button_group, "Untrusted", state=untrusted_selected)
+        r_unknown   = urwid.RadioButton(trust_button_group, "Unknown", state=unknown_selected)
+        r_trusted   = urwid.RadioButton(trust_button_group, "Trusted", state=trusted_selected)
+
+        e_name = urwid.Edit(caption="Name      : ",edit_text=display_str)
+
+        def show_known_nodes(sender):
+            options = self.parent.left_pile.options(height_type="weight", height_amount=1)
+            self.parent.left_pile.contents[0] = (self.parent.known_nodes_display, options)
+
+        def connect(sender):
+            # TODO: Remove when new mitigation has been tested
+            # self.app.ui.main_display.request_redraw(extra_delay=0.75)
+            self.parent.browser.retrieve_url(RNS.hexrep(source_hash, delimit=False))
+            show_known_nodes(None)
+
+        def pn_change(sender, userdata):
+            self.pn_changed = True
+
+        propagation_node_checkbox = urwid.CheckBox("Use as default propagation node", state=(self.app.get_user_selected_propagation_node() == source_hash), on_state_change=pn_change)
+
+        def save_node(sender):
+            if self.pn_changed:
+                if propagation_node_checkbox.get_state():
+                    self.app.set_user_selected_propagation_node(source_hash)
+                else:
+                    self.app.set_user_selected_propagation_node(None)
+
+            trust_level = DirectoryEntry.UNTRUSTED
+            if r_unknown.get_state() == True:
+                trust_level = DirectoryEntry.UNKNOWN
+            
+            if r_trusted.get_state() == True:
+                trust_level = DirectoryEntry.TRUSTED
+
+            display_str = e_name.get_edit_text()
+
+            node_entry = DirectoryEntry(source_hash, display_name=display_str, trust_level=trust_level, hosts_node=True)
+            self.app.directory.remember(node_entry)
+            self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
+            show_known_nodes(None)
+
+        type_button = ("weight", 0.45, urwid.Button("Connect", on_press=connect))
+        save_button = ("weight", 0.45, urwid.Button("Save", on_press=save_node))
+        button_columns = urwid.Columns([("weight", 0.45, urwid.Button("Back", on_press=show_known_nodes)), ("weight", 0.1, urwid.Text("")), save_button, ("weight", 0.1, urwid.Text("")), type_button])
+
+        pile_widgets = [
+            urwid.Text("Type      : "+type_string, align="left"),
+            # urwid.Text("Name      : "+display_str, align="left"),
+            e_name,
+            urwid.Text("Node Addr : "+addr_str, align="left"),
+            urwid.Text("LXMF Addr : "+lxmf_addr_str, align="left"),
+            # urwid.Text(["Trust     : ", (style, trust_str)], align="left"),
+            urwid.Divider(g["divider1"]),
+            propagation_node_checkbox,
+            urwid.Divider(g["divider1"]),
+            r_untrusted,
+            r_unknown,
+            r_trusted,
+            urwid.Divider(g["divider1"]),
+            button_columns
+        ]
+
+        node_ident = RNS.Identity.recall(source_hash)
+        op_hash = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", node_ident)
+        op_str = self.app.directory.simplest_display_str(op_hash)
+        operator_entry = urwid.Text("Operator  : "+op_str, align="left")
+        pile_widgets.insert(4, operator_entry)
+
+        pile = urwid.Pile(pile_widgets)
+
+        self.display_widget = urwid.Filler(pile, valign="top", height="pack")
+
+        urwid.WidgetWrap.__init__(self, urwid.LineBox(self.display_widget, title="Node Info"))
+
+
+# Yes, this is weird. There is a bug in Urwid/ILB that causes
+# an indexing exception when the list is very small vertically.
+# This mitigates it.
+class ExceptionHandlingListBox(IndicativeListBox):
+    def keypress(self, size, key):
+        try:
+            return super(ExceptionHandlingListBox, self).keypress(size, key)
+
+        except Exception as e:
+            if key == "up":
+                nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")
+            elif key == "down":
+                nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.sub_displays.network_display.left_pile.set_focus(1)
+
+
 class KnownNodes(urwid.WidgetWrap):
     def __init__(self, app):
         self.app = app
@@ -354,7 +523,7 @@ class KnownNodes(urwid.WidgetWrap):
 
         self.widget_list = self.make_node_widgets()
         
-        self.ilb = IndicativeListBox(
+        self.ilb = ExceptionHandlingListBox(
             self.widget_list,
             on_selection_change=self.node_list_selection,
             initialization_is_selection_change=False,
@@ -391,6 +560,8 @@ class KnownNodes(urwid.WidgetWrap):
         trust_level  = self.app.directory.trust_level(source_hash)
         display_str = self.app.directory.simplest_display_str(source_hash)
 
+        parent = self.app.ui.main_display.sub_displays.network_display
+
         def dismiss_dialog(sender):
             self.delegate.close_list_dialogs()
 
@@ -398,11 +569,21 @@ class KnownNodes(urwid.WidgetWrap):
             self.delegate.browser.retrieve_url(RNS.hexrep(source_hash, delimit=False))
             self.delegate.close_list_dialogs()
 
+        def show_info(sender):
+            info_widget = KnownNodeInfo(source_hash)
+            options = parent.left_pile.options(height_type="weight", height_amount=1)
+            parent.left_pile.contents[0] = (info_widget, options)
+
 
         dialog = ListDialogLineBox(
             urwid.Pile([
                 urwid.Text("Connect to node\n"+self.app.directory.simplest_display_str(source_hash)+"\n", align="center"),
-                urwid.Columns([("weight", 0.45, urwid.Button("Yes", on_press=confirmed)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("No", on_press=dismiss_dialog))])
+                urwid.Columns([
+                    ("weight", 0.45, urwid.Button("Yes", on_press=confirmed)),
+                    ("weight", 0.1, urwid.Text("")),
+                    ("weight", 0.45, urwid.Button("No", on_press=dismiss_dialog)),
+                    ("weight", 0.1, urwid.Text("")),
+                    ("weight", 0.45, urwid.Button("Info", on_press=show_info))])
             ]), title="?"
         )
         dialog.delegate = self.delegate
@@ -414,30 +595,32 @@ class KnownNodes(urwid.WidgetWrap):
         self.delegate.left_pile.contents[0] = (overlay, options)
 
     def delete_selected_entry(self):
-        source_hash = self.ilb.get_selected_item().original_widget.source_hash
+        si = self.ilb.get_selected_item()
+        if si != None:
+            source_hash = si.original_widget.source_hash
 
-        def dismiss_dialog(sender):
+            def dismiss_dialog(sender):
-            self.delegate.close_list_dialogs()
+                self.delegate.close_list_dialogs()
 
-        def confirmed(sender):
+            def confirmed(sender):
-            self.app.directory.forget(source_hash)
+                self.app.directory.forget(source_hash)
-            self.rebuild_widget_list()
+                self.rebuild_widget_list()
-            self.delegate.close_list_dialogs()
+                self.delegate.close_list_dialogs()
 
 
-        dialog = ListDialogLineBox(
+            dialog = ListDialogLineBox(
-            urwid.Pile([
+                urwid.Pile([
-                urwid.Text("Delete Node\n"+self.app.directory.simplest_display_str(source_hash)+"\n", align="center"),
+                    urwid.Text("Delete Node\n"+self.app.directory.simplest_display_str(source_hash)+"\n", align="center"),
-                urwid.Columns([("weight", 0.45, urwid.Button("Yes", on_press=confirmed)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("No", on_press=dismiss_dialog))])
+                    urwid.Columns([("weight", 0.45, urwid.Button("Yes", on_press=confirmed)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("No", on_press=dismiss_dialog))])
-            ]), title="?"
+                ]), title="?"
-        )
+            )
-        dialog.delegate = self.delegate
+            dialog.delegate = self.delegate
-        bottom = self
+            bottom = self
 
-        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+            overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
 
-        options = self.delegate.left_pile.options("weight", 1)
+            options = self.delegate.left_pile.options("weight", 1)
-        self.delegate.left_pile.contents[0] = (overlay, options)
+            self.delegate.left_pile.contents[0] = (overlay, options)
 
 
     def rebuild_widget_list(self):
@@ -461,8 +644,6 @@ class KnownNodes(urwid.WidgetWrap):
         # TODO: Sort list
         return widget_list
 
-
-
 class NodeEntry(urwid.WidgetWrap):
     def __init__(self, app, node, delegate):
         source_hash = node.source_hash
@@ -520,7 +701,7 @@ class AnnounceTime(urwid.WidgetWrap):
         if self.app.peer_settings["last_announce"] != None:
             self.last_announce_string = pretty_date(int(self.app.peer_settings["last_announce"]))
 
-        self.display_widget.set_text("Last Announce : "+self.last_announce_string)
+        self.display_widget.set_text("Announced : "+self.last_announce_string)
 
     def update_time_callback(self, loop=None, user_data=None):
         self.update_time()
@@ -537,6 +718,69 @@ class AnnounceTime(urwid.WidgetWrap):
         self.started = False
 
 
+class NodeAnnounceTime(urwid.WidgetWrap):
+    def __init__(self, app):
+        self.started = False
+        self.app = app
+        self.timeout = self.app.config["textui"]["animation_interval"]
+        self.display_widget = urwid.Text("")
+        self.update_time()
+
+        urwid.WidgetWrap.__init__(self, self.display_widget)
+
+    def update_time(self):
+        self.last_announce_string = "Never"
+        if self.app.peer_settings["node_last_announce"] != None:
+            self.last_announce_string = pretty_date(int(self.app.peer_settings["node_last_announce"]))
+
+        self.display_widget.set_text("Last Announce   : "+self.last_announce_string)
+
+    def update_time_callback(self, loop=None, user_data=None):
+        self.update_time()
+        if self.started:
+            self.app.ui.loop.set_alarm_in(self.timeout, self.update_time_callback)
+
+    def start(self):
+        was_started = self.started
+        self.started = True
+        if not was_started:
+            self.update_time_callback()
+
+    def stop(self):
+        self.started = False
+
+class NodeActiveConnections(urwid.WidgetWrap):
+    def __init__(self, app):
+        self.started = False
+        self.app = app
+        self.timeout = self.app.config["textui"]["animation_interval"]
+        self.display_widget = urwid.Text("")
+        self.update_stat()
+
+        urwid.WidgetWrap.__init__(self, self.display_widget)
+
+    def update_stat(self):
+        self.stat_string = "None"
+        if self.app.node != None:
+            self.stat_string = str(len(self.app.node.destination.links))
+
+        self.display_widget.set_text("Connected Peers : "+self.stat_string)
+
+    def update_stat_callback(self, loop=None, user_data=None):
+        self.update_stat()
+        if self.started:
+            self.app.ui.loop.set_alarm_in(self.timeout, self.update_stat_callback)
+
+    def start(self):
+        was_started = self.started
+        self.started = True
+        if not was_started:
+            self.update_stat_callback()
+
+    def stop(self):
+        self.started = False
+
+
 class LocalPeer(urwid.WidgetWrap):
     announce_timer = None
 
@@ -598,9 +842,9 @@ class LocalPeer(urwid.WidgetWrap):
             options = self.parent.left_pile.options(height_type="pack", height_amount=None)
             self.parent.left_pile.contents[2] = (overlay, options)
 
-        def node_settings_query(sender):
+        def node_info_query(sender):
             options = self.parent.left_pile.options(height_type="pack", height_amount=None)
-            self.parent.left_pile.contents[2] = (self.parent.node_settings_display, options)
+            self.parent.left_pile.contents[2] = (self.parent.node_info_display, options)
 
         if LocalPeer.announce_timer == None:
             self.t_last_announce = AnnounceTime(self.app)
@@ -619,7 +863,7 @@ class LocalPeer(urwid.WidgetWrap):
                 self.t_last_announce,
                 announce_button,
                 urwid.Divider(g["divider1"]),
-                urwid.Columns([("weight", 0.45, urwid.Button("Save", on_press=save_query)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Node Cfg", on_press=node_settings_query))])
+                urwid.Columns([("weight", 0.45, urwid.Button("Save", on_press=save_query)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Node Info", on_press=node_info_query))])
             ]
         )
 
@@ -629,26 +873,109 @@ class LocalPeer(urwid.WidgetWrap):
         self.t_last_announce.start()
 
 
-class NodeSettings(urwid.WidgetWrap):
+class NodeInfo(urwid.WidgetWrap):
+    announce_timer = None
+    links_timer = None
+
     def __init__(self, app, parent):
         self.app = app
         self.parent = parent
         g = self.app.ui.glyphs
 
+        self.dialog_open = False
+
+        widget_style = ""
+
         def show_peer_info(sender):
             options = self.parent.left_pile.options(height_type="pack", height_amount=None)
             self.parent.left_pile.contents[2] = (LocalPeer(self.app, self.parent), options)
+        
+        if self.app.enable_node:
+            if self.app.node != None:
+                display_name = self.app.node.name
+            else:
+                display_name = None
+        
+            if display_name == None:
+                display_name = ""
 
-        widget_style = "inactive_text"
+            t_id = urwid.Text("Addr : "+RNS.hexrep(self.app.node.destination.hash, delimit=False))
-        pile = urwid.Pile([
+            e_name = urwid.Text("Name : "+display_name)
-            urwid.Text("\n"+g["info"], align="center"),
+
-            urwid.Text("\nNode Hosting currently unavailable\n\n", align="center"),
+            def announce_query(sender):
-            urwid.Padding(urwid.Button("Back", on_press=show_peer_info), "center", "pack")
+                def dismiss_dialog(sender):
-        ])
+                    self.dialog_open = False
+                    options = self.parent.left_pile.options(height_type="pack", height_amount=None)
+                    self.parent.left_pile.contents[2] = (NodeInfo(self.app, self.parent), options)
+
+                self.app.node.announce()
+
+                dialog = DialogLineBox(
+                    urwid.Pile([
+                        urwid.Text("\n\n\nAnnounce Sent\n\n", align="center"),
+                        urwid.Button("OK", on_press=dismiss_dialog)
+                    ]), title=g["info"]
+                )
+                dialog.delegate = self
+                bottom = self
+
+                #overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=4, right=4)
+                overlay = dialog
+                
+                self.dialog_open = True
+                options = self.parent.left_pile.options(height_type="pack", height_amount=None)
+                self.parent.left_pile.contents[2] = (overlay, options)
+
+            def connect_query(sender):
+                self.parent.browser.retrieve_url(RNS.hexrep(self.app.node.destination.hash, delimit=False))
+
+            if NodeInfo.announce_timer == None:
+                self.t_last_announce = NodeAnnounceTime(self.app)
+                NodeInfo.announce_timer = self.t_last_announce
+            else:
+                self.t_last_announce = NodeInfo.announce_timer
+                self.t_last_announce.update_time()
+
+            if NodeInfo.links_timer == None:
+                self.t_active_links = NodeActiveConnections(self.app)
+                NodeInfo.links_timer = self.t_active_links
+            else:
+                self.t_active_links = NodeInfo.links_timer
+                self.t_active_links.update_stat()
+
+            announce_button = urwid.Button("Announce", on_press=announce_query)
+            connect_button = urwid.Button("Browse", on_press=connect_query)
+
+            pile = urwid.Pile([
+                t_id,
+                e_name,
+                urwid.Divider(g["divider1"]),
+                self.t_last_announce,
+                self.t_active_links,
+                urwid.Divider(g["divider1"]),
+                urwid.Columns([
+                    ("weight", 0.3, urwid.Button("Back", on_press=show_peer_info)),
+                    ("weight", 0.1, urwid.Text("")),
+                    ("weight", 0.4, connect_button),
+                    ("weight", 0.1, urwid.Text("")),
+                    ("weight", 0.5, announce_button)
+                ])
+            ])
+        else:
+            pile = urwid.Pile([
+                urwid.Text("\n"+g["info"], align="center"),
+                urwid.Text("\nThis instance is not hosting a node\n\n", align="center"),
+                urwid.Padding(urwid.Button("Back", on_press=show_peer_info), "center", "pack")
+            ])
 
         self.display_widget = pile
 
-        urwid.WidgetWrap.__init__(self, urwid.AttrMap(urwid.LineBox(self.display_widget, title="Node Settings"), widget_style))
+        urwid.WidgetWrap.__init__(self, urwid.AttrMap(urwid.LineBox(self.display_widget, title="Local Node Info"), widget_style))
+
+    def start(self):
+        if self.app.node != None:
+            self.t_last_announce.start()
+            self.t_active_links.start()
 
 
 
@@ -696,7 +1023,7 @@ class NetworkStats(urwid.WidgetWrap):
         def get_num_nodes():
             return self.app.directory.number_of_known_nodes()
 
-        self.w_heard_peers = UpdatingText(self.app, "Heard Peers: ", get_num_peers, append_text=" (last 30m)")
+        self.w_heard_peers = UpdatingText(self.app, "Heard Peers: ", get_num_peers, append_text=" (30m)")
         self.w_known_nodes = UpdatingText(self.app, "Known Nodes: ", get_num_nodes)
 
         pile = urwid.Pile([
@@ -712,14 +1039,17 @@ class NetworkStats(urwid.WidgetWrap):
         self.w_heard_peers.start()
         self.w_known_nodes.start()
 
-
-
 class NetworkLeftPile(urwid.Pile):
     def keypress(self, size, key):
         if key == "ctrl l":
             self.parent.toggle_list()
+        elif key == "ctrl p":
+            self.parent.reinit_lxmf_peers()
+            self.parent.show_peers()
         elif key == "ctrl w":
             self.parent.browser.disconnect()
+        elif key == "ctrl u":
+            self.parent.browser.url_dialog()
         else:
             return super(NetworkLeftPile, self).keypress(size, key)
 
@@ -733,11 +1063,15 @@ class NetworkDisplay():
 
         self.browser = Browser(self.app, "nomadnetwork", "node", auth_identity = self.app.identity, delegate = self)
 
+        if self.app.node != None:
+            self.browser.loopback = self.app.node.destination.hash
+
         self.known_nodes_display = KnownNodes(self.app)
+        self.lxmf_peers_display = LXMFPeers(self.app)
         self.network_stats_display = NetworkStats(self.app, self)
         self.announce_stream_display = AnnounceStream(self.app, self)
         self.local_peer_display = LocalPeer(self.app, self)
-        self.node_settings_display = NodeSettings(self.app, self)
+        self.node_info_display = NodeInfo(self.app, self)
 
         self.known_nodes_display.delegate = self
 
@@ -752,11 +1086,12 @@ class NetworkDisplay():
 
         self.left_area = self.left_pile
         self.right_area = self.browser.display_widget
+        self.right_area_width = 1-NetworkDisplay.list_width
 
         self.columns = urwid.Columns(
             [
                 ("weight", NetworkDisplay.list_width, self.left_area),
-                ("weight", 1-NetworkDisplay.list_width, self.right_area)
+                ("weight", self.right_area_width, self.right_area)
             ],
             dividechars=0, focus_column=0
         )
@@ -774,6 +1109,15 @@ class NetworkDisplay():
             self.left_pile.contents[0] = (self.known_nodes_display, options)
             self.list_display = 1
 
+    def show_peers(self):
+        options = self.left_pile.options(height_type="weight", height_amount=1)
+        self.left_pile.contents[0] = (self.lxmf_peers_display, options)
+
+        if self.list_display != 0:
+            self.list_display = 0
+        else:
+            self.list_display = 1
+
     def focus_lists(self):
         self.columns.focus_position = 0
 
@@ -783,6 +1127,11 @@ class NetworkDisplay():
         self.close_list_dialogs()
         self.announce_stream_display.rebuild_widget_list()
 
+    def reinit_lxmf_peers(self):
+        self.lxmf_peers_display = LXMFPeers(self.app)
+        self.lxmf_peers_display.delegate = self
+        self.close_list_dialogs()
+
     def close_list_dialogs(self):
         if self.list_display == 0:
             options = self.left_pile.options(height_type="weight", height_amount=1)
@@ -793,8 +1142,12 @@ class NetworkDisplay():
 
     def start(self):
         self.local_peer_display.start()
+        self.node_info_display.start()
         self.network_stats_display.start()
-        self.announce_stream_display.start()
+        # There seems to be an intermittent memory leak somewhere
+        # in the periodic updating here. The periodic updater should
+        # not be needed anymore, so dis
+        #self.announce_stream_display.start()
 
     def shortcuts(self):
         return self.shortcuts_display
@@ -807,6 +1160,103 @@ class NetworkDisplay():
             self.known_nodes_display.rebuild_widget_list()
 
 
+class LXMFPeers(urwid.WidgetWrap):
+    def __init__(self, app):
+        self.app = app
+        self.peer_list = app.message_router.peers
+        # self.peer_list = {}
+
+        g = self.app.ui.glyphs
+
+        self.widget_list = self.make_peer_widgets()
+
+        self.ilb = IndicativeListBox(
+            self.widget_list,
+            on_selection_change=self.node_list_selection,
+            initialization_is_selection_change=False,
+            highlight_offFocus="list_off_focus"
+        )
+
+        if len(self.peer_list) > 0:
+            self.display_widget = self.ilb
+            widget_style = None
+            self.no_content = False
+        else:
+            self.no_content = True
+            widget_style = "inactive_text"
+            self.pile = urwid.Pile([urwid.Text(("warning_text", g["info"]+"\n"), align="center"), SelectText(("warning_text", "Currently, no LXMF nodes are peered\n\n"), align="center")])
+            self.display_widget = urwid.Filler(self.pile, valign="top", height="pack")
+
+        urwid.WidgetWrap.__init__(self, urwid.AttrMap(urwid.LineBox(self.display_widget, title="LXMF Peers"), widget_style))
+
+    def keypress(self, size, key):
+        if key == "up" and (self.no_content or self.ilb.first_item_is_selected()):
+            nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")
+        elif key == "ctrl x":
+            self.delete_selected_entry()
+            
+        return super(LXMFPeers, self).keypress(size, key)
+
+
+    def node_list_selection(self, arg1, arg2):
+        pass
+
+    def delete_selected_entry(self):
+        si = self.ilb.get_selected_item()
+        if si != None:
+            destination_hash = si.original_widget.destination_hash
+            self.app.message_router.unpeer(destination_hash)
+            self.delegate.reinit_lxmf_peers()
+            self.delegate.show_peers()
+
+
+    def rebuild_widget_list(self):
+        self.peer_list = self.app.message_router.peers
+        self.widget_list = self.make_peer_widgets()
+        self.ilb.set_body(self.widget_list)
+        if len(self.widget_list) > 0:
+            self.no_content = False
+        else:
+            self.no_content = True
+            self.delegate.reinit_lxmf_peers()
+
+    def make_peer_widgets(self):
+        widget_list = []
+        for peer_id in self.peer_list:
+            peer = self.peer_list[peer_id]
+            pe = LXMFPeerEntry(self.app, peer, self)
+            pe.destination_hash = peer.destination_hash
+            widget_list.append(pe)
+
+        # TODO: Sort list
+        return widget_list
+
+class LXMFPeerEntry(urwid.WidgetWrap):
+    def __init__(self, app, peer, delegate):
+        destination_hash = peer.destination_hash
+
+        self.app = app
+        g = self.app.ui.glyphs
+
+        node_identity = RNS.Identity.recall(destination_hash)
+        display_str = RNS.prettyhexrep(destination_hash)
+        if node_identity != None:            
+            node_hash = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", node_identity)
+            display_name = self.app.directory.alleged_display_str(node_hash)
+            if display_name != None:
+                display_str += "\n   "+str(display_name)
+
+        sym = g["sent"]
+        style         = "list_unknown"
+        focus_style   = "list_focus"
+
+        widget = ListEntry(sym+" "+display_str+"\n   Last heard "+pretty_date(int(peer.last_heard))+"\n   "+str(len(peer.unhandled_messages))+" unhandled messages")
+        # urwid.connect_signal(widget, "click", delegate.connect_node, node)
+
+        self.display_widget = urwid.AttrMap(widget, style, focus_style)
+        self.display_widget.destination_hash = destination_hash
+        urwid.WidgetWrap.__init__(self, self.display_widget)
+
 
 def pretty_date(time=False):
     """

nomadnet/vendor/configobj.py

@@ -19,7 +19,7 @@ import sys
 
 from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF16_BE, BOM_UTF16_LE
 
-import six
+import RNS.vendor.six as six
 __version__ = '5.0.6'
 
 # imported lazily to avoid startup performance hit if it isn't used

nomadnet/vendor/quotes.py

@@ -1,4 +1,6 @@
 quotes = [
     ("I want the wisdom that wise men revere. I want more.", "Faithless"),
-    ("That's enough entropy for you my friend", "Unknown")
+    ("That's enough entropy for you my friend", "Unknown"),
+    ("Any time two people connect online, it's financed by a third person who believes they can manipulate the first two", "Jaron Lanier"),
+    ("The landscape of the future is set, but how one will march across it is not determined", "Terence McKenna")
 ]

setup.py

@@ -23,6 +23,6 @@ setuptools.setup(
     entry_points= {
         'console_scripts': ['nomadnet=nomadnet.nomadnet:main']
     },
-    install_requires=['rns>=0.2.4', 'lxmf>=0.0.9', 'urwid>=2.1.2'],
+    install_requires=['rns>=0.3.0', 'lxmf>=0.1.3', 'urwid>=2.1.2'],
     python_requires='>=3.6',
 )