# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1246041523 -7200
# Node ID 81fcc509bafcb87ac7b577dc0d0d6a7ff7b13286
# Parent  c0a82115684f00eef1d1f247b0fa430299047d40# Parent  151b1b64f407fce32e2bd77ef33aad9e6616727c
merge

diff -r c0a82115684f -r 81fcc509bafc res/layout/edit_settings.xml
--- a/res/layout/edit_settings.xml	Fri Jun 26 20:38:06 2009 +0200
+++ b/res/layout/edit_settings.xml	Fri Jun 26 20:38:43 2009 +0200
@@ -108,6 +108,7 @@
     				android:layout_height="wrap_content"
     				android:text="@string/settings_xmpp_use_tls"
     				android:layout_below="@id/settings_xmpp_table_sp"
+    				android:focusable="true"
     				style="@style/CheckBoxLabel" />
 				<Button android:id="@+id/settings_xmpp_button_save"
 					android:layout_width="wrap_content"
diff -r c0a82115684f -r 81fcc509bafc src/com/beem/project/beem/BeemService.java
--- a/src/com/beem/project/beem/BeemService.java	Fri Jun 26 20:38:06 2009 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Fri Jun 26 20:38:43 2009 +0200
@@ -4,6 +4,7 @@
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.Roster;
 import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.ConnectionConfiguration.SecurityMode;
 import org.jivesoftware.smack.Roster.SubscriptionMode;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.packet.Packet;
@@ -97,6 +98,9 @@
 	    else
 		mConnectionConfiguration = new ConnectionConfiguration(mHost, mPort);
 	}
+	if (mSettings.getBoolean(getString(R.string.settings_key_xmpp_tls_use), false) == true) {
+	    mConnectionConfiguration.setSecurityMode(SecurityMode.required);
+	}
 	mConnectionConfiguration.setDebuggerEnabled(false);
 	mConnectionConfiguration.setSendPresence(true);
     }
diff -r c0a82115684f -r 81fcc509bafc src/com/beem/project/beem/service/RosterAdapter.java
--- a/src/com/beem/project/beem/service/RosterAdapter.java	Fri Jun 26 20:38:06 2009 +0200
+++ b/src/com/beem/project/beem/service/RosterAdapter.java	Fri Jun 26 20:38:43 2009 +0200
@@ -191,7 +191,7 @@
 	}
 
 	public void onEntryDeleteFromGroup(String group, String jid) {
-	    Log.i(TAG, "entry delete listener");
+	    //Log.i(TAG, "entry delete listener");
 	    final int n = mRemoteRosListeners.beginBroadcast();
 	    for (int i = 0; i < n; i++) {
 		IBeemRosterListener listener = mRemoteRosListeners.getBroadcastItem(i);
@@ -210,7 +210,7 @@
 	 */
 	@Override
 	public void entriesAdded(Collection<String> addresses) {
-	    Log.i(TAG, "Ajout de l'entry " + addresses.size() + " " + addresses.toArray()[0]);
+	    //Log.i(TAG, "Ajout de l'entry " + addresses.size() + " " + addresses.toArray()[0]);
 	    final int n = mRemoteRosListeners.beginBroadcast();
 
 	    List<String> tab = new ArrayList<String>();
@@ -231,7 +231,7 @@
 	 */
 	@Override
 	public void entriesDeleted(Collection<String> addresses) {
-	    Log.i(TAG, "Suppression de l'entry");
+	    //Log.i(TAG, "Suppression de l'entry");
 	    final int n = mRemoteRosListeners.beginBroadcast();
 
 	    List<String> tab = new ArrayList<String>();
@@ -252,7 +252,7 @@
 	 */
 	@Override
 	public void entriesUpdated(Collection<String> addresses) {
-	    Log.i(TAG, "Update de l'entry " + addresses.size() + " " + addresses.toArray()[0]);
+	    //Log.i(TAG, "Update de l'entry " + addresses.size() + " " + addresses.toArray()[0]);
 	    final int n = mRemoteRosListeners.beginBroadcast();
 
 	    List<String> tab = new ArrayList<String>();
@@ -273,7 +273,7 @@
 	 */
 	@Override
 	public void presenceChanged(Presence presence) {
-	    Log.i(TAG, "presence Changed");
+	    //Log.i(TAG, "presence Changed");
 	    /* redispatch vers les IBeemRosterListener */
 	    final int n = mRemoteRosListeners.beginBroadcast();
 
diff -r c0a82115684f -r 81fcc509bafc src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Fri Jun 26 20:38:06 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Fri Jun 26 20:38:43 2009 +0200
@@ -171,17 +171,17 @@
 
 	@Override
 	public void onEntriesAdded(List<String> addresses) throws RemoteException {
-	    Log.d("CONTACTLIST", "DEBUG - ONENTRIESADDED()"+ addresses.size());
+	    //Log.d("CONTACTLIST", "DEBUG - ONENTRIESADDED()"+ addresses.size());
 	    for (String str : addresses) {
 		Contact curContact = mRoster.getContact(str);
-		Log.d("CONTACTLIST", "DEBUG - ONENTRIESADDED() group size " + curContact.getGroups().size() );
+		//Log.d("CONTACTLIST", "DEBUG - ONENTRIESADDED() group size " + curContact.getGroups().size() );
 		for (String group : curContact.getGroups()) {
 		    if (!groupMap.containsKey(group)) {
 			groupMap.put(group, new ArrayList<Contact>());
 			groupName.add(group);
 		    }
 		    try {
-			Log.d("CONTACTLIST", "DEBUG - ONENTRIESADD");
+			//Log.d("CONTACTLIST", "DEBUG - ONENTRIESADD");
 			groupMap.get(group).add(curContact);
 		    } catch (NullPointerException e) {
 			Log.e(TAG, "Failed to find group in groupMap", e);
@@ -193,7 +193,7 @@
 
 	@Override
 	public void onEntriesDeleted(List<String> addresses) throws RemoteException {
-	    Log.d("CONTACTLIST", "DEBUG - ONENTRIESDELETED() " + addresses.get(0));
+	    //Log.d("CONTACTLIST", "DEBUG - ONENTRIESDELETED() " + addresses.get(0));
 	    for (String user : addresses) {
 		List<Contact> tmpListContact = groupMap.get(DEFAULT_GROUP);
 		for (Contact contact : tmpListContact) {
@@ -210,14 +210,14 @@
 
 	@Override
 	public void onEntriesUpdated(List<String> addresses) throws RemoteException {
-	    Log.d("CONTACTLIST", "DEBUG - ONENTRIESUPDATED()");
+	   // Log.d("CONTACTLIST", "DEBUG - ONENTRIESUPDATED()");
 	    for (String str : addresses) {
 		Contact curContact = mRoster.getContact(str);
 		for (String group : curContact.getGroups()) {
 		    if (!groupMap.containsKey(group)) {
 			groupMap.put(group, new ArrayList<Contact>());
 			groupName.add(group);
-			Log.d("CONTACTLIST", "DEBUG - ONENTRIESUPDATED() found");
+			//Log.d("CONTACTLIST", "DEBUG - ONENTRIESUPDATED() found");
 			groupMap.get(group).add(curContact);
 		    } else {
 			boolean found = false;
@@ -228,7 +228,7 @@
 			    }
 			}
 			if (!found) {
-			    Log.d("CONTACTLIST", "DEBUG - ONENTRIESUPDATED() not found");
+			    //Log.d("CONTACTLIST", "DEBUG - ONENTRIESUPDATED() not found");
 			    groupMap.get(group).add(curContact);
 			}
 		    }
@@ -239,7 +239,7 @@
 
 	@Override
 	public void onPresenceChanged(PresenceAdapter presence) throws RemoteException {
-	    Log.d("CONTACTLIST", "DEBUG - ONPRESENCECHANGED()");
+	    //Log.d("CONTACTLIST", "DEBUG - ONPRESENCECHANGED()");
 	    for (Contact curContact : mListContact) {
 		if (curContact.getJID().equals(StringUtils.parseBareAddress(presence.getFrom()))) {
 		    curContact.setStatus(mRoster.getPresence(StringUtils.parseBareAddress(presence.getFrom())));
@@ -258,7 +258,7 @@
 
 	@Override
 	public void onEntryDeleteFromGroup(String group, String jid) throws RemoteException {
-	    Log.d("CONTACTLIST", "DEBUG - ONENTRYDELETEFROMGROUP()");
+	    //Log.d("CONTACTLIST", "DEBUG - ONENTRYDELETEFROMGROUP()");
 	    for (Contact contact : mListContact) {
 		if (jid.equals(contact.getJID())
 		    && (contact.getGroups().contains(group) || contact.getGroups().size() == 0)) {