Changeset 1457 for trunk

Timestamp:

11/29/19 15:17:33 (4 years ago)

Author:

bnemhaus

Message:

Fixed bug that did not get correct label names and was therefore causing Expeditee to attempt to display encrypted primaries.

Suppressed using MessageBay because the way the code is currently structured this causes recursive infinite loop. Until code restructured, the 'fix' is to use std err instead.

File:

• trunk/src/org/expeditee/encryption/items/surrogates/Label.java (modified) (5 diffs)

trunk/src/org/expeditee/encryption/items/surrogates/Label.java

@@ -4 +4 @@
 import java.util.Arrays;
 import java.util.Base64;
-import java.util.Collection;
 import java.util.List;
 import java.util.function.Predicate;
@@ -11 +10 @@
 
 import org.expeditee.gui.ItemsList;
-import org.expeditee.gui.MessageBay;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
@@ -125 +123 @@
                         }
                 } else {
-                        return getLabelsFromContext(itemsList);
+                        List<String> labelsFromContext = getLabelsFromContext(itemsList);
+                        ArrayList<String> copy = new ArrayList<String>(labelsFromContext);
+                        copy.retainAll(userLabels);
+                        return copy;
                 }
         }
@@ -146 +147 @@
                                 surrogateStep = 0;
                                 isInSurrogateMode = false;
-                                MessageBay.displayMessage("You have lost access to the encryption label " 
+//                              MessageBay.displayMessage("You have lost access to the encryption label " 
+//                                              + surrogateMode + ".  Dropping out of surrogate mode.");
+                                System.out.println("You have lost access to the encryption label " 
                                                 + surrogateMode + ".  Dropping out of surrogate mode.");
                         }
@@ -179 +182 @@
         private static List<String> getLabelsFromContext(ItemsList context) {
                 Predicate<Item> hasEncryptionLabel = item -> item.getEncryptionLabel() != null && !item.getEncryptionLabel().isEmpty();
-                Collection<Item> local = new ItemsList(context).underlying();
+                List<Item> local = context.cloneList();
                 Stream<Item> itemsWithLabel = local.stream().filter(hasEncryptionLabel);
                 Stream<String> labels = itemsWithLabel.map(item -> item.getEncryptionLabel()).distinct();