Changeset 1327 for trunk

Timestamp:

04/26/19 13:13:30 (5 years ago)

Author:

bln4

Message:

Updated all calls to Boolean.get("expeditee.authentication") to point to AuthenticatorBrowser.isAuthenticationRequired so that they all pipe through exact same check. Also fixed up some old references to Boolean.get("auth") in the apollo sections that I missed.

Location:

trunk/src/org

Files:

• apollo/ApolloSystem.java (modified) (2 diffs)
• apollo/io/AudioPathManager.java (modified) (2 diffs)
• expeditee/gui/Browser.java (modified) (3 diffs)

trunk/src/org/apollo/ApolloSystem.java

@@ -24 +24 @@
 import org.apollo.widgets.FramePlayer;
 import org.expeditee.actions.Actions;
+import org.expeditee.auth.AuthenticatorBrowser;
 import org.expeditee.core.BlockingRunnable;
 import org.expeditee.gio.EcosystemManager;
@@ -261 +262 @@
                 Browser.main(args);
                 
-                if (!Boolean.getBoolean("auth")) {
+                if (!AuthenticatorBrowser.isAuthenticationRequired()) {
                         // If not running with authentication/login, then proceed with initializing Apollo
                         EcosystemManager.getMiscManager().runOnGIOThread(new BlockingRunnable() {

trunk/src/org/apollo/io/AudioPathManager.java

@@ -45 +45 @@
         public static void changeParentAndSubFolders(String newFolder) {
                 
-                if (Boolean.getBoolean("auth") && System.getProperty("user.name").equals(AuthenticatorBrowser.USER_NOBODY)) {
+                if (AuthenticatorBrowser.isAuthenticationRequired() && System.getProperty("user.name").equals(AuthenticatorBrowser.USER_NOBODY)) {
                         System.err.println("**** AudioPathManager::changeParentAndSubFolder(): Nothing to do for user '" + AuthenticatorBrowser.USER_NOBODY + "'");
                         return;
@@ -54 +54 @@
                         String userName = UserSettings.UserName.get();
                         //String resourcesPrivateIndividualPath = FrameIO.PARENT_FOLDER + "resources-" + userName + File.separator;
-                        if (Boolean.getBoolean("auth")) {
+                        if (AuthenticatorBrowser.isAuthenticationRequired()) {
                                 System.err.println("**** AudioPathManager::changeParentAndSubFolder(): Setting 'audio' folder to resources-" + userName);
                         }

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

@@ -163 +163 @@
          */
         public static void main(String[] args) {
-                if (Boolean.getBoolean("expeditee.authentication")) {
+                if (AuthenticatorBrowser.isAuthenticationRequired()) {
                         String starting_user_name = System.getProperty("user.name");
                         System.setProperty("startinguser.name", starting_user_name);
@@ -201 +201 @@
         
         public static void init() {
-                if (Boolean.getBoolean("expeditee.authentication")) {
+                if (AuthenticatorBrowser.isAuthenticationRequired()) {
                         try {
                                 _theBrowser = AuthenticatorBrowser.getInstance();
@@ -272 +272 @@
                 Frame userProfile = loadProfiles();
 
-                if (!Boolean.getBoolean("expeditee.authentication")) {
+                if (!AuthenticatorBrowser.isAuthenticationRequired()) {
                         String userName = UserSettings.ProfileName.get();
                         FrameIO.setupPersonalResources(userName);