Changeset 1375
- Timestamp:
- 05/24/19 15:52:29 (5 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/auth/mail/Mail.java
r1363 r1375 370 370 List<MailEntry> mailForLoggingInUser = Mail.getEntries(UserSettings.UserName.get(), key); 371 371 for (MailEntry mail: mailForLoggingInUser) { 372 MailBay.addMessage(mail.timestamp, mail. message, mail.message2, mail.options);372 MailBay.addMessage(mail.timestamp, mail.sender, mail.message, mail.message2, mail.options); 373 373 } 374 374 … … 396 396 options.put(k, v); 397 397 } 398 MailBay.addMessage(data.get(0), topic, message, options);398 MailBay.addMessage(data.get(0), "Single-use Secure (encrypted sender)", topic, message, options); 399 399 } 400 400 } -
trunk/src/org/expeditee/auth/mail/gui/MailBay.java
r1363 r1375 94 94 * @return 95 95 */ 96 public synchronized static Text addMessage(String timestamp, String message, String message2, Map<String, String> options) {96 public synchronized static Text addMessage(String timestamp, String sender, String message, String message2, Map<String, String> options) { 97 97 // Invalidate whole area 98 98 DisplayController.invalidateArea(DisplayController.getMessageBayPaintArea()); … … 116 116 Text t = mail.getPreviewMessage(true); 117 117 _messages.add(t); 118 _creator.addText(timestamp, Colour.BLACK, null, null, false); 118 Text header = _creator.addText(timestamp + " (From: " + sender + ")", Colour.BLACK, null, null, false); 119 header.setLink(sender + "-credentials" + 14); //TODO: instead of hard coding 14, have it programmatically looked up. 119 120 for (Text line: mail.getMessage()) { 120 121 _creator.addItem(line.copy(), false); -
trunk/src/org/expeditee/settings/UserSettings.java
r1360 r1375 252 252 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.SHARED_FRAMESETS_PATH); 253 253 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MAIL_PATH); 254 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.CONTACTS_PATH); 254 255 } 255 256 FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get()); … … 269 270 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.SHARED_FRAMESETS_PATH); 270 271 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MAIL_PATH); 272 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.CONTACTS_PATH); 271 273 } 272 274 FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
Note:
See TracChangeset
for help on using the changeset viewer.