From 7174eb356eb996ea3273a597053bdac14afe9939 Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Wed, 10 Mar 2010 22:52:48 +0100 Subject: [PATCH] Don't show conversation name at top if ServerInfo view is selected --- src/org/yaaic/view/ServerActivity.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/org/yaaic/view/ServerActivity.java b/src/org/yaaic/view/ServerActivity.java index 6b423c5..bb9a197 100644 --- a/src/org/yaaic/view/ServerActivity.java +++ b/src/org/yaaic/view/ServerActivity.java @@ -349,15 +349,18 @@ public class ServerActivity extends Activity implements ServiceConnection, Chann public void onItemSelected(AdapterView deck, View view, int position, long id) { Conversation conversation = (Conversation) deck.getItemAtPosition(position); - if (conversation != null) { + + if (conversation != null && conversation.getType() != Conversation.TYPE_SERVER) { ((TextView) findViewById(R.id.title)).setText(server.getTitle() + " - " + conversation.getName()); + } else { + onNothingSelected(deck); } } /** * On no channel selected/focused */ - public void onNothingSelected(AdapterView arg0) + public void onNothingSelected(AdapterView deck) { ((TextView) findViewById(R.id.title)).setText(server.getTitle()); }