Changeset 1375 for trunk

Timestamp:

05/24/19 15:52:29 (5 years ago)

Author:

bln4

Message:

Mail now links to the senders credentials frame. More work required to not hard code it to frame 14.

Location:

trunk/src/org/expeditee

Files:

• auth/mail/Mail.java (modified) (2 diffs)
• auth/mail/gui/MailBay.java (modified) (2 diffs)
• settings/UserSettings.java (modified) (2 diffs)

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

@@ -370 +370 @@
                 List<MailEntry> mailForLoggingInUser = Mail.getEntries(UserSettings.UserName.get(), key);                       
                 for (MailEntry mail: mailForLoggingInUser) {
-                        MailBay.addMessage(mail.timestamp, mail.message, mail.message2, mail.options);
+                        MailBay.addMessage(mail.timestamp, mail.sender, mail.message, mail.message2, mail.options);
                 }
                 
@@ -396 +396 @@
                         options.put(k, v);
                 }
-                MailBay.addMessage(data.get(0), topic, message, options);
+                MailBay.addMessage(data.get(0), "Single-use Secure (encrypted sender)", topic, message, options);
         }
 }

trunk/src/org/expeditee/auth/mail/gui/MailBay.java

@@ -94 +94 @@
          * @return
          */
-        public synchronized static Text addMessage(String timestamp, String message, String message2, Map<String, String> options) {
+        public synchronized static Text addMessage(String timestamp, String sender, String message, String message2, Map<String, String> options) {
                 // Invalidate whole area
                 DisplayController.invalidateArea(DisplayController.getMessageBayPaintArea());
@@ -116 +116 @@
                 Text t = mail.getPreviewMessage(true);
                 _messages.add(t);
-                _creator.addText(timestamp, Colour.BLACK, null, null, false);
+                Text header = _creator.addText(timestamp + " (From: " + sender + ")", Colour.BLACK, null, null, false);
+                header.setLink(sender + "-credentials" + 14); //TODO: instead of hard coding 14, have it programmatically looked up.
                 for (Text line: mail.getMessage()) {
                         _creator.addItem(line.copy(), false);

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

@@ -252 +252 @@
                                 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.SHARED_FRAMESETS_PATH);
                                 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MAIL_PATH);
+                                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.CONTACTS_PATH);
                         }
                         FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
@@ -269 +270 @@
                                 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.SHARED_FRAMESETS_PATH);
                                 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MAIL_PATH);
+                                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.CONTACTS_PATH);
                         }
                         FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());