Changeset 1282 for trunk/src/org/expeditee/gui

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.

File:

• trunk/src/org/expeditee/gui/Browser.java (modified) (2 diffs)

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);