Changeset 1373 for trunk

Timestamp:

05/23/19 16:42:20 (5 years ago)

Author:

bln4

Message:

 

File:

• trunk/src/org/expeditee/auth/Actions.java (modified) (2 diffs)

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

@@ -222 +222 @@
                         Map<AuthenticationTag, String> userData = userdata.get();
                         String colleagueOne = userData.get(AuthenticationTag.TrustedUserOne);
-                        Path colleagueOnePath = Paths.get(FrameIO.CONTACTS_PATH).resolve(colleagueOne + "-credentials");
                         String colleagueTwo = userData.get(AuthenticationTag.TrustedUserTwo);
-                        Path colleagueTwoPath = Paths.get(FrameIO.CONTACTS_PATH).resolve(colleagueTwo + "-credentials");
-                        if (!colleagueOnePath.toFile().exists()) {
-                                MessageBay.errorMessage("Your nominated trusted user: " + colleagueOne + " must exist in your contacts.");
-                        } else if (!colleagueTwoPath.toFile().exists()) {
-                                MessageBay.errorMessage("Your nominated trusted user: " + colleagueTwo + " must exist in your contacts.");
-                        } else {
-                                userData.put(AuthenticationTag.Username, UserSettings.UserName.get());
-                                boolean success = submitTrustedUsersPasswordRecovery(userData);
-                                if (success) {
-                                        Collection<Item> toShow = getByData(currentFrame, "ShowOnProgress");
-                                        for (Item i: toShow) {
-                                                i.setVisible(true);
-                                        }
-                                        currentFrame.change();
-                                        MessageBay.displayMessage("-------Messages sent-------");
-                                }
-                                FrameIO.SaveFrame(currentFrame);
-                                DisplayController.requestRefresh(false);
-                        }
+                        AuthSubmitTrustedUsersPasswordRecovery(colleagueOne, colleagueTwo);
+//                      Path colleagueOnePath = Paths.get(FrameIO.CONTACTS_PATH).resolve(colleagueOne + "-credentials");
+//                      Path colleagueTwoPath = Paths.get(FrameIO.CONTACTS_PATH).resolve(colleagueTwo + "-credentials");
+//                      if (!colleagueOnePath.toFile().exists()) {
+//                              MessageBay.errorMessage("Your nominated trusted user: " + colleagueOne + " must exist in your contacts.");
+//                      } else if (!colleagueTwoPath.toFile().exists()) {
+//                              MessageBay.errorMessage("Your nominated trusted user: " + colleagueTwo + " must exist in your contacts.");
+//                      } else {
+//                              userData.put(AuthenticationTag.Username, UserSettings.UserName.get());
+//                              boolean success = submitTrustedUsersPasswordRecovery(userData);
+//                              if (success) {
+//                                      Collection<Item> toShow = getByData(currentFrame, "ShowOnProgress");
+//                                      for (Item i: toShow) {
+//                                              i.setVisible(true);
+//                                      }
+//                                      currentFrame.change();
+//                                      MessageBay.displayMessage("-------Messages sent-------");
+//                              }
+//                              FrameIO.SaveFrame(currentFrame);
+//                              DisplayController.requestRefresh(false);
+//                      }
                 }
         }
@@ -253 +254 @@
          * @param colleagueTwo
          */
-        public static void AuthSetPWColleagues(String colleagueOne, String colleagueTwo) {
+        public static void AuthSubmitTrustedUsersPasswordRecovery(String colleagueOne, String colleagueTwo) {
                 Password.setPWColleagues(colleagueOne, colleagueTwo);
         }