Changeset 1483 for trunk

Timestamp:

12/03/19 17:21:26 (4 years ago)

Author:

bnemhaus

Message:

Introducing java property 'expeditee.demo-mode', when set to true. With it enabled, any expeditee mail sent will also go to the recipient if they are on the same computer. --fix previous issue with one-off messages that was just introduced.

File:

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

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

@@ -72 +72 @@
                 // Do it all again if demo mode is on (ensures sync without having to move db files)
                 if (Boolean.getBoolean("expeditee.demo-mode")) {
-                        databaseFileDirPath = ensureDeadDropsDemoMode(colleagueName);
+                        databaseFileDirPath = ensureDeadDropsDemoMode(colleagueName, mail.sender);
                         databaseFilePath = ensureDatabaseFile(colleagueName, databaseFileDirPath);                      
                         sendMail(mail, secretKey, databaseFilePath);
@@ -173 +173 @@
         }
         
+        private static Path ensureDeadDropsDemoMode(String colleagueName, String sender) {
+                String me = sender.toLowerCase();
+                String them = colleagueName.toLowerCase();
+                Path parent = Paths.get(FrameIO.PARENT_FOLDER).resolve("resources-" + them).resolve("deaddrops");
+                Path databaseFileDirPath = parent.resolve(me + "+" + them);
+                if (!databaseFileDirPath.toFile().exists()) {
+                        databaseFileDirPath = parent.resolve(them + "+" + me);
+                }
+                return databaseFileDirPath;
+        }
+        
         private static void sendMail(MailEntry mail, PublicKey key, Path databaseFile) {
                 try {