From d09636ee0b9957ed60fc01224ddfbb03c4f4b7fa Mon Sep 17 00:00:00 2001 From: Tim Culverhouse Date: Mon, 25 Apr 2022 08:30:43 -0500 Subject: refactor: refactor pgp implementation This commit refactors the internal PGP implementation to make way for GPG integration. Signed-off-by: Tim Culverhouse Acked-by: Koni Marti Acked-by: Robin Jarry --- commands/account/view.go | 2 +- commands/msg/delete.go | 2 +- commands/msgview/next.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'commands') diff --git a/commands/account/view.go b/commands/account/view.go index 53ad267..8537d33 100644 --- a/commands/account/view.go +++ b/commands/account/view.go @@ -45,7 +45,7 @@ func (ViewMessage) Execute(aerc *widgets.Aerc, args []string) error { aerc.PushError(msg.Error.Error()) return nil } - lib.NewMessageStoreView(msg, store, aerc.DecryptKeys, + lib.NewMessageStoreView(msg, store, aerc.Crypto, aerc.DecryptKeys, func(view lib.MessageView, err error) { if err != nil { aerc.PushError(err.Error()) diff --git a/commands/msg/delete.go b/commands/msg/delete.go index 5eb622d..d26169f 100644 --- a/commands/msg/delete.go +++ b/commands/msg/delete.go @@ -68,7 +68,7 @@ func (Delete) Execute(aerc *widgets.Aerc, args []string) error { acct.Messages().Invalidate() return nil } - lib.NewMessageStoreView(next, store, aerc.DecryptKeys, + lib.NewMessageStoreView(next, store, aerc.Crypto, aerc.DecryptKeys, func(view lib.MessageView, err error) { if err != nil { aerc.PushError(err.Error()) diff --git a/commands/msgview/next.go b/commands/msgview/next.go index 742bc66..928b9fb 100644 --- a/commands/msgview/next.go +++ b/commands/msgview/next.go @@ -42,7 +42,7 @@ func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error { aerc.RemoveTab(mv) return nil } - lib.NewMessageStoreView(nextMsg, store, aerc.DecryptKeys, + lib.NewMessageStoreView(nextMsg, store, aerc.Crypto, aerc.DecryptKeys, func(view lib.MessageView, err error) { if err != nil { aerc.PushError(err.Error()) -- cgit v1.2.3