Changeset 1478 for trunk

Timestamp:

12/03/19 16:30:10 (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.

Location:

trunk/src/org/expeditee/auth

Files:

• account/Authenticate.java (modified) (2 diffs)
• mail/Mail.java (modified) (4 diffs)

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

@@ -34 +34 @@
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.MessageBay;
+import org.expeditee.gui.management.ResourceManager;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
@@ -102 +103 @@
                         //Settings.parseSettings(settingsLink);
                         FrameUtils.ParseProfile(oneFrame);
+                        ResourceManager.invalidateAllResourceDirectories();
                         
                         // At this point we at least login, but maybe with problems.

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

@@ -38 +38 @@
 import org.expeditee.auth.AuthenticatorBrowser;
 import org.expeditee.auth.mail.gui.MailBay;
-import org.expeditee.encryption.Actions;
 import org.expeditee.encryption.CryptographyConstants;
 import org.expeditee.gui.FrameIO;
@@ -70 +69 @@
                 // Send message
                 sendMail(mail, secretKey, databaseFilePath);
+                
+                // 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);
+                        databaseFilePath = ensureDatabaseFile(colleagueName, databaseFileDirPath);                      
+                        sendMail(mail, secretKey, databaseFilePath);
+                }
         }
         
@@ -98 +104 @@
                 // Send message
                 sendMail(mail, publicKey, databaseFilePath);
+                
+                // 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);
+                        databaseFilePath = ensureDatabaseFile(colleagueName, databaseFileDirPath);
+                        try {
+                                publicKey = AuthenticatorBrowser.getInstance().getPublicKey(colleagueName);
+                        } catch (InvalidKeySpecException | NoSuchAlgorithmException | KeyStoreException | CertificateException
+                                        | ClassNotFoundException | IOException | SQLException e) {
+                                System.err.println("Error while sending message.  Unable to obtain public key for colleague " +  
+                                        colleagueName + ".  Exception message: " + e.getMessage());
+                                return;
+                        }
+                        if (publicKey == null) {
+                                System.err.println("(Demo mode) Error while sending message.  Unable to obtain public key for colleague.  Have you exchanged contact details?");
+                                return;
+                        }
+                        
+                        sendMail(mail, publicKey, databaseFilePath);
+                }
         }
 
@@ -138 +164 @@
         }
         
+        private static Path ensureDeadDropsDemoMode(String colleagueName) {
+                String me = UserSettings.UserName.get().toLowerCase();
+                String them = colleagueName.toLowerCase();
+                String demoModeDeadDropsPath = FrameIO.DEAD_DROPS_PATH.replace(me, them);
+                Path databaseFileDirPath = Paths.get(demoModeDeadDropsPath).resolve(me + "+" + them);
+                if (!databaseFileDirPath.toFile().exists()) {
+                        databaseFileDirPath = Paths.get(demoModeDeadDropsPath).resolve(them + "+" + me);
+                }
+                return databaseFileDirPath;
+        }
+        
         private static Path ensureDeadDrops(String colleagueName, String sender) {
                 String me = sender.toLowerCase();