From: Simon Tatham <anakin@pobox.com>
Date: Sat, 3 Feb 2024 09:34:03 +0000 (+0000)
Subject: login.rs: factor out ready_to_register().
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=b130707d4b42183b9e77491b6bf712e82993cf92;p=mastodonochrome.git

login.rs: factor out ready_to_register().

Spotted this obvious duplication in passing, while looking for
something else.
---

diff --git a/src/login.rs b/src/login.rs
index 6ea1b7a..d8e6136 100644
--- a/src/login.rs
+++ b/src/login.rs
@@ -736,6 +736,14 @@ impl LoginMenu {
         }
     }
 
+    fn ready_to_register(&self) -> bool {
+        self.el_username.get_data().ok()
+            && self.el_email.get_data().ok()
+            && self.el_password.get_data().ok()
+            && self.el_password_confirm.get_data().ok()
+            && self.cl_accept.get_value()
+    }
+
     fn confirm_registration_fallible(
         &mut self,
         client: &mut Client,
@@ -895,12 +903,7 @@ impl ActivityState for LoginMenu {
             }
             LoginState::LoginSuccess => status.add(Space, "Main Menu", 100),
             LoginState::RegisterInput => {
-                if self.el_username.get_data().ok()
-                    && self.el_email.get_data().ok()
-                    && self.el_password.get_data().ok()
-                    && self.el_password_confirm.get_data().ok()
-                    && self.cl_accept.get_value()
-                {
+                if self.ready_to_register() {
                     status.add(Space, "Register account", 100)
                 } else {
                     status.message(
@@ -1041,11 +1044,7 @@ impl ActivityState for LoginMenu {
                 if self.state == LoginState::LoginSuccess {
                     LogicalAction::FinishedLoggingIn
                 } else if self.state == LoginState::RegisterInput
-                    && self.el_username.get_data().ok()
-                    && self.el_email.get_data().ok()
-                    && self.el_password.get_data().ok()
-                    && self.el_password_confirm.get_data().ok()
-                    && self.cl_accept.get_value()
+                    && self.ready_to_register()
                 {
                     self.register_account(client)
                 } else {