improve edward output

now edward puts all the verifications of message correctness before any
quoted message. this has the benefit of making these messages more
prominent.

diff --git a/edward b/edward
index 060d6d6e8b18a4592ec574dff6d187cb29fd9cad..1f28371f114dd15b25f269a5b26f6d90ed1aefa3 100755 (executable)
--- a/edward
+++ b/edward
@@ -972,15 +972,6 @@ def write_reply (replyinfo_obj):
     if replyinfo_obj.decrypt_success == True:
         debug('decrypt success')
         reply_plain += replyinfo_obj.replies['success_decrypt']
-
-        if (replyinfo_obj.sig_success == True) and (replyinfo_obj.have_reply_key == True):
-            debug('message quoted')
-            reply_plain += replyinfo_obj.replies['space']
-            reply_plain += replyinfo_obj.replies['quote_follows']
-            reply_plain += "\n\n"
-            quoted_text = email_quote_text(replyinfo_obj.msg_to_quote)
-            reply_plain += quoted_text
-
         reply_plain += "\n\n"
 
     elif replyinfo_obj.decrypt_failure == True:
@@ -1017,6 +1008,17 @@ def write_reply (replyinfo_obj):
         reply_plain += "\n\n"
 
 
+    if (replyinfo_obj.decrypt_success == True) \
+            and (replyinfo_obj.sig_success == True) \
+            and (replyinfo_obj.have_reply_key == True):
+        debug('message quoted')
+        reply_plain += replyinfo_obj.replies['quote_follows']
+        reply_plain += "\n\n"
+        quoted_text = email_quote_text(replyinfo_obj.msg_to_quote)
+        reply_plain += quoted_text
+        reply_plain += "\n\n"
+
+
     if (reply_plain == ""):
         debug('plaintext message')
         reply_plain += replyinfo_obj.replies['failed_decrypt']

diff --git a/tests/gpg-flatten-1.out b/tests/gpg-flatten-1.out
index 934ec634c8608fd97611971c9b9277f167277343..bae38317da54605946e421d32121c38eb43835b3 100644 (file)
--- a/tests/gpg-flatten-1.out
+++ b/tests/gpg-flatten-1.out
@@ -1,4 +1,8 @@
-I received your message and decrypted it. Here's a copy of your message:
+I received your message and decrypted it.
+
+Your signature was verified.
+
+Here's a copy of your message:
 
 > thanks for the message!
 > 
@@ -15,8 +19,6 @@ I received your message and decrypted it. Here's a copy of your message:
 > 
 > 
 
-Your signature was verified.
-
 - Edward, the friendly GnuPG bot
 The Free Software Foundation created me.
 

diff --git a/tests/gpg-flatten-2.out b/tests/gpg-flatten-2.out
index 68303505c7125d1481e296bd9974074eea4770f6..0e5608606ff6b033471ffe4cd33f7b0b3188a6ad 100644 (file)
--- a/tests/gpg-flatten-2.out
+++ b/tests/gpg-flatten-2.out
@@ -1,6 +1,12 @@
 Hello, I am Edward, the friendly GnuPG bot.
 
-I received your message and decrypted it. Here's a copy of your message:
+I received your message and decrypted it.
+
+Your signature was verified.
+
+I received your public key. Thanks.
+
+Here's a copy of your message:
 
 > thanks for the message!
 > 
@@ -18,10 +24,6 @@ I received your message and decrypted it. Here's a copy of your message:
 > 
 > 
 
-Your signature was verified.
-
-I received your public key. Thanks.
-
 - Edward, the friendly GnuPG bot
 The Free Software Foundation created me.
 

diff --git a/tests/gpg-flatten-4.out b/tests/gpg-flatten-4.out
index 5148e5374a8be2ba5eb44a7edec54200d6d13d70..a1dbd96662c583ed1497aa31cc419c8690fc9495 100644 (file)
--- a/tests/gpg-flatten-4.out
+++ b/tests/gpg-flatten-4.out
@@ -1,4 +1,8 @@
-あなたから送られたメールの暗号を解きました。確認のため、内容を返信します：
+あなたから送られたメールの暗号を解きました。
+
+あなたの署名を確認できました。
+
+確認のため、内容を返信します：
 
 > thanks for the message!
 > 
@@ -15,8 +19,6 @@
 > 
 > 
 
- あなたの署名を確認できました。
-
 - GnuPGボットのEdward
 
 Free Software Foundationが私を制作しました。 Free Software Foundationに寄付しませんか。| https://www.fsf.org/donate

diff --git a/tests/gpg-flatten-8.out b/tests/gpg-flatten-8.out
index 6419c900388c8b2a731e7843e20bef6b08a6e272..c2e6ce0539165db45f1f83dc44c235cffc865a28 100644 (file)
--- a/tests/gpg-flatten-8.out
+++ b/tests/gpg-flatten-8.out
@@ -1,6 +1,12 @@
 Hello, I am Edward, the friendly GnuPG bot.
 
-I received your message and decrypted it. Here's a copy of your message:
+I received your message and decrypted it.
+
+Your signature was verified.
+
+I received your public key. Thanks.
+
+Here's a copy of your message:
 
 > > Über Spaß.
 > > 
@@ -14,10 +20,6 @@ I received your message and decrypted it. Here's a copy of your message:
 > 
 > 
 
-Your signature was verified.
-
-I received your public key. Thanks.
-
 - Edward, the friendly GnuPG bot
 The Free Software Foundation created me.