refactor: Send SMP failure request on Window close

Author: chadsec1

ui/contact_list.py

@@ -261,7 +261,6 @@ def show_contacts(self):
     def new_contact(self, contact_id):
         with self.user_data_lock:
             contact_name = contact_id if not self.user_data["contacts"][contact_id]["nickname"] else self.user_data["contacts"][contact_id]["nickname"]
-            contact_is_verified = self.user_data["contacts"][contact_id]["lt_sign_key_smp"]["verified"]
 
         button = tk.Button(
             self.contact_frame,
@@ -283,8 +282,6 @@ def new_contact(self, contact_id):
 
         # If no nickname is set
         if (contact_name == contact_id):
-            # We only allow setting nicknames after SMP verification succeeds 
-            if contact_is_verified:
                 context_menu.add_command(
                     label="Set nickname", 
                     command=lambda: self.change_contact_nickname(contact_id)
@@ -306,6 +303,14 @@ def new_contact(self, contact_id):
         button.bind("<Button-2>", lambda event: context_menu.tk_popup(event.x_root, event.y_root))  # MacOS
 
     def change_contact_nickname(self, contact_id):
+        with self.user_data_lock:
+            contact_is_verified = self.user_data["contacts"][contact_id]["lt_sign_key_smp"]["verified"]
+
+        # We only allow setting nicknames after SMP verification succeeds 
+        if not contact_is_verified:
+            messagebox.showwarning("Pending Verification", "You can only assign a nickname once SMP verification is complete")
+            return
+
         ContactNicknamePrompt(self, contact_id)
 
     def remove_contact_nickname(self, contact_id):

ui/smp_question_window.py

@@ -1,15 +1,23 @@
 import tkinter as tk
 from tkinter import messagebox
-# from ui.utils import *
-from logic.smp import smp_step_4_answer_provided
+from ui.utils import (
+    enhanced_entry
+)
+from logic.smp import (
+        smp_step_4_answer_provided,
+        smp_failure_notify_contact
+)
 
 class SMPQuestionWindow(tk.Toplevel):
     def __init__(self, master, contact_id, question):
         super().__init__(master)
         self.contact_id = contact_id
+        
+        self.protocol("WM_DELETE_WINDOW", self.on_close)
+
 
         self.title("Answer Verification Question")
-        self.geometry("400x250")
+        self.geometry("400x200")
         self.configure(bg="black")
 
         # Question label
@@ -24,14 +32,12 @@ def __init__(self, master, contact_id, question):
             justify="left"
         ).pack(pady=(10, 10))
 
-        # Answer input
         tk.Label(self, text="Answer:", fg="white", bg="black", anchor="w").pack(fill="x", padx=20)
         self.answer_entry = tk.Entry(self, width=50)
         self.answer_entry.pack(padx=20, pady=(0, 10))
 
-        # enhanced_entry(self.answer_entry, placeholder="I.e. Central Park")
+        enhanced_entry(self.answer_entry, placeholder="I.e. Central Park")
 
-        # Send button
         tk.Button(
             self,
             text="Send Verification Request",
@@ -45,6 +51,10 @@ def __init__(self, master, contact_id, question):
         self.transient(master)
         self.grab_set()
 
+    def on_close(self):
+        smp_failure_notify_contact(self.master.user_data, self.master.user_data_lock, self.contact_id, self.master.ui_queue)
+        self.destroy()
+
     def submit(self):
         answer = self.answer_entry.get().strip().lower()
         if not answer: