From 9b51bf794cfdd8efbae5952e3c2d9b1586d9fd44 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Fri, 9 Sep 2022 00:29:18 +0600
Subject: [PATCH] 5687-Save_message_as_simpleMessage_when_openPgp_is_not_ready

issue: https://gitlab.e.foundation/e/backlog/-/issues/5687

To enable user to send/save draft message when openPgp enabled but status is
not ready.
---
 .../main/java/com/fsck/k9/message/PgpMessageBuilder.java   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java b/app/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java
index 61c963836b..dc2b2a9f33 100644
--- a/app/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java
+++ b/app/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java
@@ -102,16 +102,11 @@ public class PgpMessageBuilder extends MessageBuilder {
             return;
         }
 
-        if (openPgpKeyId == null) {
+        if (openPgpKeyId == null || !cryptoStatus.isProviderStateOk()) {
             queueMessageBuildSuccess(currentProcessedMimeMessage);
             return;
         }
 
-        if (!cryptoStatus.isProviderStateOk()) {
-            queueMessageBuildException(new MessagingException("OpenPGP Provider is not ready!"));
-            return;
-        }
-
         addAutocryptHeaderIfAvailable(openPgpKeyId);
         if (isDraft()) {
             addDraftStateHeader();
-- 
GitLab