Changeset 1282 for trunk

Timestamp:

04/05/19 10:24:27 (5 years ago)

Author:

bln4

Message:

Tidied up startup a bit, Authenticator class renamed to AuthenticatedBrowser to signify it is Browsers replacement when running in authentication mode.

Location:

trunk/src/org/expeditee

Files:

• auth/AuthenticatorBrowser.java (moved) (moved from trunk/src/org/expeditee/auth/Authenticator.java ) (7 diffs)
• gui/Browser.java (modified) (2 diffs)

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

@@ -69 +69 @@
 import org.ngikm.cryptography.CryptographyConstants;
 
-public final class Authenticator extends Browser implements CryptographyConstants {
+public final class AuthenticatorBrowser extends Browser implements CryptographyConstants {
         
         // The frame number of the frame containing the current authenticated users public key.
@@ -83 +83 @@
         private static final String KEYSTOREFILENAME = "keystore.ks" + File.separator;
                 
-        private static Authenticator instance;
-        
-        public static Authenticator getInstance() throws KeyStoreException, FileNotFoundException, NoSuchAlgorithmException, CertificateException, IOException, ClassNotFoundException, SQLException {
-                if (instance == null) { instance = new Authenticator(); } 
+        private static AuthenticatorBrowser instance;
+        
+        public static AuthenticatorBrowser getInstance() throws KeyStoreException, FileNotFoundException, NoSuchAlgorithmException, CertificateException, IOException, ClassNotFoundException, SQLException {
+                if (instance == null) { instance = new AuthenticatorBrowser(); } 
                 return instance;
         }
         
-        private Authenticator() throws KeyStoreException, FileNotFoundException, IOException, NoSuchAlgorithmException, CertificateException, ClassNotFoundException, SQLException {
+        private AuthenticatorBrowser() throws KeyStoreException, FileNotFoundException, IOException, NoSuchAlgorithmException, CertificateException, ClassNotFoundException, SQLException {
                 super("Authentication");
                 UserSettings.setupDefaultFolders();
@@ -101 +101 @@
                 // Does the account Authentication.ADMINACCOUNT exist?
                 // If not then we have get the user to assign a password to it.
-                if (!keyStore.containsAlias(Authenticator.ADMINACCOUNT)) {
+                if (!keyStore.containsAlias(AuthenticatorBrowser.ADMINACCOUNT)) {
                         new File(FrameIO.PARENT_FOLDER).mkdirs();
                         protectAdmin();
@@ -136 +136 @@
                 // class load database classes
                 Class.forName("org.sqlite.JDBC");
-                _theBrowser = this;
         }
 
@@ -227 +226 @@
                                         loadMailFromFile(dbFile);
                                 }
-                                Path timestamp = deaddropforcontactPath.resolve(UserSettings.UserName.get() + ".last-accessed");
-                                try(FileWriter out = new FileWriter(timestamp.toFile())) {
-                                        out.write(Formatter.getDateTime() + System.getProperty("line.separator"));
-                                } catch (IOException e) {
-                                        e.printStackTrace();
-                                }
                                 clearOldMailFromDatabase(deaddropforcontactPath);
                         }
+                }
+        }
+
+        final void updateLastReadMailTime(Path deaddropforcontactPath) {
+                Path timestamp = deaddropforcontactPath.resolve(UserSettings.UserName.get() + ".last-accessed");
+                try(FileWriter out = new FileWriter(timestamp.toFile())) {
+                        out.write(Formatter.getDateTime() + System.getProperty("line.separator"));
+                } catch (IOException e) {
+                        e.printStackTrace();
                 }
         }
@@ -257 +259 @@
                 
                 if (dbFile == null || lastAccessedFile == null) {
-                        System.err.println("Failed to clear old messages from database file.");
-                        return; // Not the end of the world if we cannot clear out old messages.
+                        return; // Not the end of the world if we cannot clear out old messages, these files may not be present yet if the others are recently new.
                 }
                 
@@ -266 +267 @@
                         timestamp = format.parse(in.nextLine());
                 } catch (ParseException e) {
-                        System.err.println("Failed to clear old messages from database file.");
-                        return; // Not the end of the world if we cannot clear out old messages.
+                        return; // Not the end of the world if we cannot clear out old messages, the database might be empty.
                 }
                 

trunk/src/org/expeditee/gui/Browser.java

@@ -32 +32 @@
 import org.expeditee.actions.Simple;
 import org.expeditee.agents.mail.MailSession;
+import org.expeditee.auth.AuthenticatorBrowser;
 import org.expeditee.core.BlockingRunnable;
 import org.expeditee.core.Colour;
@@ -204 +205 @@
                 if (Boolean.getBoolean("auth")) {
                         try {
-                                org.expeditee.auth.Authenticator.getInstance();
-                                _initComplete = true;
-                                return;
+                                _theBrowser = AuthenticatorBrowser.getInstance();
                         } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException | IOException | ClassNotFoundException | SQLException e) {
                                 e.printStackTrace();
                         }
-                }
-                _theBrowser = new Browser();
+                } else {
+                        _theBrowser = new Browser();
+                }               
 
                 EcosystemManager.getGraphicsManager().requestFocus();
                 
+                // Java's way of getting access to internet.  Authenticating the user with their proxy username and password.
                 Authenticator.setDefault(proxyAuth);