Changeset 1489 for trunk

Timestamp:

12/04/19 17:09:27 (4 years ago)

Author:

bnemhaus

Message:

Frames now can report if they are an encryptable frame. A frame is encryptable if it has a encryption label and is not a credentials frame.

Frame.getGroupFrame() now does some additional sanity checking to avoid needless frame loads.

File:

• trunk/src/org/expeditee/gui/Frame.java (modified) (3 diffs)

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

@@ -42 +42 @@
 
 import org.expeditee.actions.Simple;
+import org.expeditee.auth.AuthenticatorBrowser;
 import org.expeditee.auth.mail.gui.MailBay;
 import org.expeditee.core.Colour;
@@ -213 +214 @@
         public boolean isReadOnly() {
                 return !_frameName.hasPermission(UserAppliedPermission.full) && !_protectionChanged;
+        }
+        
+        public boolean isEncryptableFrame() {
+                boolean hasEncryptionLabel = this.getEncryptionLabel() != null;
+                boolean isProfileFrame = this.getPath().equals(FrameIO.PROFILE_PATH);
+                boolean isCredentialsFrame = isProfileFrame && this.getNumber() == AuthenticatorBrowser.CREDENTIALS_FRAME;
+                return hasEncryptionLabel && !isCredentialsFrame;
         }
 
@@ -3031 +3039 @@
                 if (this._groupFrame != null) {
                         return this._groupFrame;
-                } else {
+                } else if (this._groupFrameName != null){
                         this._groupFrame = FrameIO.LoadFrame(this._groupFrameName + 1, FrameIO.GROUP_PATH);
                         return this._groupFrame;
+                } else {
+                        return null;
                 }
         }