Changeset 1431 for trunk/src/org/expeditee/encryption/io/EncryptedExpReader.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/EncryptedExpReader.java (modified) (3 diffs)

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

@@ -28 +28 @@
 import org.expeditee.encryption.items.surrogates.EncryptionDetail;
 import org.expeditee.encryption.items.surrogates.Label;
+//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.FrameIO;
@@ -222 +224 @@
                 // Attempt to decrypt the line if necessary.
                 if (isEncryptedLine) {
-                        LabelResult res = Label.getLabel(item.getEncryptionLabel());
-                        if (res == LabelResult.SuccessResolveLabelToKey) {
+                        LabelInfo res = Label.getLabel(item.getEncryptionLabel());
+                        if (res.is(LabelResult.SuccessResolveLabelToKey)) {
                                 EncryptionDetail reencryptOnSave = new EncryptionDetail(EncryptionDetail.Type.ReencryptOnSave);
                                 item.setEncryptionDetailForTag(tag, reencryptOnSave);
@@ -370 +372 @@
                 
                 private SecretKeySpec resolveLabel(String label) {
-                        LabelResult res = Label.getLabel(label);
-                        if (res == LabelResult.SuccessResolveLabelToKey) {
+                        LabelInfo res = Label.getLabel(label);
+                        if (res.is(LabelResult.SuccessResolveLabelToKey)) {
                                 byte[] keyBytes = res.key;
                                 return new SecretKeySpec(keyBytes, SymmetricAlgorithm);