Changeset 1540 for trunk/src/org/expeditee/auth/account/Create.java

Timestamp:

11/02/20 15:47:20 (4 years ago)

Author:

bnemhaus

Message:

Removed reliance of System.getProperty("user.name") by introducing some functions and a variable to Browser to be used instead. All previous occurrences of System.getProperty("user.name") now use these functions.

At the time, introduced new piping into various functions related to the creation and management of profile frames that distinguished between a profile name and a user name. This allows functions to be more specific about what is being used. For example, when modifying the users profile frames (in the profiles directory) that users profile name can be used instead of naming the variable 'username'. This distinction is important because while username's can end with numbers, profile names cannot and therefore get an 'A' on the end.

File:

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

trunk/src/org/expeditee/auth/account/Create.java

@@ -31 +31 @@
 import org.expeditee.core.Colour;
 import org.expeditee.encryption.CryptographyConstants;
+import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
@@ -86 +87 @@
                 // Update in memory settings
                 ProfileManager.ensureDefaultProfile();
-                System.setProperty("user.name", username);
+                Browser.setExpediteeUserName(username);
                 UserSettings.UserName.set(username);
                 //UserSettings.ProfileName.set(username);
-                UserSettings.ProfileName.set(FrameIO.ConvertToValidFramesetName(username));
+                final String profileName = FrameIO.ConvertToValidFramesetName(username);
+                UserSettings.ProfileName.set(profileName);
                 UserSettings.setupDefaultFolders();
                                 
                 Frame profile;
                 try {
-                        profile = createNewProfile(username, email, personalKey, privateKey, publicKey);
+                        profile = createNewProfile(username, profileName, email, personalKey, privateKey, publicKey);
                 } catch (InvalidFramesetNameException | ExistingFramesetException e) {
                         return CreateResult.ErrorNewProfile;
@@ -201 +203 @@
         }
 
-        private static Frame createNewProfile(String username, String email, String personalKey, String privateKey,
+        private static Frame createNewProfile(String username, String profileName, String email, String personalKey, String privateKey,
                         String publicKey) throws InvalidFramesetNameException, ExistingFramesetException {
                 // Establish the initial settings for the created user.
@@ -241 +243 @@
                 
                 // Create users profile
-                Frame profile = FrameIO.CreateNewProfile(username, initialSettings, notifiers);
+                Frame profile = FrameIO.CreateNewProfile(username, profileName, initialSettings, notifiers);
                 int lastNumber = FrameIO.getLastNumber(profile.getFramesetName());
                 for (int i = 1; i <= lastNumber; i++) {