--- a/src/com/beem/project/beem/ui/ContactList.java	Wed May 19 20:10:41 2010 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Wed May 26 20:26:46 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();
@@ -152,7 +151,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));
@@ -252,22 +251,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}
      */

--- a/src/com/beem/project/beem/ui/Settings.java	Wed May 19 20:10:41 2010 +0200
+++ b/src/com/beem/project/beem/ui/Settings.java	Wed May 26 20:26:46 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);
-	}
-    }
 }