Changeset 1283 for trunk/src/org/expeditee/auth/Mail.java

Timestamp:

04/05/19 10:25:31 (5 years ago)

Author:

bln4

Message:

When loading in messages from the mail databases now uses the timestamp last-accessed companion file to only load in new ones.

File:

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

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

@@ -2 +2 @@
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -17 +18 @@
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Scanner;
 
 import javax.crypto.BadPaddingException;
@@ -78 +83 @@
                 PublicKey publicKey = null;
                 try {
-                        publicKey = Authenticator.getInstance().getPublicKey(colleagueName);
+                        publicKey = AuthenticatorBrowser.getInstance().getPublicKey(colleagueName);
                 } catch (InvalidKeySpecException | NoSuchAlgorithmException | KeyStoreException | CertificateException
                                 | ClassNotFoundException | IOException | SQLException e) {
@@ -182 +187 @@
                                 }
                                 
-                                //String arguments = new String(c.doFinal(Base64.getDecoder().decode(mail.args)));
-                                filtered.add(new MailEntry(mail.timestamp, sender, receiverDecrypted, message, message2, options));
+                                Path lastAccessedFile = Paths.get(FrameIO.DEAD_DROPS_PATH).resolve(sender).resolve(name + ".last-accessed");
+                                SimpleDateFormat format = new SimpleDateFormat("ddMMMyyyy[HH:mm]");
+                                MailEntry mailEntry = new MailEntry(mail.timestamp, sender, receiverDecrypted, message, message2, options);
+                                try (Scanner in = new Scanner(lastAccessedFile.toFile())) {
+                                        Date lastAccessedTimestamp = format.parse(in.nextLine());
+                                        Date mailTimestamp = format.parse(mail.timestamp);
+                                        if (mailTimestamp.after(lastAccessedTimestamp)) {
+                                                filtered.add(mailEntry);
+                                        }
+                                } catch (FileNotFoundException e) {
+                                        // It may not have been created yet, then err on the safe side and add it in.
+                                        filtered.add(mailEntry);
+                                } catch (ParseException e) {
+                                        // If we fail to parse, then err on the safe side and add it in.
+                                        filtered.add(mailEntry);
+                                }                       
+                                
                         }
                 }