Changeset 1431 for trunk/src/org/expeditee/encryption/io/EncryptedExpWriter.java

Timestamp:

08/15/19 12:57:28 (5 years ago)

Author:

bln4

Message:

Recoding of the Labels class to improve surrogate mode functionality. Surrogate mode is now maintained when you navigate from one frame to another, even if that frame has a different set of labels. Completely different sets of labels cause Expeditee to exit surrogate mode with a message to the user.

File:

• trunk/src/org/expeditee/encryption/io/EncryptedExpWriter.java (modified) (4 diffs)

trunk/src/org/expeditee/encryption/io/EncryptedExpWriter.java

@@ -24 +24 @@
 import org.expeditee.encryption.items.surrogates.EncryptionDetail;
 import org.expeditee.encryption.items.surrogates.EncryptionDetail.Type;
+import org.expeditee.encryption.items.surrogates.Label.LabelResult;
 import org.expeditee.encryption.items.surrogates.Label;
-import org.expeditee.encryption.items.surrogates.Label.LabelResult;
+import org.expeditee.encryption.items.surrogates.Label.LabelInfo;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.Frame.BodyType;
@@ -64 +65 @@
                         }
                 } else {
-                        LabelResult res = Label.getLabel(label);
-                        if (res == LabelResult.SuccessResolveLabelToKey) {
+                        LabelInfo res = Label.getLabel(label);
+                        if (res.is(LabelResult.SuccessResolveLabelToKey)) {
                                 byte[] keyBytes = res.key;
                                 key = new SecretKeySpec(keyBytes, SymmetricAlgorithm);
-                        } else if (res == LabelResult.ErrorUnableToFindLabel) {
+                        } else if (res.is(LabelResult.ErrorUnableToFindLabel)) {
                                 MessageBay.errorMessage(res.toString() + encryptionLabel);
                                 key = null;
@@ -195 +196 @@
                 BinaryOperator<Boolean> trueExists = (a, b) -> a || b;
                 boolean surrogatesInherit = surrogateItems.stream().map(isTagInherited).collect(Collectors.reducing(trueExists)).orElseGet(() -> false);
-                boolean userHasKey = Label.getLabel(toWrite.getEncryptionLabel()) == LabelResult.SuccessResolveLabelToKey;
+                boolean userHasKey = Label.getLabel(toWrite.getEncryptionLabel()).is(LabelResult.SuccessResolveLabelToKey);
                 
                 // If we have no surrogates that inherit this property from us, and we have the label required to encrypt it, then we should encrypt it.
@@ -213 +214 @@
                 Method toRun = tags.get(tag);
                 Class<?> declarer = toRun.getDeclaringClass();
-                LabelResult res = Label.getLabel(toWrite.getEncryptionLabel());
-                if (declarer.isAssignableFrom(toWrite.getClass()) && res == LabelResult.SuccessResolveLabelToKey) {
+                LabelInfo res = Label.getLabel(toWrite.getEncryptionLabel());
+                if (declarer.isAssignableFrom(toWrite.getClass()) && res.is(LabelResult.SuccessResolveLabelToKey)) {
                         try {
                                 Object o = toRun.invoke(toWrite, new Object[] {});