fixed bug, removed stale code

piece_type is set to "signature", not "message" if it is an armored
signature.

we shouldn't include plaintext unless we don't need further nested
signatures.

diff --git a/edward b/edward
index b0fb8e6343747ab5e93d76aef1528882296fc580..50b94fd7417d3b7d71924de17740144b0c323343 100755 (executable)
--- a/edward
+++ b/edward
@@ -800,22 +800,18 @@ def flatten_decrypted_payloads (eddymsg_obj, get_signed_part):
         return flat_string
 
     for piece in eddymsg_obj.payload_pieces:
-        if piece.piece_type == "text":
-            flat_string += piece.string
-
         if (get_signed_part):
             # don't include nested encryption
-            if (piece.piece_type == "message") \
-                    and (piece.gpg_data != None) \
-                    and (piece.gpg_data.decrypted == False):
-                        flat_string += flatten_decrypted_payloads(piece.gpg_data.plainobj, get_signed_part)
-
-            elif ((piece.piece_type == "clearsign") \
+            if ((piece.piece_type == "clearsign") \
                     or (piece.piece_type == "detachedsig") \
                     or (piece.piece_type == "signature")) \
                     and (piece.gpg_data != None):
                         # FIXME: the key used to sign this message needs to be the one that is used for the encrypted reply.
-                        flat_string += flatten_decrypted_payloads (piece.gpg_data.plainobj, get_signed_part)
+                        flat_string += flatten_decrypted_payloads (piece.gpg_data.plainobj, False)
+                        break
+        else:
+            if piece.piece_type == "text":
+                flat_string += piece.string
 
     return flat_string
 

diff --git a/tests/gpg-flatten-4.out b/tests/gpg-flatten-4.out
index ae4f5f225048523ea263d1dedd210f68e3ef1ad4..3eb79b80bac7c431d594092b52d2ceb1bc3c5f86 100644 (file)
--- a/tests/gpg-flatten-4.out
+++ b/tests/gpg-flatten-4.out
@@ -6,7 +6,6 @@ Hello, I am Edward, the friendly GnuPG bot. I received your message and decrypte
 > 
 > let's see how it works!
 > 
-> 
 
 Your signature was verified.