# HG changeset patch
# User Vincent Veronis <veroni_v@epitech.net>
# Date 1254478006 -7200
# Node ID 45667283cbebc0e1c5f98066f4e133852497e299
# Parent  6cf10e4b3714afa2998b2aab9c0d004bb011bde4
Ajout qqls dialog dans la userinfo.
Menage.

diff -r 6cf10e4b3714 -r 45667283cbeb res/values-en/strings.xml
--- a/res/values-en/strings.xml	Thu Oct 01 18:32:03 2009 +0200
+++ b/res/values-en/strings.xml	Fri Oct 02 12:06:46 2009 +0200
@@ -36,16 +36,7 @@
 	<!--  ContactDialog class -->
 	<string name="CDChat">Chat</string>
 	<string name="CDCall">Call</string>
-	<string name="CDAlias">Alias</string>
-	<string name="CDResend">Resend suscription</string>
 	<string name="CDInfos">Manage User</string>
-	<string name="CDBlock">Block user</string>
-	<string name="CDDelete">Delete user</string>
-	<string name="CDSure2Delete">Are you sure you want to delete this contact?
-	</string>
-	<string name="CDSure2DeleteYes">Yes</string>
-	<string name="CDSure2DeleteNo">No</string>
-
 
 	<!-- AddContact class -->
 	<string name="AddCActTitle">Beem - Add contact</string>
@@ -229,20 +220,24 @@
 	
 	<!--
 		ContactList Activity 
-	 -->
-	 <string name="contact_list_menu_add_contact">Add a contact</string>
-	 <string name="contact_list_menu_settings">Settings</string>
-	 <string name="contact_list_all_contact">All contacts</string>
-	 <string name="contact_list_no_group">No group</string>
+	-->
+	<string name="contact_list_menu_add_contact">Add a contact</string>
+	<string name="contact_list_menu_settings">Settings</string>
+	<string name="contact_list_all_contact">All contacts</string>
+	<string name="contact_list_no_group">No group</string>
 	 
-	 <!-- 
+	<!-- 
 		UserInfo Activity
-	 -->
-	 <string name="userinfo_label_alias">Alias</string>
-	 <string name="userinfo_label_chg_group">Manage groups</string>
-	 <string name="userinfo_label_re_suscription">Resend suscription</string>
-	 <string name="userinfo_label_block">Block</string>
-	 <string name="userinfo_label_delete">Delete</string>
-	 <string name="userinfo_resend">Suscription resend</string>
+	-->
+	<string name="userinfo_label_alias">Alias</string>
+	<string name="userinfo_label_chg_group">Manage groups</string>
+	<string name="userinfo_label_re_suscription">Resend invit</string>
+	<string name="userinfo_label_block">Block</string>
+	<string name="userinfo_label_delete">Delete</string>
+	<string name="userinfo_resend">Suscription resend</string>
+	<string name="userinfo_sure2delete">Are you sure you want to delete this contact?</string>
+	<string name="userinfo_yes">Yes</string>
+	<string name="userinfo_no">No</string>
+	<string name="userinfo_sureresend">Are you sure you want to resend invit?</string>
 
 </resources>
diff -r 6cf10e4b3714 -r 45667283cbeb res/values-fr/strings.xml
--- a/res/values-fr/strings.xml	Thu Oct 01 18:32:03 2009 +0200
+++ b/res/values-fr/strings.xml	Fri Oct 02 12:06:46 2009 +0200
@@ -20,7 +20,8 @@
 	<!--  Preferences informations -->
 	<string name="PreferenceStatus">status</string>
 	<string name="PreferenceStatusText">status_text</string>
-	<string name="PreferenceIsConfigured">preference_is_configured</string>
+	<string name="PreferenceIsConfigured">preference_is_configured
+	</string>
 
 	<!-- ContactListSettings class -->
 	<string name="CLSServerConnection">Connexion au serveur</string>
@@ -36,9 +37,6 @@
 	<string name="CDChat">Chat</string>
 	<string name="CDCall">Appeller</string>
 	<string name="CDInfos">Gestion utilisateur</string>
-	<string name="CDSure2Delete">Êtes-vous sûr de vouloir supprimer ce contact ?</string>
-	<string name="CDSure2DeleteYes">Oui</string>
-	<string name="CDSure2DeleteNo">Non</string>
 
 	<!-- AddContact class -->
 	<string name="AddCActTitle">Beem - Ajouter un contact</string>
@@ -228,11 +226,15 @@
 
 	<!-- 
 		UserInfo Activity
-	 -->
-	 <string name="userinfo_label_alias">Alias</string>
-	 <string name="userinfo_label_chg_group">Modifier groupe</string>
-	 <string name="userinfo_label_re_suscription">Renvoyer souscription</string>
-	 <string name="userinfo_label_block">Bloquer</string>
-	 <string name="userinfo_label_delete">Supprimer</string>
-	 <string name="userinfo_resend">Souscription réenvoyée</string>
+	-->
+	<string name="userinfo_label_alias">Alias</string>
+	<string name="userinfo_label_chg_group">Modifier groupe</string>
+	<string name="userinfo_label_re_suscription">Renvoyer l'invitation</string>
+	<string name="userinfo_label_block">Bloquer</string>
+	<string name="userinfo_label_delete">Supprimer</string>
+	<string name="userinfo_resend">Souscription réenvoyée</string>
+	<string name="userinfo_sure2delete">Etes vous sur de vouloir supprimer ce contact?</string>
+	<string name="userinfo_yes">Oui</string>
+	<string name="userinfo_no">Non</string>
+	<string name="userinfo_sureresend">Etes vous sur de vouloir renvoyer l'invitation?</string>
 </resources>
diff -r 6cf10e4b3714 -r 45667283cbeb src/com/beem/project/beem/ui/UserInfo.java
--- a/src/com/beem/project/beem/ui/UserInfo.java	Thu Oct 01 18:32:03 2009 +0200
+++ b/src/com/beem/project/beem/ui/UserInfo.java	Fri Oct 02 12:06:46 2009 +0200
@@ -118,7 +118,7 @@
 	}
 
     }
-    
+
     /**
      * Event simple click on layout group.
      */
@@ -260,14 +260,28 @@
 
 	@Override
 	public void onClick(View v) {
-	    Presence presencePacket = new Presence(Presence.Type.subscribe);
-	    presencePacket.setTo(mContact.getJID());
-	    try {
-		mXmppFacade.sendPresencePacket(new PresenceAdapter(presencePacket));
-	    } catch (RemoteException e) {
-		e.printStackTrace();
-	    }
-	    Toast.makeText(UserInfo.this, getString(R.string.userinfo_resend), Toast.LENGTH_LONG).show();
+
+	    AlertDialog.Builder builder = new AlertDialog.Builder(UserInfo.this);
+	    builder.setMessage(UserInfo.this.getString(R.string.userinfo_sureresend)).setCancelable(false).setPositiveButton(
+		UserInfo.this.getString(R.string.userinfo_yes), new DialogInterface.OnClickListener() {
+		    public void onClick(DialogInterface dialog, int id) {
+			Presence presencePacket = new Presence(Presence.Type.subscribe);
+			presencePacket.setTo(mContact.getJID());
+			try {
+			    mXmppFacade.sendPresencePacket(new PresenceAdapter(presencePacket));
+			} catch (RemoteException e) {
+			    e.printStackTrace();
+			}
+			Toast.makeText(UserInfo.this, getString(R.string.userinfo_resend), Toast.LENGTH_SHORT).show();
+		    }
+		}).setNegativeButton(UserInfo.this.getString(R.string.userinfo_no),
+		new DialogInterface.OnClickListener() {
+		    public void onClick(DialogInterface dialog, int id) {
+			dialog.cancel();
+		    }
+		});
+	    AlertDialog alert = builder.create();
+	    alert.show();	    
 	}
 
     }
@@ -286,8 +300,8 @@
 	@Override
 	public void onClick(View v) {
 	    AlertDialog.Builder builder = new AlertDialog.Builder(UserInfo.this);
-	    builder.setMessage(UserInfo.this.getString(R.string.CDSure2Delete)).setCancelable(false).setPositiveButton(
-		UserInfo.this.getString(R.string.CDSure2DeleteYes), new DialogInterface.OnClickListener() {
+	    builder.setMessage(UserInfo.this.getString(R.string.userinfo_sure2delete)).setCancelable(false).setPositiveButton(
+		UserInfo.this.getString(R.string.userinfo_yes), new DialogInterface.OnClickListener() {
 		    public void onClick(DialogInterface dialog, int id) {
 			try {
 			    mXmppFacade.getRoster().deleteContact(mContact);
@@ -295,7 +309,7 @@
 			    e.printStackTrace();
 			}
 		    }
-		}).setNegativeButton(UserInfo.this.getString(R.string.CDSure2DeleteNo),
+		}).setNegativeButton(UserInfo.this.getString(R.string.userinfo_no),
 		new DialogInterface.OnClickListener() {
 		    public void onClick(DialogInterface dialog, int id) {
 			dialog.cancel();
@@ -326,7 +340,7 @@
 	    try {
 		IRoster r = mXmppFacade.getRoster();
 		if (r != null) {
-		    
+
 		    setTitle(mJID);
 		    mContact = r.getContact(mJID);
 		    mTextAlias.setText(mContact.getName());