aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorChristian S <kriztan@users.noreply.github.com>2015-07-27 09:33:56 +0200
committerChristian S <christian@pix-art.de>2015-07-28 20:57:05 +0200
commit35293d6293357736e9aafc75d385aca69a74a635 (patch)
tree30bbf8e676e5e558e8263a093233855da37068d3 /src/main/java
parent32127fe96b8cd20310ea5fa9bb8d2c6a887c2956 (diff)
added missing chatstate hints
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 4ace44e68..5e05c1138 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -335,7 +335,9 @@ public class ConversationActivity extends XmppActivity
ab.setSubtitle(getString(R.string.contact_is_typing, conversation.getName()));
} else if (state == ChatState.PAUSED) {
ab.setSubtitle(null);
- }
+ } else {
+ ab.setSubtitle(null);
+ }
} else if (useSubjectToIdentifyConference()){
ab.setSubtitle(conversation.getParticipants());
}
@@ -346,7 +348,7 @@ public class ConversationActivity extends XmppActivity
} else {
ab.setDisplayHomeAsUpEnabled(false);
ab.setHomeButtonEnabled(false);
- ab.setTitle(R.string.app_name);
+ ab.setTitle(R.string.app_name);
ab.setSubtitle(null);
}
}