# HG changeset patch # User Da Risk # Date 1274899044 -7200 # Node ID 7e43d4dd295953f6d140fd439b038b931a08bda1 # Parent 6af573badc5d11288a217f06c49766ba67fb7b4c Improve readability of ContactList source code diff -r 6af573badc5d -r 7e43d4dd2959 src/com/beem/project/beem/ui/ContactList.java --- a/src/com/beem/project/beem/ui/ContactList.java Wed May 26 20:26:46 2010 +0200 +++ b/src/com/beem/project/beem/ui/ContactList.java Wed May 26 20:37:24 2010 +0200 @@ -122,7 +122,7 @@ private List mListContact; private IRoster mRoster; private String mCurGroup; - private Contact mContact; + private Contact mSelectedContact; private IXmppFacade mXmppFacade; private SharedPreferences mSettings; private LayoutInflater mInflater; @@ -176,11 +176,11 @@ AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo; Contact c = mListContact.get(info.position); try { - mContact = mRoster.getContact(c.getJID()); + mSelectedContact = mRoster.getContact(c.getJID()); } catch (RemoteException e) { e.printStackTrace(); } - menu.setHeaderTitle(mContact.getJID()); + menu.setHeaderTitle(mSelectedContact.getJID()); } /** @@ -190,24 +190,24 @@ public boolean onContextItemSelected(MenuItem item) { Intent in; boolean result; - if (mContact != null) { + if (mSelectedContact != null) { switch (item.getItemId()) { case R.id.contact_list_context_menu_chat_item: - List res = mContact.getMRes(); + List res = mSelectedContact.getMRes(); if (res.isEmpty()) { result = false; break; } for (String resv : res) { in = new Intent(this, Chat.class); - in.setData(mContact.toUri(resv)); + in.setData(mSelectedContact.toUri(resv)); item.getSubMenu().add(resv).setIntent(in); } result = true; break; case R.id.contact_list_context_menu_call_item: try { - mXmppFacade.call(mContact.getJID() + "/psi"); + mXmppFacade.call(mSelectedContact.getJID() + "/psi"); result = true; } catch (RemoteException e) { e.printStackTrace(); @@ -215,22 +215,22 @@ result = true; break; case R.id.contact_list_context_menu_user_info: - item.getSubMenu().setHeaderTitle(mContact.getJID()); + item.getSubMenu().setHeaderTitle(mSelectedContact.getJID()); result = true; break; case R.id.contact_list_context_menu_userinfo_alias: - Dialog alias = new Alias(ContactList.this, mRoster, mContact).create(); + Dialog alias = new Alias(ContactList.this, mRoster, mSelectedContact).create(); alias.show(); result = true; break; case R.id.contact_list_context_menu_userinfo_group: in = new Intent(this, GroupList.class); - in.putExtra("contact", mContact); + in.putExtra("contact", mSelectedContact); startActivity(in); result = true; break; case R.id.contact_list_context_menu_userinfo_subscription: - Dialog subscription = new ResendSubscription(ContactList.this, mXmppFacade, mContact).create(); + Dialog subscription = new ResendSubscription(ContactList.this, mXmppFacade, mSelectedContact).create(); subscription.show(); result = true; break; @@ -238,7 +238,7 @@ result = true; break; case R.id.contact_list_context_menu_userinfo_delete: - Dialog delete = new DeleteContact(ContactList.this, mRoster, mContact).create(); + Dialog delete = new DeleteContact(ContactList.this, mRoster, mSelectedContact).create(); delete.show(); result = true; break;