Fixed new conversation error dialog being wonky

markqvist · Nov 24, 2024 · fe4c618 · fe4c618
1 parent 0cbd4c7
commit fe4c618
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/sbapp/main.py b/sbapp/main.py
@@ -2627,11 +2627,15 @@ def dl_yes(s):
                     RNS.log("Error while creating conversation: "+str(e), RNS.LOG_ERROR)
 
                 if new_result:
+                    dialog.d_content.ids["n_address_field"].helper_text = ""
+                    dialog.d_content.ids["n_address_field"].helper_text_mode = "on_focus"
                     dialog.d_content.ids["n_address_field"].error = False
                     dialog.dismiss()
                     if self.conversations_view != None:
                         self.conversations_view.update()
                 else:
+                    dialog.d_content.ids["n_address_field"].helper_text = "Invalid address, check your input"
+                    dialog.d_content.ids["n_address_field"].helper_text_mode = "persistent"
                     dialog.d_content.ids["n_address_field"].error = True
                     # dialog.d_content.ids["n_error_field"].text = "Could not create conversation. Check your input."
 

diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py
@@ -4264,7 +4264,11 @@ def new_conversation(self, dest_str, name = "", trusted = False):
 
         try:
             addr_b = bytes.fromhex(dest_str)
-            self._db_create_conversation(addr_b, name, trusted)
+            if addr_b == self.lxmf_destination.hash:
+                RNS.log("Cannot create conversation with own LXMF address", RNS.LOG_ERROR)
+                return False
+            else:
+                self._db_create_conversation(addr_b, name, trusted)
 
         except Exception as e:
             RNS.log("Error while creating conversation: "+str(e), RNS.LOG_ERROR)

diff --git a/sbapp/ui/conversations.py b/sbapp/ui/conversations.py
@@ -524,8 +524,8 @@ def get_widget(self):
         id: n_address_field
         max_text_length: 32
         hint_text: "Address"
-        helper_text: "Error, check your input"
-        helper_text_mode: "on_error"
+        helper_text: ""
+        helper_text_mode: "on_focus"
         text: ""
         font_size: dp(24)