Changeset 1376 for trunk

Timestamp:

05/24/19 16:06:05 (5 years ago)

Author:

bln4

Message:

Followup: credentials frame is now programmatically calculated rather than hard coded.

File:

• trunk/src/org/expeditee/auth/mail/gui/MailBay.java (modified) (3 diffs)

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

@@ -1 +1 @@
 package org.expeditee.auth.mail.gui;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Scanner;
 
 import org.expeditee.auth.AuthenticatorBrowser;
@@ -111 +115 @@
                         }
                 }
-                
+                                
                 // Add new message
                 Mail mail = new Mail(message, message2, options);
@@ -117 +121 @@
                 _messages.add(t);
                 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.
+                Path credentialsFilePath = Paths.get(FrameIO.CONTACTS_PATH).resolve(sender + "-credentials").resolve("credentials.inf");
+                if (credentialsFilePath.toFile().exists()) {
+                        try (Scanner in = new Scanner(credentialsFilePath)) {
+                                String line = in.nextLine();
+                                int number = Integer.parseInt(line.replace(".exp", ""));
+                                header.setLink(sender + "-credentials" + number); 
+                        } catch (IOException e) {
+                                MessageBay.errorMessage("Unable to find credentials frame of message sender: " + sender);
+                        }
+                }
                 for (Text line: mail.getMessage()) {
                         _creator.addItem(line.copy(), false);