# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1276288472 -7200
# Node ID e3a68ccfb4ef9c00dbbcdd732a22ea8dd3e58a0b
# Parent  0fb9a16d7c32e34560b8a9b48f6d48cf6e62802a
A better auto reconnection process.

diff -r 0fb9a16d7c32 -r e3a68ccfb4ef res/layout/preferences.xml
--- a/res/layout/preferences.xml	Thu Jun 10 20:08:03 2010 +0200
+++ b/res/layout/preferences.xml	Fri Jun 11 22:34:32 2010 +0200
@@ -91,7 +91,8 @@
 				<EditTextPreference android:singleLine="true"
 					android:title="@string/settings_reco_delay" android:name="Reconnect delay"
 					android:summary="@string/SettingsAdvancedRecoDelay" android:key="settings_key_reco_delay"
-					android:defaultValue="10" />
+					android:numeric="integer"
+					android:defaultValue="2" />
 			</PreferenceCategory>
 			<CheckBoxPreference android:title="@string/SettingsAdvancedOptions"
 				android:defaultValue="false" android:summary="@string/SettingsAdvancedSpecOpt"
diff -r 0fb9a16d7c32 -r e3a68ccfb4ef src/com/beem/project/beem/BeemService.java
--- a/src/com/beem/project/beem/BeemService.java	Thu Jun 10 20:08:03 2010 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Fri Jun 11 22:34:32 2010 +0200
@@ -54,8 +54,10 @@
 import org.jivesoftware.smack.proxy.ProxyInfo.ProxyType;
 import org.jivesoftware.smack.util.StringUtils;
 
+import android.app.AlarmManager;
 import android.app.Notification;
 import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -67,8 +69,10 @@
 import android.net.Uri;
 import android.os.IBinder;
 import android.os.RemoteException;
+import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.util.Log;
+import android.widget.Toast;
 
 import com.beem.project.beem.service.XmppConnectionAdapter;
 import com.beem.project.beem.service.XmppFacade;
@@ -93,6 +97,7 @@
     private static final int DEFAULT_XMPP_PORT = 5222;
     //private static final String COMMAND_NAMESPACE = "http://jabber.org/protocol/commands";
 
+    private AlarmManager mAlarmManager;
     private NotificationManager mNotificationManager;
     private XmppConnectionAdapter mConnection;
     private SharedPreferences mSettings;
@@ -106,11 +111,12 @@
     private boolean mUseProxy;
     private IXmppFacade.Stub mBind;
 
-    private BeemBroadcastReceiver mReceiver = new BeemBroadcastReceiver();
+    private final ConnectivityReceiver mConnectivityReceiver = new ConnectivityReceiver();
     private BeemServiceBroadcastReceiver mOnOffReceiver = new BeemServiceBroadcastReceiver();
     private BeemServicePreferenceListener mPreferenceListener = new BeemServicePreferenceListener();
 
     private boolean mOnOffReceiverIsRegistered;
+    private boolean mReconnecting;
 
     /**
      * Constructor.
@@ -148,6 +154,7 @@
 	// maybe not the universal path, but it works on most devices (Samsung Galaxy, Google Nexus One)
 	mConnectionConfiguration.setTruststoreType("BKS");
 	mConnectionConfiguration.setTruststorePath("/system/etc/security/cacerts.bks");
+	mConnectionConfiguration.setReconnectionAllowed(false);
     }
 
     /**
@@ -175,7 +182,8 @@
     @Override
     public void onCreate() {
 	super.onCreate();
-	registerReceiver(mReceiver, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
+	registerReceiver(mConnectivityReceiver, new IntentFilter(BeemBroadcastReceiver.BEEM_CONNECTION_CLOSED));
+	registerReceiver(mConnectivityReceiver, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
 	mSettings = PreferenceManager.getDefaultSharedPreferences(this);
 	mSettings.registerOnSharedPreferenceChangeListener(mPreferenceListener);
 	if (mSettings.getBoolean("settings_away_chk", false)) {
@@ -205,6 +213,7 @@
 	configure(ProviderManager.getInstance());
 
 	mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+	mAlarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
 	mConnection = new XmppConnectionAdapter(mConnectionConfiguration, mLogin, mPassword, this);
 
 	Roster.setDefaultSubscriptionMode(SubscriptionMode.manual);
@@ -220,7 +229,7 @@
 	super.onDestroy();
 	resetStatus();
 	mNotificationManager.cancelAll();
-	unregisterReceiver(mReceiver);
+	unregisterReceiver(mConnectivityReceiver);
 	mSettings.unregisterOnSharedPreferenceChangeListener(mPreferenceListener);
 	if (mOnOffReceiverIsRegistered)
 	    unregisterReceiver(mOnOffReceiver);
@@ -236,11 +245,9 @@
     public void onStart(Intent intent, int startId) {
 	super.onStart(intent, startId);
 	Log.d(TAG, "onStart");
-	try {
-	    mConnection.connectAsync();
-	} catch (RemoteException e) {
-	    e.printStackTrace();
-	}
+	if (!BeemConnectivity.isConnected(this))
+	    return;
+	launchConnection(intent.getBooleanExtra("Reconnecting", false));
     }
 
     /**
@@ -307,6 +314,74 @@
     }
 
     /**
+     * Enable automatic reconnection.
+     */
+    public void enableReconnection() {
+	mReconnecting = true;
+	// let the broadcast receiver launch it if not connected
+	if (BeemConnectivity.isConnected(this))
+	    setReconnectionProcess(true);
+    }
+
+    /**
+     * Disable automatic reconnection.
+     * This should be done if there is a connection.
+     */
+    public void disableReconnection() {
+	mReconnecting = false;
+	setReconnectionProcess(false);
+    }
+
+    /**
+     * Set an repeating alarm to launch an automatic reconnection.
+     *
+     * @param enable if false the alarm will be canceled
+     */
+    private void setReconnectionProcess(boolean enable) {
+	Intent intent = new Intent(this, BeemService.class);
+	intent.putExtra("Reconnecting", true);
+	PendingIntent pintent = PendingIntent.getService(this, 0, intent, 0);
+	if (enable) {
+	    Log.d(TAG, "Enable reconnection");
+	    int nbsec = 2;
+	    try {
+		nbsec = Integer.parseInt(mSettings.getString("settings_key_reco_delay", "1"));
+	    } catch (NumberFormatException ex) {
+		Log.w(TAG, "Bad reconnection delay. Use default", ex);
+	    }
+	    int msec = nbsec * 1000;
+	    long time = SystemClock.elapsedRealtime() + msec;
+
+	    mAlarmManager.setRepeating(AlarmManager.ELAPSED_REALTIME, time, msec, pintent);
+	} else {
+	    Log.d(TAG, "Disable reconnection");
+	    mAlarmManager.cancel(pintent);
+	}
+    }
+
+    /**
+     * Launch an asynchronous connection.
+     *
+     * @param isReconnecting true if it is a reconnection triggered by the auto reconnection process.
+     */
+    private void launchConnection(final boolean isReconnecting) {
+	disableReconnection();
+	Thread t = new Thread(new Runnable() {
+
+	    @Override
+	    public void run() {
+		try {
+		    if (!mConnection.connectSync() && isReconnecting)
+			enableReconnection();
+		} catch (RemoteException e) {
+		    Log.e(TAG, "Error while connecting asynchronously", e);
+		}
+	    }
+	});
+	t.start();
+    }
+
+    /**
      * A sort of patch from this thread: http://www.igniterealtime.org/community/thread/31118. Avoid ClassCastException
      * by bypassing the classloading shit of Smack.
      * @param pm The ProviderManager.
@@ -452,5 +527,36 @@
 	    }
 	}
     }
+
+    /**
+     * ConnectivityReceiver which deals with the reconnection system.
+     *
+     * @author Da Risk <da_risk@beem-project.com>
+     */
+    private class ConnectivityReceiver extends BroadcastReceiver {
+	/**
+	 * Constructor.
+	 */
+	public ConnectivityReceiver() {
+	}
+
+	@Override
+	public void onReceive(final Context context, final Intent intent) {
+	    String intentAction = intent.getAction();
+	    if (intentAction.equals(BeemBroadcastReceiver.BEEM_CONNECTION_CLOSED)) {
+		CharSequence message = intent.getCharSequenceExtra("message");
+		Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
+	    } else if (intentAction.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
+		boolean connectivity = !intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false);
+		Log.d(TAG, "connectivity change " + connectivity);
+		if (!connectivity) {
+		    setReconnectionProcess(false);
+		} else if (mReconnecting) {
+		    setReconnectionProcess(true);
+		}
+	    }
+	}
+    }
+
 }
 
diff -r 0fb9a16d7c32 -r e3a68ccfb4ef src/com/beem/project/beem/service/XmppConnectionAdapter.java
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Thu Jun 10 20:08:03 2010 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Fri Jun 11 22:34:32 2010 +0200
@@ -171,11 +171,12 @@
     }
 
     @Override
-    public boolean connect() throws RemoteException {
+    public synchronized boolean connect() throws RemoteException {
 	if (mAdaptee.isConnected())
 	    return true;
 	else {
 	    try {
+		Log.d(TAG, "connect");
 		mAdaptee.connect();
 		mAdaptee.addConnectionListener(mConListener);
 		return true;
@@ -199,37 +200,17 @@
     }
 
     @Override
-    public boolean login() throws RemoteException {
-	if (mAdaptee.isAuthenticated())
-	    return true;
+    public synchronized boolean login() throws RemoteException {
 	if (!mAdaptee.isConnected())
 	    return false;
 	try {
-	    mAdaptee.login(mLogin, mPassword, mResource);
-	    mChatManager = new BeemChatManager(mAdaptee.getChatManager(), mService);
-	    mPrivacyListManager = new PrivacyListManagerAdapter(PrivacyListManager.getInstanceFor(mAdaptee));
-
-	    this.initFeatures(); // pour declarer les features xmpp qu'on
-	    // supporte
-
-	    PacketFilter filter = new PacketFilter() {
-
-		@Override
-		public boolean accept(Packet packet) {
-		    if (packet instanceof Presence) {
-			Presence pres = (Presence) packet;
-			if (pres.getType() == Presence.Type.subscribe)
-			    return true;
-		    }
-		    return false;
-		}
-	    };
-
-	    mAdaptee.addPacketListener(mSubscribePacketListener, filter);
-
+	    Log.d(TAG, "login");
+	    if (!mAdaptee.isAuthenticated()) {
+		mAdaptee.login(mLogin, mPassword, mResource);
+		initConnection();
+	    }
 	    mService.resetStatus();
-	    mService.initJingle(mAdaptee);
-
+	    mService.disableReconnection();
 	    mApplication.setConnected(true);
 	    changeStatus(Status.CONTACT_STATUS_AVAILABLE, mService.getServicePreference().getString("status_text", ""));
 	    return true;
@@ -347,7 +328,7 @@
      * {@inheritDoc}
      */
     @Override
-    public boolean disconnect() {
+    public synchronized boolean disconnect() {
 	if (mAdaptee != null && mAdaptee.isConnected())
 	    mAdaptee.disconnect();
 	return true;
@@ -437,6 +418,33 @@
     }
 
     /**
+     * Initialize after the first connection.
+     */
+    private void initConnection() {
+	mChatManager = new BeemChatManager(mAdaptee.getChatManager(), mService);
+	mPrivacyListManager = new PrivacyListManagerAdapter(PrivacyListManager.getInstanceFor(mAdaptee));
+
+	this.initFeatures(); // pour declarer les features xmpp qu'on
+	// supporte
+
+	PacketFilter filter = new PacketFilter() {
+
+	    @Override
+	    public boolean accept(Packet packet) {
+		if (packet instanceof Presence) {
+		    Presence pres = (Presence) packet;
+		    if (pres.getType() == Presence.Type.subscribe)
+			return true;
+		}
+		return false;
+	    }
+	};
+
+	mAdaptee.addPacketListener(mSubscribePacketListener, filter);
+	mService.initJingle(mAdaptee);
+    }
+
+    /**
      * Listener for XMPP connection events. It will calls the remote listeners for connection events.
      * @author darisk
      */
@@ -461,6 +469,7 @@
 	    mService.sendBroadcast(intent);
 	    mService.stopSelf();
 	    mApplication.setConnected(false);
+	    mService.disableReconnection();
 	}
 
 	/**
@@ -473,7 +482,7 @@
 	    Intent intent = new Intent(BeemBroadcastReceiver.BEEM_CONNECTION_CLOSED);
 	    intent.putExtra("message", exception.getMessage());
 	    mService.sendBroadcast(intent);
-	    mService.stopSelf();
+	    mService.enableReconnection();
 	    mApplication.setConnected(false);
 	}
 
@@ -550,40 +559,7 @@
 	 */
 	@Override
 	public void reconnectionSuccessful() {
-	    Log.d(TAG, "reconnectionSuccessful");
-	    mApplication.setConnected(true);
-	    PacketFilter filter = new PacketFilter() {
-
-		@Override
-		public boolean accept(Packet packet) {
-		    if (packet instanceof Presence) {
-			Presence pres = (Presence) packet;
-			if (pres.getType() == Presence.Type.subscribe)
-			    return true;
-		    }
-		    return false;
-		}
-	    };
-
-	    mAdaptee.addPacketListener(new PacketListener() {
-
-		@Override
-		public void processPacket(Packet packet) {
-		    String from = packet.getFrom();
-		    Notification notif = new Notification(android.R.drawable.stat_notify_more, mService.getString(
-			R.string.AcceptContactRequest, from), System.currentTimeMillis());
-		    notif.flags = Notification.FLAG_AUTO_CANCEL;
-		    Intent intent = new Intent(mService, Subscription.class);
-		    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-			.putExtra("from", from);
-		    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);
-		}
-	    }, filter);
-
+	    Log.v(TAG, "reconnectionSuccessful");
 	    final int n = mRemoteConnListeners.beginBroadcast();
 
 	    for (int i = 0; i < n; i++) {
diff -r 0fb9a16d7c32 -r e3a68ccfb4ef src/com/beem/project/beem/utils/BeemBroadcastReceiver.java
--- a/src/com/beem/project/beem/utils/BeemBroadcastReceiver.java	Thu Jun 10 20:08:03 2010 +0200
+++ b/src/com/beem/project/beem/utils/BeemBroadcastReceiver.java	Fri Jun 11 22:34:32 2010 +0200
@@ -47,11 +47,7 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.widget.Toast;
 
-import com.beem.project.beem.BeemService;
-import com.beem.project.beem.R;
 
 /**
  * Manage broadcast disconnect intent.
@@ -75,19 +71,11 @@
     public void onReceive(final Context context, final Intent intent) {
 	String intentAction = intent.getAction();
 	if (intentAction.equals(BEEM_CONNECTION_CLOSED)) {
-	    CharSequence message = intent.getCharSequenceExtra("message");
-	    Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
 	    if (context instanceof Activity) {
 		Activity act = (Activity) context;
 		act.finish();
 		// The service will be unbinded in the destroy of the activity.
 	    }
-	} else if (intentAction.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
-	    if (intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false)) {
-		Toast.makeText(context, context.getString(R.string.BeemBroadcastReceiverDisconnect),
-		    Toast.LENGTH_SHORT).show();
-		context.stopService(new Intent(context, BeemService.class));
-	    }
 	}
     }
 }