From 0d553ce98d3c328132110b68490712515f4d168c Mon Sep 17 00:00:00 2001 From: Andrew Engelbrecht Date: Thu, 23 Jul 2015 12:21:57 -0400 Subject: [PATCH] fixed some simple bugs --- edward | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/edward b/edward index 258cea2..59d6482 100755 --- a/edward +++ b/edward @@ -405,7 +405,7 @@ def flatten_decrypted_payloads (eddymsg_obj, get_signed_part): # recurse on multi-part mime if eddymsg_obj.multipart == True: for sub in eddymsg_obj.subparts: - flat_string += flatten_decrypted_payloads (sub) + flat_string += flatten_decrypted_payloads (sub, get_signed_part) return flat_string @@ -415,7 +415,7 @@ def flatten_decrypted_payloads (eddymsg_obj, get_signed_part): if (get_signed_part): # don't include nested encryption - elif (piece.piece_type == "message") \ + 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) -- 2.25.1