Changeset 1474 for trunk

Timestamp:

12/03/19 12:26:55 (4 years ago)

Author:

bnemhaus

Message:

Added FrameIO.Mail to the default paths populated on profile frames. With more time this could be done better; as per comment in UserSettings::appendDefaultFolders

Location:

trunk/src/org/expeditee

Files:

• auth/account/Create.java (modified) (1 diff)
• gui/FrameIO.java (modified) (2 diffs)
• settings/UserSettings.java (modified) (2 diffs)

trunk/src/org/expeditee/auth/account/Create.java

@@ -213 +213 @@
                 initialSettings.put("settings.UserSettings.ProfileName", constructGenericSetting(String.class, "ProfileName", "ProfileName", username, username));
                 initialSettings.put("settings.UserSettings.HomeFrame", constructGenericSetting(String.class, "The home frame", "HomeFrame", username + 1, username));
-                initialSettings.put("org.expeditee.gui.folders.FolderSettings.FrameDirs", FolderSettings.FrameDirs);
-                initialSettings.put("org.expeditee.gui.folders.FolderSettings.ImageDirs", FolderSettings.ImageDirs);
-                initialSettings.put("org.expeditee.gui.folders.FolderSettings.AudioDirs", FolderSettings.AudioDirs);
+                //String resourcesPrivateUserPath = FrameIO.PARENT_FOLDER + "resources-" + UserSettings.UserName.get() + File.separator;
+                //FolderSettings.FrameDirs.addAbsoluteDir(resourcesPrivateUserPath + "messages" + File.separator);
+                //initialSettings.put("org.expeditee.gui.folders.FolderSettings.FrameDirs", FolderSettings.FrameDirs);
+                //initialSettings.put("org.expeditee.gui.folders.FolderSettings.ImageDirs", FolderSettings.ImageDirs);
+                //initialSettings.put("org.expeditee.gui.folders.FolderSettings.AudioDirs", FolderSettings.AudioDirs);
                 
                 // Record the credentials frame number and password colleagues frame

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

@@ -156 +156 @@
                         FRAME_USERNAME_PRIVATE_PATH = resourcesPrivateUserPath + "framesets" + File.separator;
                         MESSAGES_PATH = resourcesPrivateUserPath + "messages" + File.separator;
+                        MAIL_PATH = resourcesPrivateUserPath + "mail" + File.separator;
                         IMAGES_PATH = resourcesPublicPath + "images" + File.separator;
                         IMAGES_USERNAME_PRIVATE_PATH = resourcesPrivateUserPath + "images" + File.separator;
@@ -170 +171 @@
                                 DEAD_DROPS_PATH = resourcesPrivateUserPath + "deaddrops" + File.separator;
                                 CONTACTS_PATH = resourcesPrivateUserPath + "contacts" + File.separator;
-                                MAIL_PATH = resourcesPrivateUserPath + "mail" + File.separator;
+                                //MAIL_PATH = resourcesPrivateUserPath + "mail" + File.separator;
                         } else {
                                 SHARED_FRAMESETS_PATH = null;
                                 DEAD_DROPS_PATH = null;
                                 CONTACTS_PATH = null;
-                                MAIL_PATH = null;
+                                //MAIL_PATH = null;
                         }
                 } else {

trunk/src/org/expeditee/settings/UserSettings.java

@@ -249 +249 @@
                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_PATH);
                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MESSAGES_PATH);
+                        // TODO: This is not the ideal way of adding mail.  Mail should only be available when authenticated.
+                        // This would ideally be done on authenticated profile creation auth.account.Create.java
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MAIL_PATH);
                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_USERNAME_PRIVATE_PATH);
                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_PATH);
@@ -254 +257 @@
                         if (AuthenticatorBrowser.isAuthenticated()) {
                                 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.CONTACTS_PATH);
-                                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MAIL_PATH);
+                                //FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MAIL_PATH);
                                 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.SHARED_FRAMESETS_PATH);                         
                         }