Changeset 1424 for trunk

Timestamp:

07/31/19 12:21:45 (5 years ago)

Author:

bln4

Message:

When reconstructing the body on parse, make sure to use the source of XRayable Items

File:

• trunk/src/org/expeditee/gui/FrameUtils.java (modified) (3 diffs)

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -647 +647 @@
                 Picture pic = ItemUtils.CreatePicture(txt);
                 
-                // transfer any encryption label that is present
-                String encryptionLabel = txt.getEncryptionLabel();
-                if (encryptionLabel != null && !encryptionLabel.isEmpty()) {
-                        pic.setEncryptionLabelOnLoad(encryptionLabel);
-                }
-
                 // if the picture could not be created successfully
                 if (pic == null) {
@@ -984 +978 @@
                                 Logger.Log(e);
                                 e.printStackTrace();
-                                System.err
-                                                .println("**** Have temporarily supressed MessageBay call, as resulted in infinite recursion");
+                                System.err.println("**** Have temporarily supressed MessageBay call, "
+                                                + "as resulted in infinite recursion");
                                 // MessageBay.warningMessage("Exception occured when loading " +
                                 // i.getClass().getSimpleName() + "(ID: "
@@ -1169 +1163 @@
                 
                 for (Item item: primaryBody) {
+                        
+                        if (item instanceof XRayable && !((XRayable) item).sourceIsAccessible()) {
+                                item = ((XRayable) item).getSource();
+                        }
+                        
                         String encryptionLabel = item.getEncryptionLabel();
                         if (encryptionLabel == null || encryptionLabel.isEmpty()) {