Skip to content

Commit b5c3de3

Browse files
committed
Simplified checks for login status isSuccess
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
1 parent e4fe9e6 commit b5c3de3

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

client/src/com/mirth/connect/client/ui/LoginPanel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ public Void doInBackground() {
451451
}
452452

453453
// If SUCCESS or SUCCESS_GRACE_PERIOD
454-
if ((loginStatus != null) && ((loginStatus.getStatus() == LoginStatus.Status.SUCCESS) || (loginStatus.getStatus() == LoginStatus.Status.SUCCESS_GRACE_PERIOD))) {
454+
if (loginStatus != null && loginStatus.isSuccess()) {
455455
if (!handleSuccess(loginStatus)) {
456456
LoginPanel.getInstance().setVisible(false);
457457
LoginPanel.getInstance().initialize(PlatformUI.SERVER_URL, PlatformUI.CLIENT_VERSION, "", "");
@@ -469,7 +469,7 @@ public Void doInBackground() {
469469

470470
loginStatus = plugin.authenticate(LoginPanel.this, client, updatedUsername, loginStatus);
471471

472-
if ((loginStatus != null) && ((loginStatus.getStatus() == LoginStatus.Status.SUCCESS) || (loginStatus.getStatus() == LoginStatus.Status.SUCCESS_GRACE_PERIOD))) {
472+
if (loginStatus != null && loginStatus.isSuccess()) {
473473
errorOccurred = false;
474474
if (!handleSuccess(loginStatus)) {
475475
LoginPanel.getInstance().setVisible(false);

server/src/com/mirth/connect/model/LoginStatus.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,8 @@ public String getMessage() {
4343
public String getUpdatedUsername() {
4444
return updatedUsername;
4545
}
46+
47+
public boolean isSuccess() {
48+
return status == Status.SUCCESS || status == Status.SUCCESS_GRACE_PERIOD;
49+
}
4650
}

0 commit comments

Comments
 (0)