From 7013dca5bb5801db00634a8950d52951aae46071 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 31 Aug 2018 12:36:45 +0200
Subject: [PATCH] Fix showing username in title. Fixes #1041

---
 .../habitrpg/android/habitica/ui/activities/MainActivity.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
index 50ee07b02..22d237a91 100755
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
@@ -477,10 +477,10 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         if (supportActionBar == null) {
             return
         }
-        if (fragment?.customTitle() != null) {
-            toolbarTitleTextView.text = fragment.customTitle()
-        } else if (user?.profile != null) {
+        if (fragment?.customTitle()?.isNotEmpty() != true) {
             toolbarTitleTextView.text = user?.profile?.name
+        } else if (user?.profile != null) {
+            toolbarTitleTextView.text = fragment.customTitle()
         }
     }