From 5be8040e00c82a9e99004f79a1e55f8a9295703d Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Thu, 7 Dec 2023 18:40:19 +1100 Subject: [PATCH] remove redundant sigchat MenuOp::Link & MenueOp::Register alternatives are presented to user as required --- apps/sigchat/src/api.rs | 2 -- apps/sigchat/src/main.rs | 18 ------------------ 2 files changed, 20 deletions(-) diff --git a/apps/sigchat/src/api.rs b/apps/sigchat/src/api.rs index c34b1c86b..bd9e19ae9 100644 --- a/apps/sigchat/src/api.rs +++ b/apps/sigchat/src/api.rs @@ -17,9 +17,7 @@ pub enum SigchatOp { #[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)] pub enum MenuOp { - Link, Noop, - Register, } #[allow(dead_code)] diff --git a/apps/sigchat/src/main.rs b/apps/sigchat/src/main.rs index 197cd3988..3a476123e 100644 --- a/apps/sigchat/src/main.rs +++ b/apps/sigchat/src/main.rs @@ -61,22 +61,6 @@ fn wrapped_main() -> ! { ); let cid = xous::connect(sid).unwrap(); - chat.menu_add(MenuItem { - name: xous_ipc::String::from_str(t!("sigchat.register", locales::LANG)), - action_conn: Some(cid), - action_opcode: SigchatOp::Menu as u32, - action_payload: MenuPayload::Scalar([MenuOp::Register as u32, 0, 0, 0]), - close_on_select: true, - }) - .expect("failed add menu"); - chat.menu_add(MenuItem { - name: xous_ipc::String::from_str(t!("sigchat.link", locales::LANG)), - action_conn: Some(cid), - action_opcode: SigchatOp::Menu as u32, - action_payload: MenuPayload::Scalar([MenuOp::Link as u32, 0, 0, 0]), - close_on_select: true, - }) - .expect("failed add menu"); chat.menu_add(MenuItem { name: xous_ipc::String::from_str(t!("sigchat.menu.close", locales::LANG)), action_conn: Some(cid), @@ -112,9 +96,7 @@ fn wrapped_main() -> ! { log::info!("got Chat Menu Click"); xous::msg_scalar_unpack!(msg, menu_code, _, _, _, { match FromPrimitive::from_usize(menu_code) { - Some(MenuOp::Link) => sigchat.account_link(), Some(MenuOp::Noop) => {} - Some(MenuOp::Register) => sigchat.account_register(), _ => (), } });