Do not show user name and surname if they're null or empty

80d988db · Valentina Kiryushkina · 3e93150f · 80d988db
Commit 80d988db authored 8 years ago by Valentina Kiryushkina
Hide whitespace changes
Inline Side-by-side

Showing

with 9 additions and 1 deletion
+9 -1
--- a/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyStepicUserWidget.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyStepicUserWidget.java
@@ -96,7 +96,15 @@ public class StudyStepicUserWidget implements IconLikeCustomStatusBarWidget {
        createUserPanel("You're not logged in", "Authorize on Stepik", createAuthorizeUserListener());
      }
      else {
-        String statusText = "<html>You're logged in as <i>" + user.getFirstName() + " " + user.getLastName() + "</i></html>";
+        String firstName = user.getFirstName();
+        String lastName = user.getLastName();
+        String statusText;
+        if (firstName == null || lastName == null || firstName.isEmpty() || lastName.isEmpty()) {
+          statusText = "You're logged in";
+        }
+        else {
+          statusText = "<html>You're logged in as <i>" + firstName + " " + lastName + "</i></html>";
+        }
        createUserPanel(statusText, "Log out", createLogoutListener());
      }
    }