Mirrors
/
Sideband
mirror of https://github.com/markqvist/Sideband.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed new conversation error dialog being wonky

This commit is contained in:
Mark Qvist 2024-11-24 12:45:49 +01:00
parent 0cbd4c71ab
commit fe4c61880e
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbapp/main.py
View File

@ -2627,11 +2627,15 @@ class SidebandApp(MDApp):
RNS.log("Error while creating conversation: "+str(e), RNS.LOG_ERROR) RNS.log("Error while creating conversation: "+str(e), RNS.LOG_ERROR)
if new_result: 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.d_content.ids["n_address_field"].error = False
dialog.dismiss() dialog.dismiss()
if self.conversations_view != None: if self.conversations_view != None:
self.conversations_view.update() self.conversations_view.update()
else: 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_address_field"].error = True
# dialog.d_content.ids["n_error_field"].text = "Could not create conversation. Check your input." # dialog.d_content.ids["n_error_field"].text = "Could not create conversation. Check your input."

6
sbapp/sideband/core.py
View File

@ -4264,7 +4264,11 @@ class SidebandCore():
try: try:
addr_b = bytes.fromhex(dest_str) 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: except Exception as e:
RNS.log("Error while creating conversation: "+str(e), RNS.LOG_ERROR) RNS.log("Error while creating conversation: "+str(e), RNS.LOG_ERROR)

4
sbapp/ui/conversations.py
View File

@ -524,8 +524,8 @@ Builder.load_string("""
id: n_address_field id: n_address_field
max_text_length: 32 max_text_length: 32
hint_text: "Address" hint_text: "Address"
helper_text: "Error, check your input" helper_text: ""
helper_text_mode: "on_error" helper_text_mode: "on_focus"
text: "" text: ""
font_size: dp(24) font_size: dp(24)