Roll back the features of 443359, 443362, 443363, 443364

Roll back the following features : Reconnect after reconnect fail.
Auto connect after connect fail.
Reconnect after connection lost.
Reconnect after network recovery

Change-Id: I74ce5d564ea689deaf506a9562136f1627988e2f
Signed-off-by: tzihan <zhtang@cn.ibm.com>

Author: tzihan

org.eclipse.paho.android.service/org.eclipse.paho.android.service/src/org/eclipse/paho/android/service/MqttConnection.java

@@ -28,7 +28,6 @@
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.eclipse.paho.client.mqttv3.MqttPersistenceException;
-import org.eclipse.paho.client.mqttv3.MqttSecurityException;
 import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence;
 
 import android.app.Service;
@@ -111,15 +110,15 @@ public void setClientHandle(String clientHandle) {
 	}
 
 	//store connect ActivityToken for reconnect
-	private String connectActivityToken = null;
+	private String reconnectActivityToken = null;
 
 	// our client object - instantiated on connect
 	private MqttAsyncClient myClient = null;
 
 	// our (parent) service object
 	private MqttService service = null;
 
-	private volatile boolean disconnected = true;
+	private volatile boolean disconnected = false;
 	private boolean cleanSession = true;
 
 	// Indicate this connection is connecting or not.
@@ -184,9 +183,8 @@ public void setClientHandle(String clientHandle) {
 	public void connect(MqttConnectOptions options, String invocationContext,
 			String activityToken) {
 
-		final String internel_invocationContext = invocationContext;
 		connectOptions = options;
-		connectActivityToken = activityToken;
+		reconnectActivityToken = activityToken;
 
 		if (options != null) {
 			cleanSession = options.isCleanSession();
@@ -258,11 +256,6 @@ public void onFailure(IMqttToken asyncActionToken,
 
 					doAfterConnectFail(resultBundle);
 
-					// if connect fail ,try reconnect.
-					if(service.isOnline()){
-						connect(connectOptions, internel_invocationContext,connectActivityToken);
-					}
-
 				}
 			};
 
@@ -795,8 +788,6 @@ public void onFailure(IMqttToken asyncActionToken,
 					Log.getStackTraceString(why));
 		}
 		service.callbackToActivity(clientHandle, Status.OK, resultBundle);
-		service.traceDebug(TAG,"Reconnect for connection lost");
-		reconnect();
 		// client has lost connection no need for wake lock
 		releaseWakeLock();
 	}
@@ -980,7 +971,7 @@ synchronized void reconnect() {
 			final Bundle resultBundle = new Bundle();
 			resultBundle.putString(
 				MqttServiceConstants.CALLBACK_ACTIVITY_TOKEN,
-				connectActivityToken);
+				reconnectActivityToken);
 			resultBundle.putString(
 				MqttServiceConstants.CALLBACK_INVOCATION_CONTEXT, null);
 			resultBundle.putString(MqttServiceConstants.CALLBACK_ACTION,
@@ -1011,10 +1002,6 @@ public void onFailure(IMqttToken asyncActionToken, Throwable exception) {
 
 						doAfterConnectFail(resultBundle);
 
-						//reconnect fail , try reconnect . check network in reconnect function;
-						service.traceDebug(TAG,"Reconnect Fail,Reconnect!");
-						reconnect();
-						
 					}
 				};