Changeset 1461 for trunk/src/org/expeditee/gui/FrameIO.java

Timestamp:

11/29/19 15:33:47 (4 years ago)

Author:

bnemhaus

Message:

You cannot load an encrypted frame if you do not have the associated key.

File:

• trunk/src/org/expeditee/gui/FrameIO.java (modified) (2 diffs)

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

@@ -598 +598 @@
                         if (fullPath.endsWith(ExpReader.EXTENTION)) {
                                 if (EncryptedExpReader.isEncryptedExpediteeFile(fullPath)) {
-                                        reader = new EncryptedExpReader(frameName);
+                                        if (EncryptedExpReader.isAccessibleExpediteeFile(fullPath)) {
+                                                reader = new EncryptedExpReader(frameName);
+                                        } else {
+                                                String message = "Cannot load frame " + frameName + ".  It is encrypted and you do not have the associated key.";
+                                                System.err.println(message);
+                                                MessageBay.errorMessage(message);
+                                                return null;
+                                        }
                                 } else {
                                         reader = new ExpReader(frameName);
@@ -1754 +1761 @@
                 ResumeCache();
 
+                // 0 frame
                 base.reset();
                 base.resetDateCreated();
                 base.setFrameset(frameset);
                 base.setFrameNumber(0);
+                base.setOwner(UserSettings.UserName.get());
                 base.setTitle(base.getFramesetName() + "0");
                 base.setPath(path);
                 base.change();
-                base.setOwner(UserSettings.UserName.get());
                 SaveFrame(base, false);
 
+                // 1 frame
                 base.reset();
                 base.resetDateCreated();
                 base.setFrameNumber(1);
+                base.setOwner(UserSettings.UserName.get());
                 base.setTitle(frameset);
                 base.change();
-                base.setOwner(UserSettings.UserName.get());
                 SaveFrame(base, true);