--- a/src/com/beem/project/beem/ui/ContactDialog.java	Thu Oct 08 14:42:58 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactDialog.java	Thu Oct 08 15:00:12 2009 +0200
@@ -27,7 +27,7 @@
     private final Context mContext;
     private IXmppFacade mXmppFacade;
     private final ServiceConnection mServConn = new BeemServiceConnection();
-    
+
     static {
 	SERVICE_INTENT.setComponent(new ComponentName("com.beem.project.beem", "com.beem.project.beem.BeemService"));
     }
@@ -58,7 +58,7 @@
     public void dismiss() {
 	super.dismiss();
 	mContext.unbindService(mServConn);
-    }    
+    }
 
     /**
      * Event simple click on call button.
@@ -119,7 +119,7 @@
 	public void onClick(View v) {
 	    Activity a = ContactDialog.this.getOwnerActivity();
 	    Intent i = new Intent(mContext, UserInfo.class);
-	    i.putExtra("contact", mContact.getJID());
+	    i.putExtra("contact_contactdialog", mContact.getJID());
 	    a.startActivity(i);
 	    dismiss();
 	}

--- a/src/com/beem/project/beem/ui/GroupList.java	Thu Oct 08 14:42:58 2009 +0200
+++ b/src/com/beem/project/beem/ui/GroupList.java	Thu Oct 08 15:00:12 2009 +0200
@@ -125,8 +125,17 @@
 	}
     }
 
+    /**
+     * Event when group is added.
+     */
     private class GroupListOnKeyListener implements OnKeyListener {
 
+	/**
+	 * Constructor.
+	 */
+	public GroupListOnKeyListener() {
+	}
+
 	@Override
 	public boolean onKey(View v, int keyCode, KeyEvent event) {
 	    if (event.getAction() == KeyEvent.ACTION_DOWN) {
@@ -148,11 +157,19 @@
 
     }
 
+    /**
+     * Event click on list group contact.
+     */
     private class GroupOnItemClickListener implements OnItemClickListener {
 
+	/**
+	 * Constructor.
+	 */
+	public GroupOnItemClickListener() {
+	}
+
 	@Override
 	public void onItemClick(AdapterView<?> arg0, View v, int arg2, long arg3) {
-	    Log.d("GROUPLIST", "CLICK");
 	    CheckedTextView textView = (CheckedTextView) v;
 	    if (!textView.isChecked()) {
 		try {

--- a/src/com/beem/project/beem/ui/UserInfo.java	Thu Oct 08 14:42:58 2009 +0200
+++ b/src/com/beem/project/beem/ui/UserInfo.java	Thu Oct 08 15:00:12 2009 +0200
@@ -203,7 +203,7 @@
 	public BeemGroups(final Context c, final List<String> listGroup) {
 	    mContext = c;
 	    if (listGroup.size() == 0)
-		listGroup.add("No Group");
+		listGroup.add(getString(R.string.contact_list_no_group));
 	    mListGroup = listGroup;
 	}
 
@@ -338,7 +338,7 @@
 	    mXmppFacade = IXmppFacade.Stub.asInterface(service);
 	    try {
 		mRoster = mXmppFacade.getRoster();
-		mJID = getIntent().getStringExtra("contact");
+		mJID = getIntent().getStringExtra("contact_contactdialog");
 		mContact = mRoster.getContact(mJID);
 		mTextAlias.setText(mContact.getName());
 		mGalleryGroups.setAdapter(new BeemGroups(UserInfo.this, mContact.getGroups()));