moparisthebest
/
Yaaic
mirror of https://github.com/moparisthebest/Yaaic
1
0
Fork 0
Code Issues Releases Wiki Activity

ConversationActivity: Launch UserActivity on user selection

This commit is contained in:
Sebastian Kaspari 2010-04-25 19:32:26 +02:00
parent 7ca3fa0f2a
commit b6c8d96b42
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/org/yaaic/activity/ConversationActivity.java
View File

@ -79,6 +79,10 @@ import org.yaaic.view.MessageListView;
*/ */
public class ConversationActivity extends Activity implements ServiceConnection, ServerListener, ConversationListener, OnItemClickListener, OnKeyListener, OnItemSelectedListener public class ConversationActivity extends Activity implements ServiceConnection, ServerListener, ConversationListener, OnItemClickListener, OnKeyListener, OnItemSelectedListener
{ {
private static final int REQUEST_CODE_JOIN = 1;
private static final int REQUEST_CODE_USERS = 2;
private static final int REQUEST_CODE_USER = 3;
private int serverId; private int serverId;
private Server server; private Server server;
private IRCBinder binder; private IRCBinder binder;
@ -127,7 +131,6 @@ public class ConversationActivity extends Activity implements ServiceConnection,
deckAdapter.clearConversations(); deckAdapter.clearConversations();
} }
switcher = (ViewSwitcher) findViewById(R.id.switcher); switcher = (ViewSwitcher) findViewById(R.id.switcher);
// Optimization : cache field lookups // Optimization : cache field lookups
@ -299,7 +302,7 @@ public class ConversationActivity extends Activity implements ServiceConnection,
} }
break; break;
case R.id.join: case R.id.join:
startActivityForResult(new Intent(this, JoinActivity.class), 0); startActivityForResult(new Intent(this, JoinActivity.class), REQUEST_CODE_JOIN);
break; break;
case R.id.users: case R.id.users:
Conversation conversationForUserList = deckAdapter.getItem(deck.getSelectedItemPosition()); Conversation conversationForUserList = deckAdapter.getItem(deck.getSelectedItemPosition());
@ -311,7 +314,7 @@ public class ConversationActivity extends Activity implements ServiceConnection,
conversationForUserList.getName() conversationForUserList.getName()
) )
); );
startActivity(intent); startActivityForResult(intent, REQUEST_CODE_USERS);
} else { } else {
Toast.makeText(this, "Only usable from within a channel", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "Only usable from within a channel", Toast.LENGTH_SHORT).show();
} }
@ -530,9 +533,24 @@ public class ConversationActivity extends Activity implements ServiceConnection,
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) protected void onActivityResult(int requestCode, int resultCode, Intent data)
{ {
if (resultCode != RESULT_OK) {
// ignore other result codes
return;
}
// currently there's only the "join channel" activity // currently there's only the "join channel" activity
if (resultCode == RESULT_OK) { switch (requestCode) {
joinChannelBuffer = data.getExtras().getString("channel"); case REQUEST_CODE_JOIN:
joinChannelBuffer = data.getExtras().getString("channel");
break;
case REQUEST_CODE_USERS:
Intent intent = new Intent(this, UserActivity.class);
intent.putExtra(Extra.USER, data.getStringExtra(Extra.USER));
startActivityForResult(intent, REQUEST_CODE_USER);
break;
case REQUEST_CODE_USER:
break;
} }
} }