Changeset 1304 for trunk/src/org/expeditee/gui

Timestamp:

04/11/19 16:19:58 (5 years ago)

Author:

bln4

Message:

MailBay and MessageBay instances are now encrypted with ProfileEncryption

Location:

trunk/src/org/expeditee/gui

Files:

• FrameCreator.java (modified) (3 diffs)
• MessageBay.java (modified) (2 diffs)

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

@@ -81 +81 @@
         private final List<Frame> framesCreated = new LinkedList<Frame>();
 
+        private String encryptionLabel;
+
         public FrameCreator(String frameTitle) {
                 this(DisplayController.getCurrentFrame().getFramesetName(), DisplayController.getCurrentFrame().getPath(),
-                                frameTitle, ExistingFramesetOptions.AppendSegregatedFrames, false);
-        }
-
-        public FrameCreator(String framesetName, String path, String frameTitle, ExistingFramesetOptions establishState, boolean multiColumn) {
+                                frameTitle, ExistingFramesetOptions.AppendSegregatedFrames, false, null);
+        }
+
+        public FrameCreator(String framesetName, String path, String frameTitle, ExistingFramesetOptions establishState, boolean multiColumn, String encryptionLabel) {
+                this.encryptionLabel = encryptionLabel;
                 switch (establishState) {
                         case OverrideExistingFrames:
@@ -168 +171 @@
                                 toUse = FrameIO.CreateFrameset(framesetName, path.toAbsolutePath().toString() + File.separator, true);
                         }
+                        
+                        if (encryptionLabel != null && encryptionLabel.length() > 0) {
+                                toUse.setEncryptionLabel(encryptionLabel);
+                        }
                 
                         this.framesCreated.add(toUse);
@@ -243 +250 @@
                         // add link to new frame
                         addFirstButton(newFrame, _firstFrame.getName());
+                        
+                        if (encryptionLabel != null && encryptionLabel.length() > 0) {
+                                newFrame.setEncryptionLabel(encryptionLabel);
+                        }
 
                         FrameIO.SaveFrame(_current, false);

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

@@ -227 +227 @@
         public static void updateFramesetLocation() {
                 if (_forUser != UserSettings.UserName.get()) {
-                        _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, FrameIO.MESSAGES_PATH, MESSAGES_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.OverrideExistingFrames,
-                                        false);
+                        if (AuthenticatorBrowser.isAuthenticated()) {
+                                _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, FrameIO.MESSAGES_PATH, MESSAGES_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.OverrideExistingFrames,
+                                                false, AuthenticatorBrowser.PROFILEENCRYPTIONLABEL);
+                        } else {
+                                _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, FrameIO.MESSAGES_PATH, MESSAGES_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.OverrideExistingFrames,
+                                                false, null);
+                        }
                         _forUser = UserSettings.UserName.get();
                 }
@@ -277 +282 @@
 
                 if (_creator == null) {
-                        _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, FrameIO.MESSAGES_PATH, MESSAGES_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.OverrideExistingFrames,
-                                        false);
+                        if (AuthenticatorBrowser.isAuthenticated()) {
+                                _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, FrameIO.MESSAGES_PATH, MESSAGES_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.OverrideExistingFrames,
+                                                false, AuthenticatorBrowser.PROFILEENCRYPTIONLABEL);
+                        } else {
+                                _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, FrameIO.MESSAGES_PATH, MESSAGES_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.OverrideExistingFrames,
+                                                false, null);
+                        }
                         _forUser = UserSettings.UserName.get();
                 }