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

Timestamp:

02/03/20 14:12:59 (4 years ago)

Author:

bnemhaus

Message:

The HetrogeneousEncryptionLabels frame property is now set automatically when the owner of the frame is saving out an encrypted frame.
Also fixed some issues setting frame properties on load. For example, when loading a frame, the FrameEncryptionLabel should be set regardless of if you have permission to set the label.

File:

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

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

@@ -35 +35 @@
 import org.expeditee.items.Line;
 import org.expeditee.items.Text;
+import org.expeditee.settings.UserSettings;
 import org.expeditee.settings.identity.secrets.KeyList;
 import org.expeditee.stats.SessionStats;
@@ -50 +51 @@
         protected static final String TERMINATOR_WITH_CONTINUATION = TERMINATOR + "...";
 
+        /**
+         * @return the labelnone
+         */
+        public static String getLabelNone() {
+                return labelNone;
+        }
+        
         public EncryptedExpWriter(String encryptionLabel) {
                 label = encryptionLabel;
@@ -93 +101 @@
                 if (_writer == null) { return; }
                 
+                if (UserSettings.UserName.get().equals(frame.getOwner())) {
+                        updateHetrogeneousOwnerLabels(frame);
+                }
                 preOutputFrame();
                 writeHeader(frame);
@@ -261 +272 @@
         }
         
+        private void updateHetrogeneousOwnerLabels(Frame toUpdate) {
+                toUpdate.clearHetrogeneousFrameOwnerLabels();
+                Text[] userLabels = KeyList.UserLabels.get();
+                for (Text userLabel: userLabels) {
+                        toUpdate.addToHetrogeneousFrameOwnerLabels(userLabel.getText());
+                }               
+        }
+        
         private static byte[] EncryptSymmetric(byte[] toEncrypt, SecretKey key) {
                 try {
@@ -276 +295 @@
                 }
         }
-
-        /**
-         * @return the labelnone
-         */
-        public static String getLabelNone() {
-                return labelNone;
-        }
 }