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

Timestamp:

01/31/19 16:34:06 (5 years ago)

Author:

bln4

Message:

org.expeditee.auth.EncryptedExpReader ->
org.expeditee.auth.EncryptedExpWriter ->
Actions ->
AttributeUtils ->
Frame ->
FrameIO ->
UserSettings ->

Changed how reading and writing encrypted files worked. A Frame attribute is now consulted to determine what to use as key for encryption. The 'profile' attribute setting is used to signal that the users personal aes key is used. Further enhancement will mean that other labels will be able to be used.

Actions ->

MailMode action now consults the database to reaquire the mail.

File:

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

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

@@ -43 +43 @@
 import org.expeditee.auth.Authenticator;
 import org.expeditee.auth.EncryptedExpReader;
-import org.expeditee.auth.EncryptedProfileExpWriter;
+import org.expeditee.auth.EncryptedExpWriter;
 import org.expeditee.auth.gui.MailBay;
 import org.expeditee.io.Conversion;
@@ -92 +92 @@
                 STATISTICS_DIR = PARENT_FOLDER + "statistics" + File.separator;
                 LOGS_DIR = PARENT_FOLDER + "logs" + File.separator;
+                SHARED_BY_ME_FRAMESETS = PARENT_FOLDER + "framesets-shared-by-me" + File.separator;
+                SHARED_WITH_ME_FRAMESETS = PARENT_FOLDER + "framesets-shared-with-me" + File.separator;
         }
 
@@ -125 +127 @@
 
         public static String STATISTICS_DIR;
+        
+        public static String SHARED_BY_ME_FRAMESETS;
+        
+        public static String SHARED_WITH_ME_FRAMESETS;
 
         public static String LOGS_DIR;
@@ -475 +481 @@
                         if (fullPath.endsWith(ExpReader.EXTENTION)) {
                                 if (EncryptedExpReader.isEncryptedExpediteeFile(fullPath)) {
-                                        final boolean isProfile = frameName.startsWith(UserSettings.UserName.get());
-                                        reader = new EncryptedExpReader(frameName, isProfile);
+                                        //final boolean isProfile = frameName.startsWith(UserSettings.UserName.get());
+                                        //reader = new EncryptedExpReader(frameName, isProfile);
+                                        reader = new EncryptedExpReader(frameName);
                                 } else {
                                         reader = new ExpReader(frameName);
@@ -1006 +1013 @@
                         // if its a new frame or an existing Exp frame...
                         if (fullPath == null || fullPath.endsWith(ExpReader.EXTENTION)) {
-                                //Frame currentFrame = DisplayController.getCurrentFrame();
                                 if (UserSettings.Authenticated.get() && 
-                                                toSave.getName().startsWith(UserSettings.UserName.get()) && 
-                                                toSave.getNumber() != Authenticator.PUBLIC_KEY_FRAME) {
-                                        writer = new EncryptedProfileExpWriter();
+                                                toSave.getNumber() != Authenticator.PUBLIC_KEY_FRAME && 
+                                                toSave.getEncryptionLabel() != null) {
+                                        writer = new EncryptedExpWriter(toSave.getEncryptionLabel());
                                         savedVersion = EncryptedExpReader.getVersion(fullPath);
                                 } else {