# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1246038914 -7200
# Node ID 4a995e8a66ab6e21fc018dd52fce1b2f2f2c53d4
# Parent  3d9a315b12e606ec1277623842773bc69ff39de0# Parent  3805671d14ffa69d2610c0bf20af35d2aadeadb1
remerge

diff -r 3d9a315b12e6 -r 4a995e8a66ab src/com/beem/project/beem/BeemService.java
--- a/src/com/beem/project/beem/BeemService.java	Fri Jun 26 19:50:03 2009 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Fri Jun 26 19:55:14 2009 +0200
@@ -74,10 +74,11 @@
      */
     private void initConnectionConfig() {
 	// TODO mettre a false par defaut et remplacer les valeurs par defaut
+	java.security.Security.addProvider(new com.sun.security.sasl.Provider());
 	mUseProxy = mSettings.getBoolean(getString(R.string.settings_key_proxy_use), false);
 	if (mUseProxy) {
 	    ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.proxy_types,
-		    android.R.layout.simple_spinner_item);
+		android.R.layout.simple_spinner_item);
 	    int pos = mSettings.getInt(getString(R.string.settings_key_proxy_type), 0);
 	    String stype = adapter.getItem(pos).toString();
 	    String phost = mSettings.getString(getString(R.string.settings_key_proxy_server), "");
@@ -147,15 +148,15 @@
 			public void processPacket(Packet packet) {
 			    String from = packet.getFrom();
 			    Notification notif = new Notification(com.beem.project.beem.R.drawable.signal,
-				    "Demande d'ajout", System.currentTimeMillis());
+				"Demande d'ajout", System.currentTimeMillis());
 			    notif.defaults = Notification.DEFAULT_ALL;
 			    notif.flags = Notification.FLAG_AUTO_CANCEL;
 			    Intent intent = new Intent(BeemService.this, Subscription.class);
 			    intent.putExtra("from", from);
 			    notif
-				    .setLatestEventInfo(BeemService.this, from, "demande d'ajout de " + from,
-				            PendingIntent.getActivity(BeemService.this, 0, intent,
-				                    PendingIntent.FLAG_ONE_SHOT));
+			    .setLatestEventInfo(BeemService.this, from, "demande d'ajout de " + from,
+				PendingIntent.getActivity(BeemService.this, 0, intent,
+				    PendingIntent.FLAG_ONE_SHOT));
 			    int id = packet.hashCode();
 			    sendNotification(id, notif);
 			}