Changeset 1294 for trunk

Timestamp:

04/08/19 13:01:37 (5 years ago)

Author:

bln4

Message:

Deaddrops folder for each relationship is now named a combination of each member of the relationship so that renaming by user is not needed.

File:

• trunk/src/org/expeditee/auth/Mail.java (modified) (3 diffs)

trunk/src/org/expeditee/auth/Mail.java

@@ -35 +35 @@
 
 import org.expeditee.gui.FrameIO;
+import org.expeditee.settings.UserSettings;
 import org.ngikm.cryptography.CryptographyConstants;
 
@@ -54 +55 @@
         public static void sendMail(MailEntry mail, String colleagueName) {
                 // Ensure dead drop area is set up.
-                Path databaseFileDirPath = Paths.get(FrameIO.DEAD_DROPS_PATH).resolve(colleagueName);
+                Path databaseFileDirPath = Paths.get(FrameIO.DEAD_DROPS_PATH).resolve(UserSettings.UserName.get() + "+" + colleagueName);
                 Path databaseFilePath = databaseFileDirPath.resolve(colleagueName + ".db");
                 File databaseFile = databaseFilePath.toFile();
@@ -187 +188 @@
                                 }
                                 
-                                Path lastAccessedFile = Paths.get(FrameIO.DEAD_DROPS_PATH).resolve(sender).resolve(name + ".last-accessed");
+                                Path lastAccessedFile = Paths.get(FrameIO.DEAD_DROPS_PATH).resolve(UserSettings.UserName.get() + "+" + sender).resolve(name + ".last-accessed");
+                                if (!lastAccessedFile.toFile().exists()) {
+                                        lastAccessedFile = Paths.get(FrameIO.DEAD_DROPS_PATH).resolve(sender + "+" + UserSettings.UserName.get()).resolve(name + ".last-accessed");
+                                }
                                 SimpleDateFormat format = new SimpleDateFormat("ddMMMyyyy[HH:mm]");
                                 MailEntry mailEntry = new MailEntry(mail.timestamp, sender, receiverDecrypted, message, message2, options);