From c87241da65afa0b0c6dd4d321c13e9f040868bfa Mon Sep 17 00:00:00 2001 From: Caesar2011 Date: Fri, 15 Feb 2019 23:12:14 +0100 Subject: [PATCH] Name in Navigation Header --- app/src/main/java/de/sebse/fuplanner/MainActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java index c8540bd..0c0ea91 100644 --- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java +++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java @@ -798,8 +798,8 @@ public class MainActivity extends AppCompatActivity } String email = ""; - if (tokenKVV != null && !TextUtils.isEmpty(tokenKVV.getEmail())) { - email = tokenKVV.getFullName(); + if (tokenKVV != null && !TextUtils.isEmpty(tokenKVV.getEmail()) && !"null".equals(tokenKVV.getEmail())) { + email = tokenKVV.getEmail(); } else if (tokenBB != null && !TextUtils.isEmpty(tokenBB.getUsername())) { email = tokenBB.getUsername() + "@zedat.fu-berlin.de"; }