compose: s/Option<AccountHash>/AccountHash in EditAttachments

epilys · epilys · commit 1207217cd796 · 2024-12-26T16:02:03.000+02:00
Signed-off-by: Manos Pitsidianakis &lt;manos@pitsidianak.is&gt;
diff --git a/meli/src/mail/compose.rs b/meli/src/mail/compose.rs
@@ -130,7 +130,7 @@ pub struct Composer {
 enum ViewMode {
     Discard(ComponentId, UIDialog<char>),
     EditAttachments {
-        widget: EditAttachments,
+        widget: Box<EditAttachments>,
     },
     Edit,
     EmbeddedPty,
@@ -1927,7 +1927,7 @@ impl Component for Composer {
                     && shortcut!(key == shortcuts[Shortcuts::COMPOSING]["edit"]) =>
             {
                 self.mode = ViewMode::EditAttachments {
-                    widget: EditAttachments::new(Some(self.account_hash)),
+                    widget: Box::new(EditAttachments::new(self.account_hash)),
                 };
                 self.set_dirty(true);
 
@@ -2528,6 +2528,8 @@ impl Component for Composer {
     fn shortcuts(&self, context: &Context) -> ShortcutMaps {
         let mut map = if self.mode.is_edit() {
             self.pager.shortcuts(context)
+        } else if let ViewMode::EditAttachments { ref widget } = self.mode {
+            widget.shortcuts(context)
         } else {
             Default::default()
         };
diff --git a/meli/src/mail/compose/edit_attachments.rs b/meli/src/mail/compose/edit_attachments.rs
@@ -40,7 +40,7 @@ pub enum EditAttachmentMode {
 #[derive(Debug)]
 pub struct EditAttachments {
     /// For shortcut setting retrieval.
-    pub account_hash: Option<AccountHash>,
+    pub account_hash: AccountHash,
     pub mode: EditAttachmentMode,
     pub buttons: ButtonWidget<FormButtonAction>,
     pub cursor: EditAttachmentCursor,
@@ -49,7 +49,7 @@ pub struct EditAttachments {
 }
 
 impl EditAttachments {
-    pub fn new(account_hash: Option<AccountHash>) -> Self {
+    pub fn new(account_hash: AccountHash) -> Self {
         //ButtonWidget::new(("Add".into(), FormButtonAction::Other("add")));
         let mut buttons = ButtonWidget::new(("Go Back".into(), FormButtonAction::Cancel));
         buttons.set_focus(true);
@@ -63,6 +63,16 @@ impl EditAttachments {
             id: ComponentId::default(),
         }
     }
+
+    pub fn shortcuts(&self, context: &Context) -> ShortcutMaps {
+        let mut map = self.buttons.shortcuts(context);
+
+        let our_map: ShortcutMap =
+            account_settings!(context[self.account_hash].shortcuts.composing).key_values();
+        map.insert(Shortcuts::COMPOSING, our_map);
+
+        map
+    }
 }
 
 impl EditAttachmentsRefMut<'_, '_> {
@@ -319,16 +329,7 @@ impl Component for EditAttachmentsRefMut<'_, '_> {
     fn kill(&mut self, _uuid: ComponentId, _context: &mut Context) {}
 
     fn shortcuts(&self, context: &Context) -> ShortcutMaps {
-        let mut map = ShortcutMaps::default();
-
-        let our_map: ShortcutMap = self
-            .inner
-            .account_hash
-            .map(|acc| account_settings!(context[acc].shortcuts.composing).key_values())
-            .unwrap_or_else(|| context.settings.shortcuts.composing.key_values());
-        map.insert(Shortcuts::COMPOSING, our_map);
-
-        map
+        self.inner.shortcuts(context)
     }
 
     fn id(&self) -> ComponentId {
