# HG changeset patch
# User Jean-Manuel Da Silva <dasilvj@gmail.com>
# Date 1257989163 -3600
# Node ID 8e33a89c21a3d2972932154c79700a4d1130bb25
# Parent  62f0963930339d6b5b7937fc72112beaabd70d27
Homogeneisation de l'UI et correction de certains bugs d'affichage

diff -r 62f096393033 -r 8e33a89c21a3 res/layout/addcontact.xml
--- a/res/layout/addcontact.xml	Wed Nov 11 19:54:25 2009 +0100
+++ b/res/layout/addcontact.xml	Thu Nov 12 02:26:03 2009 +0100
@@ -1,39 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-	<TableRow>
-		<TextView android:text="@string/AddCLogin"
-			android:gravity="left" android:padding="3dip" 
-			/>
-		<EditText android:id="@+id/addc_login" android:inputType="textEmailAddress" android:imeOptions="actionNext"
-			android:scrollHorizontally="true" android:layout_width="fill_parent"
-			android:layout_weight="1" android:layout_margin="3dip"
-			 />
-	</TableRow>
-	<TableRow>
-		<TextView android:text="@string/AddCAlias"
-			android:gravity="left" android:padding="3dip" />
-		<EditText android:id="@+id/addc_alias" android:inputType="text" android:imeOptions="actionNext"
-
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" android:layout_height="fill_parent"
+	android:orientation="vertical">
+	<LinearLayout android:layout_width="fill_parent"
+		android:layout_height="fill_parent" android:orientation="vertical"
+		android:padding="10dip">
+		<TextView android:layout_width="fill_parent"
+			android:layout_height="wrap_content" android:text="@string/AddCLogin"
+			style="@style/Label" />
+		<EditText android:id="@+id/addc_login" android:inputType="textEmailAddress"
+			android:imeOptions="actionNext" android:scrollHorizontally="true"
+			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:layout_margin="3dip" />
+		<TextView android:layout_width="fill_parent"
+			android:layout_height="wrap_content" android:text="@string/AddCAlias"
+			style="@style/Label" />
+		<EditText android:id="@+id/addc_alias" android:inputType="text"
+			android:imeOptions="actionNext" android:textSize="16sp"
+			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:scrollHorizontally="true" android:layout_margin="3dip" />
+		<TextView android:layout_width="fill_parent"
+			android:layout_height="wrap_content" android:text="@string/AddCGroup"
+			style="@style/Label" />
+		<EditText android:id="@+id/addc_group" android:inputType="text"
 			android:textSize="16sp" android:layout_width="fill_parent"
-			android:scrollHorizontally="true"
-			android:layout_weight="1" android:layout_margin="3dip"
-			/>
-	</TableRow>
-	<TableRow>
-		<TextView android:text="@string/AddCGroup"
-			android:minWidth="70dp" android:gravity="left" android:padding="3dip"
-			/>
-		<EditText android:id="@+id/addc_group"  android:inputType="text"
-			android:textSize="16sp" android:layout_width="fill_parent"
-			android:scrollHorizontally="true" 
-			android:layout_weight="1" android:layout_margin="3dip"
-			/>
-	</TableRow>
-	<Button android:id="@+id/addc_ok" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:layout_gravity="center_horizontal"
-		android:text="@string/AddCOkButton">
-		<requestFocus />
-	</Button>
-</TableLayout>
+			android:scrollHorizontally="true" android:layout_height="wrap_content"
+			android:layout_margin="3dip" />
+		<View android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:layout_weight="1" android:layout_marginBottom="18dp" />
+		<Button android:id="@+id/addc_ok" android:layout_width="fill_parent"
+			android:layout_height="wrap_content" android:textStyle="bold"
+			android:text="@string/AddCOkButton" android:layout_gravity="bottom"
+			android:textSize="18sp" android:textColor="#333333" />
+	</LinearLayout>
+</ScrollView>
diff -r 62f096393033 -r 8e33a89c21a3 res/layout/changestatus.xml
--- a/res/layout/changestatus.xml	Wed Nov 11 19:54:25 2009 +0100
+++ b/res/layout/changestatus.xml	Thu Nov 12 02:26:03 2009 +0100
@@ -1,30 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent" android:padding="6px">
-
-	<Spinner android:id="@+id/ChangeStatusSpinner"
-		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		android:drawSelectorOnTop="true" />
-
-	<TextView android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:text="@string/ChangeStatusText"
-		android:textColor="@color/blue_sky" />
-
-	<EditText android:id="@+id/ChangeStatusText"
-		android:inputType="textShortMessage|textAutoCorrect"
-		android:imeOptions="actionDone" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" />
-
-	<LinearLayout android:orientation="horizontal"
-		android:layout_width="fill_parent" android:layout_height="wrap_content">
-
-		<Button android:id="@+id/ChangeStatusOk" android:layout_width="fill_parent"
-			android:layout_height="fill_parent" android:layout_weight="1"
-			android:text="@string/OkButton" />
-
-		<Button android:id="@+id/ChangeStatusClear"
-			android:layout_width="fill_parent" android:layout_height="fill_parent"
-			android:layout_weight="1" android:text="@string/ClearButton" />
-	</LinearLayout>
-</LinearLayout>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" android:layout_height="fill_parent"
+	android:orientation="vertical">
+	<RelativeLayout android:orientation="vertical"
+		android:layout_width="fill_parent" android:layout_height="fill_parent"
+		android:padding="10dip">
+		<TextView android:id="@+id/ChangeStatusTypeLabel"
+			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:text="@string/ChangeStatusType" style="@style/Label" />
+		<Spinner android:id="@+id/ChangeStatusSpinner"
+			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:drawSelectorOnTop="true" android:layout_below="@id/ChangeStatusTypeLabel" />
+		<TextView android:id="@+id/ChangeStatusMessageLabel"
+			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:text="@string/ChangeStatusMessage" style="@style/Label"
+			android:layout_below="@id/ChangeStatusSpinner" />
+		<EditText android:id="@+id/ChangeStatusMessage"
+			android:inputType="textShortMessage|textAutoCorrect"
+			android:imeOptions="actionDone" android:layout_width="fill_parent"
+			android:layout_height="wrap_content" android:layout_below="@id/ChangeStatusMessageLabel"
+			android:layout_marginBottom="18dp" />
+		<LinearLayout android:id="@+id/ChangeStatusButtons"
+			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:orientation="horizontal" android:layout_below="@id/ChangeStatusMessage"
+			android:layout_alignParentBottom="true">
+			<Button android:id="@+id/ChangeStatusOk" android:layout_width="fill_parent"
+				android:layout_height="wrap_content" android:layout_weight="1"
+				android:text="@string/UpdateButton" android:textStyle="bold"
+				android:textSize="18sp" android:textColor="#333333" />
+			<Button android:id="@+id/ChangeStatusClear"
+				android:layout_width="fill_parent" android:layout_height="wrap_content"
+				android:layout_weight="1" android:text="@string/ClearButton"
+				android:textStyle="bold" android:textColor="#333333"
+				android:textSize="18sp" />
+		</LinearLayout>
+	</RelativeLayout>
+</ScrollView>
diff -r 62f096393033 -r 8e33a89c21a3 res/layout/create_account.xml
--- a/res/layout/create_account.xml	Wed Nov 11 19:54:25 2009 +0100
+++ b/res/layout/create_account.xml	Thu Nov 12 02:26:03 2009 +0100
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-	<LinearLayout android:layout_width="fill_parent"
-		android:layout_height="fill_parent" android:orientation="vertical"
+	android:layout_width="fill_parent" android:layout_height="fill_parent"
+	android:orientation="vertical">
+	<LinearLayout android:orientation="vertical"
+		android:layout_width="fill_parent" android:layout_height="fill_parent"
 		android:padding="10dip">
 		<TextView android:id="@+id/create_account_label_username"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
@@ -26,12 +26,17 @@
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:inputType="textPassword" android:imeOptions="actionNext"
 			android:password="true" android:singleLine="true" />
-		<View android:layout_height="21dp" android:layout_width="fill_parent" />
+		<View android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:layout_weight="1" android:layout_marginBottom="18dp" />
 		<Button android:id="@+id/create_account_button"
-			android:layout_width="fill_parent" android:layout_height="fill_parent"
-			android:text="@string/button_create_account" />
+			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:text="@string/button_create_account" android:textStyle="bold"
+			android:textColor="#333333" android:textSize="18sp"
+			android:layout_gravity="bottom" />
 		<Button android:id="@+id/create_account_login_button"
-			android:layout_width="fill_parent" android:layout_height="fill_parent"
-			android:text="@string/button_create_login_account" />
+			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:text="@string/button_create_login_account" android:textStyle="bold"
+			android:textColor="#333333" android:textSize="18sp"
+			android:layout_gravity="bottom" />
 	</LinearLayout>
 </ScrollView>
diff -r 62f096393033 -r 8e33a89c21a3 res/layout/login.xml
--- a/res/layout/login.xml	Wed Nov 11 19:54:25 2009 +0100
+++ b/res/layout/login.xml	Thu Nov 12 02:26:03 2009 +0100
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-	
-	<ImageView android:id="@+id/log_as_logo" android:src="@drawable/logo"
-		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		android:layout_marginBottom="25px" android:layout_marginTop="42px" />
-		
-	<TextView android:id="@+id/log_as_msg" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:gravity="center"
-		android:textColor="#FF0000" />
-</LinearLayout>
\ No newline at end of file
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" android:layout_height="fill_parent"
+	android:orientation="vertical">
+	<LinearLayout android:orientation="vertical"
+		android:layout_width="fill_parent" android:layout_height="fill_parent">
+		<ImageView android:id="@+id/log_as_logo" android:src="@drawable/logo"
+			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:layout_marginBottom="25px" android:layout_marginTop="42px" />
+		<TextView android:id="@+id/log_as_msg" android:layout_width="fill_parent"
+			android:layout_height="wrap_content" android:gravity="center"
+			android:textColor="#FF0000" android:textStyle="bold"
+			android:textSize="14sp" />
+	</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff -r 62f096393033 -r 8e33a89c21a3 res/layout/subscription.xml
--- a/res/layout/subscription.xml	Wed Nov 11 19:54:25 2009 +0100
+++ b/res/layout/subscription.xml	Thu Nov 12 02:26:03 2009 +0100
@@ -1,22 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" android:layout_height="fill_parent"
+	android:orientation="vertical">
+	<LinearLayout android:orientation="vertical"
+		android:layout_width="fill_parent" android:layout_height="fill_parent"
+		android:padding="10dip">
+
+		<TextView android:layout_width="wrap_content"
+			android:layout_height="wrap_content" android:autoLink="none"
+			android:id="@+id/SubscriptionTitle" android:text="@string/SubscriptTitle"
+			android:textStyle="bold" android:textColor="@color/white"
+			android:textSize="18sp" android:layout_marginBottom="10dip" />
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-	
-	<TextView android:layout_width="wrap_content" android:layout_height="fill_parent" android:autoLink="none"
-		android:id="@+id/SubscriptionText" android:text="@string/SubscriptText" android:layout_weight="1" />
-	
-	<LinearLayout android:orientation="horizontal"
-		android:layout_width="fill_parent" android:layout_height="wrap_content">
+		<TextView android:layout_width="wrap_content"
+			android:layout_height="fill_parent" android:autoLink="none"
+			android:id="@+id/SubscriptionText" android:text="@string/SubscriptText"
+			android:textColor="@color/white" android:textSize="14sp"
+			android:layout_weight="1" android:layout_marginBottom="18dp" />
+
+		<LinearLayout android:orientation="horizontal"
+			android:layout_width="fill_parent" android:layout_height="wrap_content">
 
-		<Button android:id="@+id/SubscriptionAccept"
-			android:layout_width="fill_parent" android:layout_height="fill_parent"
-			android:layout_weight="1" android:text="@string/AcceptButton" />
+			<Button android:id="@+id/SubscriptionAccept"
+				android:layout_width="fill_parent" android:layout_height="fill_parent"
+				android:layout_weight="1" android:text="@string/AcceptButton" />
 
-		<Button android:id="@+id/SubscriptionRefuse"
-			android:layout_width="fill_parent" android:layout_height="fill_parent"
-			android:layout_weight="1" android:text="@string/RefuseButton" />
+			<Button android:id="@+id/SubscriptionRefuse"
+				android:layout_width="fill_parent" android:layout_height="fill_parent"
+				android:layout_weight="1" android:text="@string/RefuseButton" />
+		</LinearLayout>
 	</LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff -r 62f096393033 -r 8e33a89c21a3 res/values-fr/strings.xml
--- a/res/values-fr/strings.xml	Wed Nov 11 19:54:25 2009 +0100
+++ b/res/values-fr/strings.xml	Thu Nov 12 02:26:03 2009 +0100
@@ -4,7 +4,7 @@
 	<string name="OkButton">Valider</string>
 	<string name="ClearButton">Effacer</string>
 	<string name="CancelButton">Annuler</string>
-	<string name="AcceptButton">Accepter</string>
+	<string name="AcceptButton">Autoriser</string>
 	<string name="RefuseButton">Refuser</string>
 
 	<!--  Beem class -->
@@ -42,10 +42,10 @@
 	<!-- AddContact class -->
 	<string name="AddCActTitle">Beem - Ajouter un contact</string>
 
-	<string name="AddCLogin">Nom d\'utilisateur :</string>
-	<string name="AddCAlias">Alias :</string>
-	<string name="AddCGroup">Groupe :</string>
-	<string name="AddCOkButton">Ok</string>
+	<string name="AddCLogin">Nom d\'utilisateur</string>
+	<string name="AddCAlias">Alias</string>
+	<string name="AddCGroup">Groupe</string>
+	<string name="AddCOkButton">Ajouter</string>
 	<string name="AddCContactAdded">Contact ajouté</string>
 	<string name="AddCContactAddedError">Erreur Contact non ajouté</string>
 	<string name="AddCContactAddedLoginError">Error Nom d\'utilisateur</string>
@@ -67,9 +67,10 @@
 	<string name="SendIMNoStatusSet">Aucun statut défini</string>
 	
 	<!--  ChangeStatus class -->
-	<string name="ChangeStatusActTitle">Beem - Changer statut</string>
-	
-	<string name="ChangeStatusText">Tapez votre message de statut ici :</string>
+	<string name="ChangeStatusActTitle">Beem - Changer mon statut</string>
+
+	<string name="ChangeStatusType">Mon statut</string>	
+	<string name="ChangeStatusText">Mon message personnel</string>
 	<string name="MenuAddContact">Ajouter un nouveau contact</string>
 	<string name="MenuAccountAbout">Beem Project</string>
 	<string name="MenuAccountCreate">Créer un compte</string>
@@ -102,7 +103,8 @@
 	<string name="SubscriptAccept">Inscription acceptée</string>
 	<string name="SubscriptError">Erreur d\'inscription</string>
 	<string name="SubscriptRefused">Inscription refusée</string>
-	<string name="SubscriptText">Vous avez une requête d\'ajout de la part de %s. Souhaitez-vous l\'accepter ?</string>
+	<string name="SubscriptText">%s vient de vous ajouter à sa liste de contacts. Souhaitez-vous l\'autoriser ?</string>
+	<string name="SubscriptTitle">Autoriser ce contact ?</string>
 	
 	<!-- ContactList class -->
 	<string name="ConListNotConnected">Non connecté(e)</string>
@@ -114,8 +116,8 @@
 	<string name="BeemBroadcastReceiverDisconnect">Vous avez été déconnecté(e)</string>
 	
 	<!--  XmppConnectionAdapter class -->
-	<string name="AcceptContactRequest">Accept contact request</string>
-	<string name="AcceptContactRequestFrom">Accept contact request from </string>
+	<string name="AcceptContactRequest">%s vient de vous ajouter à sa liste d'amis.</string>
+	<string name="AcceptContactRequestFrom">Autoriser %s à vous contacter.</string>
 	
     <!--
     	Services
@@ -140,7 +142,7 @@
     <string name="button_login">Se connecter</string>
     <string name="button_save">Enregistrer</string>
     <string name="button_create_account">Créer ce compte</string>
-    <string name="button_create_login_account">Créer et enregistrer</string>
+    <string name="button_create_login_account">Créer puis utiliser ce compte</string>
     
     
     <!--
@@ -274,4 +276,5 @@
 	<string name="contact_status_msg_away">Parti(e)</string>
 	<string name="contact_status_msg_xa">Indisponible</string>
 	<string name="contact_status_msg_offline">Hors ligne</string>
+<string name="UpdateButton">Mettre à jour</string>
 </resources>
diff -r 62f096393033 -r 8e33a89c21a3 res/values/strings.xml
--- a/res/values/strings.xml	Wed Nov 11 19:54:25 2009 +0100
+++ b/res/values/strings.xml	Thu Nov 12 02:26:03 2009 +0100
@@ -4,8 +4,8 @@
 	<string name="OkButton">Ok</string>
 	<string name="ClearButton">Clear</string>
 	<string name="CancelButton">Cancel</string>
-	<string name="AcceptButton">Accept</string>
-	<string name="RefuseButton">Refuse</string>
+	<string name="AcceptButton">Authorize</string>
+	<string name="RefuseButton">Deny</string>
 
 	<!--  Beem class -->
 	<string name="BeemJabberID">Jabber ID</string>
@@ -40,12 +40,12 @@
 	<string name="CDInfos">Manage User</string>
 
 	<!-- AddContact class -->
-	<string name="AddCActTitle">Beem - Add contact</string>
+	<string name="AddCActTitle">Beem - Add a contact</string>
 
-	<string name="AddCLogin">Login :</string>
-	<string name="AddCAlias">Alias :</string>
-	<string name="AddCGroup">Group :</string>
-	<string name="AddCOkButton">Ok</string>
+	<string name="AddCLogin">Username</string>
+	<string name="AddCAlias">Alias</string>
+	<string name="AddCGroup">Group</string>
+	<string name="AddCOkButton">Add</string>
 	<string name="AddCContactAdded">Contact added</string>
 	<string name="AddCContactAddedError">Error Contact not added</string>
 	<string name="AddCContactAddedLoginError">Error Login</string>
@@ -67,9 +67,10 @@
 	<string name="SendIMNoStatusSet">No status set</string>
 	
 	<!--  ChangeStatus class -->
-	<string name="ChangeStatusText">Type here your status message :</string>
+	<string name="ChangeStatusType">My status</string>	
+	<string name="ChangeStatusMessage">My personal message</string>
 
-	<string name="ChangeStatusActTitle">Beem - Change status</string>
+	<string name="ChangeStatusActTitle">Beem - Change my status</string>
 	<string name="MenuAddContact">Add new contact</string>
 	<string name="MenuAccountAbout">Beem Project</string>
 	<string name="MenuAccountCreate">Create account</string>
@@ -102,20 +103,21 @@
 	<string name="SubscriptAccept">Subscription accepted</string>
 	<string name="SubscriptError">Subscription error</string>
 	<string name="SubscriptRefused">Subscription refused</string>
-	<string name="SubscriptText">You have received a request for add by %s. Do you want to accept it ?</string>
+	<string name="SubscriptText">%s wants to add you to his/her buddy list. Do you want to authorize him/her ?</string>
+	<string name="SubscriptTitle">Authorize buddy ?</string>
 	
 	<!-- ContactList class -->
 	<string name="ConListNotConnected">Not connected</string>
 
 	<!--  BeemChatManager -->
-	<string name="BeemChatManagerNewMessage">You\'ve got a new message</string>
+	<string name="BeemChatManagerNewMessage">You\'ve a new message</string>
 	
 	<!--  BeemBroadcastReceiver class -->
 	<string name="BeemBroadcastReceiverDisconnect">You have been disconnected</string>
 	
 	<!--  XmppConnectionAdapter class -->
-	<string name="AcceptContactRequest">Accept contact request</string>
-	<string name="AcceptContactRequestFrom">Accept contact request from </string>
+	<string name="AcceptContactRequest">%s has just added you to his/her buddy list.</string>
+	<string name="AcceptContactRequestFrom">Authorize %s to contact you.</string>
     
     <!-- Activities -->
     <string name="login_tag">Beem - Login Activity</string>
@@ -132,7 +134,7 @@
     <string name="button_login">Login</string>
     <string name="button_save">Save</string>
     <string name="button_create_account">Create this account</string>
-    <string name="button_create_login_account">Create and log</string>
+    <string name="button_create_login_account">Create and use this account</string>
 
     <!-- LogAs Activity -->
 	<string name="login_username">Username</string>
@@ -255,4 +257,6 @@
 	<string name="contact_status_msg_xa">Unavailable</string>
 	<string name="contact_status_msg_offline">Disconnected</string>
 
+<string name="UpdateButton">Update</string>
+
 </resources>
diff -r 62f096393033 -r 8e33a89c21a3 res/values/styles.xml
--- a/res/values/styles.xml	Wed Nov 11 19:54:25 2009 +0100
+++ b/res/values/styles.xml	Thu Nov 12 02:26:03 2009 +0100
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<style name="Label">
-		<item name="android:textSize">16sp</item>
+		<item name="android:textSize">18sp</item>
 		<item name="android:textStyle">bold</item>
 		<item name="android:typeface">sans</item>
 		<item name="android:capitalize">characters</item>
 		<item name="android:textColor">#FFFFFF</item>
 		<item name="android:focusable">false</item>
+		<item name="android:padding">4px</item>
 	</style>
 	<style name="CheckBoxLabel" parent="@style/Label">
 		<item name="android:enabled">true</item>
diff -r 62f096393033 -r 8e33a89c21a3 src/com/beem/project/beem/service/XmppConnectionAdapter.java
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Wed Nov 11 19:54:25 2009 +0100
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Thu Nov 12 02:26:03 2009 +0100
@@ -344,13 +344,12 @@
 		public void processPacket(Packet packet) {
 		    String from = packet.getFrom();
 		    Notification notif = new Notification(android.R.drawable.stat_notify_more, mService
-			.getString(R.string.AcceptContactRequest), System.currentTimeMillis());
+			.getString(R.string.AcceptContactRequest, from), System.currentTimeMillis());
 		    notif.defaults = Notification.DEFAULT_ALL;
 		    notif.flags = Notification.FLAG_AUTO_CANCEL;
 		    Intent intent = new Intent(mService, Subscription.class);
 		    intent.putExtra("from", from);
-		    notif.setLatestEventInfo(mService, from, mService.getString(R.string.AcceptContactRequestFrom)
-			+ from, PendingIntent.getActivity(mService, 0, intent, PendingIntent.FLAG_ONE_SHOT));
+		    notif.setLatestEventInfo(mService, from, mService.getString(R.string.AcceptContactRequestFrom, from), PendingIntent.getActivity(mService, 0, intent, PendingIntent.FLAG_ONE_SHOT));
 		    int id = packet.hashCode();
 		    mService.sendNotification(id, notif);
 		}
@@ -444,13 +443,12 @@
 		public void processPacket(Packet packet) {
 		    String from = packet.getFrom();
 		    Notification notif = new Notification(android.R.drawable.stat_notify_more, mService
-			.getString(R.string.AcceptContactRequest), System.currentTimeMillis());
+			.getString(R.string.AcceptContactRequest, from), System.currentTimeMillis());
 		    notif.defaults = Notification.DEFAULT_ALL;
 		    notif.flags = Notification.FLAG_AUTO_CANCEL;
 		    Intent intent = new Intent(mService, Subscription.class);
 		    intent.putExtra("from", from);
-		    notif.setLatestEventInfo(mService, from, mService.getString(R.string.AcceptContactRequestFrom)
-			+ from, PendingIntent.getActivity(mService, 0, intent, PendingIntent.FLAG_ONE_SHOT));
+		    notif.setLatestEventInfo(mService, from, mService.getString(R.string.AcceptContactRequestFrom, from), PendingIntent.getActivity(mService, 0, intent, PendingIntent.FLAG_ONE_SHOT));
 		    int id = packet.hashCode();
 		    mService.sendNotification(id, notif);
 		}
diff -r 62f096393033 -r 8e33a89c21a3 src/com/beem/project/beem/ui/ChangeStatus.java
--- a/src/com/beem/project/beem/ui/ChangeStatus.java	Wed Nov 11 19:54:25 2009 +0100
+++ b/src/com/beem/project/beem/ui/ChangeStatus.java	Thu Nov 12 02:26:03 2009 +0100
@@ -16,8 +16,8 @@
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.Spinner;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.beem.project.beem.BeemService;
@@ -43,7 +43,7 @@
     private static final int AWAY_IDX = 3;
     private static final int UNAVAILABLE_IDX = 4;
     private static final int DISCONNECTED_IDX = 5;
-    private TextView mStatusText;
+    private EditText mStatusMessageEditText;
     private Toast mToast;
     private Button mOk;
     private Button mClear;
@@ -70,21 +70,26 @@
 	super.onCreate(savedInstanceState);
 
 	setContentView(R.layout.changestatus);
-	mStatusText = (TextView) findViewById(R.id.ChangeStatusText);
+
 	mOk = (Button) findViewById(R.id.ChangeStatusOk);
+	mOk.setOnClickListener(mOnClickOk);
+	
 	mClear = (Button) findViewById(R.id.ChangeStatusClear);
-	mOk.setOnClickListener(mOnClickOk);
 	mClear.setOnClickListener(mOnClickOk);
+	
 	mSettings = PreferenceManager.getDefaultSharedPreferences(this);
+	mStatusMessageEditText = (EditText) findViewById(R.id.ChangeStatusMessage);
+	mStatusMessageEditText.setText(getPreferenceString(R.string.PreferenceStatusText));
 
 	mSpinner = (Spinner) findViewById(R.id.ChangeStatusSpinner);
 	mAdapter = ArrayAdapter.createFromResource(this, R.array.status_types, android.R.layout.simple_spinner_item);
 	mAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
 	mSpinner.setAdapter(mAdapter);
+
 	mToast = Toast.makeText(this, R.string.ChangeStatusOk, Toast.LENGTH_LONG);
+	mSpinner.setSelection(getPreferenceStatusIndex());
+
 	mReceiver = new BeemBroadcastReceiver(mServConn);
-	mStatusText.setText(getPreferenceString(R.string.PreferenceStatusText));
-	mSpinner.setSelection(getPreferenceStatusIndex());
 	this.registerReceiver(mReceiver, new IntentFilter(BeemBroadcastReceiver.BEEM_CONNECTION_CLOSED));
     }
 
@@ -202,9 +207,10 @@
 	@Override
 	public void onClick(View v) {
 	    if (v == mOk) {
-		if (!mStatusText.getText().toString().equals(getPreferenceString(R.string.PreferenceStatusText))
+		if (!mStatusMessageEditText.getText().toString().equals(
+		    getPreferenceString(R.string.PreferenceStatusText))
 		    || getPreferenceStatusIndex() != mSpinner.getSelectedItemPosition()) {
-		    String msg = mStatusText.getText().toString();
+		    String msg = mStatusMessageEditText.getText().toString();
 		    int status = getStatusForService((String) mSpinner.getSelectedItem());
 		    Editor edit = mSettings.edit();
 		    edit.putString(getString(R.string.PreferenceStatusText), msg);
@@ -223,7 +229,7 @@
 		}
 		ChangeStatus.this.finish();
 	    } else if (v == mClear) {
-		mStatusText.setText(null);
+		mStatusMessageEditText.setText(null);
 	    }
 	}
     }