# HG changeset patch # User Da Risk # Date 1275258101 -7200 # Node ID 7ca6b25f362455b418b7ccafb0f8ec9209bd6652 # Parent 7e43d4dd295953f6d140fd439b038b931a08bda1# Parent 22969380eb13c2bd969ba508cc4a5e7ca508ffe3 merge diff -r 22969380eb13 -r 7ca6b25f3624 src/com/beem/project/beem/ui/ContactList.java --- a/src/com/beem/project/beem/ui/ContactList.java Mon May 31 00:17:26 2010 +0200 +++ b/src/com/beem/project/beem/ui/ContactList.java Mon May 31 00:21:41 2010 +0200 @@ -106,7 +106,6 @@ SERVICE_INTENT.setComponent(new ComponentName("com.beem.project.beem", "com.beem.project.beem.BeemService")); } - private static final int REQUEST_CODE = 1; private static final String SETTINGS_HIDDEN_CONTACT = "settings_key_hidden_contact"; private static final String TAG = "ContactList"; private final BeemContactList mAdapterContactList = new BeemContactList(); @@ -123,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; @@ -153,7 +152,7 @@ public final boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.contact_list_menu_settings: - startActivityForResult(new Intent(this, Settings.class), REQUEST_CODE); + startActivity(new Intent(this, Settings.class)); return true; case R.id.contact_list_menu_add_contact: startActivity(new Intent(ContactList.this, AddContact.class)); @@ -178,11 +177,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()); } /** @@ -192,24 +191,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(); @@ -217,22 +216,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; @@ -240,7 +239,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; @@ -253,22 +252,6 @@ return super.onContextItemSelected(item); } - /* - * (non-Javadoc) - * @see android.app.Activity#onActivityResult(int, int, android.content.Intent) - */ - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (requestCode == REQUEST_CODE) { - if (resultCode == RESULT_OK) { - mListContact.clear(); - stopService(SERVICE_INTENT); - finish(); - } - } - } - /** * {@inheritDoc} */ diff -r 22969380eb13 -r 7ca6b25f3624 src/com/beem/project/beem/ui/Settings.java --- a/src/com/beem/project/beem/ui/Settings.java Mon May 31 00:17:26 2010 +0200 +++ b/src/com/beem/project/beem/ui/Settings.java Mon May 31 00:21:41 2010 +0200 @@ -63,7 +63,6 @@ public class Settings extends PreferenceActivity { private static final Intent SERVICE_INTENT = new Intent(); - private SettingsBroadcastReceiver mReceiver; static { SERVICE_INTENT.setComponent(new ComponentName("com.beem.project.beem", "com.beem.project.beem.BeemService")); @@ -75,32 +74,10 @@ public Settings() { } - /* (non-Javadoc) - * @see android.preference.PreferenceActivity#onCreate(android.os.Bundle) - */ @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); addPreferencesFromResource(R.layout.preferences); - mReceiver = new SettingsBroadcastReceiver(); - } - - /** - * {@inheritDoc} - */ - @Override - protected void onPause() { - super.onPause(); - this.unregisterReceiver(mReceiver); - } - - /** - * {@inheritDoc} - */ - @Override - public void onResume() { - super.onResume(); - this.registerReceiver(mReceiver, new IntentFilter(BeemBroadcastReceiver.BEEM_CONNECTION_CLOSED)); } /** @@ -132,20 +109,4 @@ return false; } } - - /** - * disconnect Broadcast receiver. - */ - private class SettingsBroadcastReceiver extends BroadcastReceiver { - /** - * Constructor. - */ - public SettingsBroadcastReceiver() { - } - - @Override - public void onReceive(Context context, Intent intent) { - Settings.this.setResult(RESULT_CANCELED); - } - } }