--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Fri Jun 19 12:03:44 2009 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Mon Jun 22 13:54:32 2009 +0200
@@ -24,14 +24,12 @@
 
 /**
  * This class implements an adapter for XMPPConnection.
- * 
  * @author darisk
  */
 public class XmppConnectionAdapter extends IXmppConnection.Stub {
 
     /**
      * Listener for XMPP connection events. It will calls the remote listeners for connexion events.
-     * 
      * @author darisk
      */
     private class ConnexionListenerAdapter implements ConnectionListener {
@@ -182,60 +180,48 @@
 	}
     }
 
-    private static final String                         TAG                  = "XMPPConnectionAdapter";
-    private XMPPConnection                              mAdaptee;
-    private IChatManager                                mChatManager;
-    private String                                      mLogin;
-    private String                                      mPassword;
-    private RosterAdapter                               mRoster;
+    private static final String TAG = "XMPPConnectionAdapter";
+    private XMPPConnection mAdaptee;
+    private IChatManager mChatManager;
+    private String mLogin;
+    private String mPassword;
+    private RosterAdapter mRoster;
 
-    private BeemService                                 mService;
+    private BeemService mService;
     private RemoteCallbackList<IBeemConnectionListener> mRemoteConnListeners = new RemoteCallbackList<IBeemConnectionListener>();
 
-    private ConnexionListenerAdapter                    mConListener         = new ConnexionListenerAdapter();
+    private ConnexionListenerAdapter mConListener = new ConnexionListenerAdapter();
 
     /**
      * Constructor.
-     * 
-     * @param config
-     *            Configuration to use in order to connect
-     * @param login
-     *            login to use on connect
-     * @param password
-     *            password to use on connect
+     * @param config Configuration to use in order to connect
+     * @param login login to use on connect
+     * @param password password to use on connect
      */
     public XmppConnectionAdapter(final ConnectionConfiguration config, final String login, final String password,
-	    BeemService service) {
+	BeemService service) {
 	this(new XMPPConnection(config), login, password, service);
     }
 
     /**
      * Constructor.
-     * 
-     * @param serviceName
-     *            name of the service to connect to
-     * @param login
-     *            login to use on connect
-     * @param password
-     *            password to use on connect
+     * @param serviceName name of the service to connect to
+     * @param login login to use on connect
+     * @param password password to use on connect
      */
     public XmppConnectionAdapter(final String serviceName, final String login, final String password,
-	    BeemService service) {
+	BeemService service) {
 	this(new XMPPConnection(serviceName), login, password, service);
     }
 
     /**
      * Constructor.
-     * 
-     * @param con
-     *            The connection to adapt
-     * @param login
-     *            The login to use
-     * @param password
-     *            The password to use
+     * @param con The connection to adapt
+     * @param login The login to use
+     * @param password The password to use
      */
     public XmppConnectionAdapter(final XMPPConnection con, final String login, final String password,
-	    BeemService service) {
+	BeemService service) {
 	mAdaptee = con;
 	mLogin = login;
 	mPassword = password;
@@ -288,10 +274,7 @@
 	    return true;
 	} catch (XMPPException e) {
 	    Log.e(TAG, "Error while connecting", e);
-	    if (e.getXMPPError() != null)
-		mConListener.connectionFailed(e.getXMPPError().getMessage()); //
-	    else
-		mConListener.connectionFailed("Error On Connection");
+	    mConListener.connectionFailed("Error On Connection");
 	}
 	return false;
     }
@@ -350,7 +333,6 @@
 
     /**
      * Returns true if currently authenticated by successfully calling the login method.
-     * 
      * @return true when successfully authenticated
      */
     public boolean isAuthentificated() {

--- a/src/com/beem/project/beem/ui/Login.java	Fri Jun 19 12:03:44 2009 +0200
+++ b/src/com/beem/project/beem/ui/Login.java	Mon Jun 22 13:54:32 2009 +0200
@@ -15,6 +15,7 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+import android.widget.Toast;
 
 import com.beem.project.beem.R;
 import com.beem.project.beem.service.aidl.IBeemConnectionListener;
@@ -140,6 +141,16 @@
 	    Login.this.unbindService(mServConn);
 	    Login.this.stopService(SERVICE_INTENT);
 	    dismissProgressDialog();
+	    showToast(errorMsg);
+	}
+	
+	private void showToast(final String errorMsg) {
+	    connectionHandler.post(new Runnable() {
+		@Override
+		public void run() {
+		    Toast.makeText(Login.this, errorMsg, Toast.LENGTH_SHORT).show();		    
+		}
+	    });
 	}
 
 	private void dismissProgressDialog() {
@@ -192,7 +203,7 @@
 
 			@Override
 			public void run() {
-			    progressDialog.setMessage("Loading. Please wait...");
+			    progressDialog.setMessage("Connecting. Please wait...");
 			    progressDialog.show();
 			}
 		    });