Fix bug 443365:[feature] App is killed, after mqtt service is restarted, mqtt service should reconnect to the mqtt server

Change-Id: Icd43a73cbde91e0451a905b737b7dad071c33755
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

@@ -234,10 +234,7 @@ public void connect(MqttConnectOptions options, String invocationContext,
 				persistence = new MqttDefaultFilePersistence(
 						myDir.getAbsolutePath());
 			}
-
-			myClient = new MqttAsyncClient(serverURI, clientId, persistence, 
-					new AlarmPingSender(service));
-			myClient.setCallback(this);
+			
 			IMqttActionListener listener = new MqttConnectionListener(
 					resultBundle) {
 
@@ -268,10 +265,35 @@ public void onFailure(IMqttToken asyncActionToken,
 
 				}
 			};
-			service.traceDebug(TAG, "Do Real connect!");
-			setConnectingState(true);
-			myClient.connect(connectOptions, invocationContext, listener);
 
+			if (myClient != null) {
+				if (isConnecting ) {
+					service.traceDebug(TAG,
+							"myClient != null and the client is connecting. Connect return directly.");
+					service.traceDebug(TAG,"Connect return:isConnecting:"+isConnecting+".disconnected:"+disconnected);
+					return;
+				}else if(!disconnected){
+					service.traceDebug(TAG,"myClient != null and the client is connected and notify!");
+					doAfterConnectSuccess(resultBundle);
+				}
+				else {					
+					service.traceDebug(TAG, "myClient != null and the client is not connected");
+					service.traceDebug(TAG,"Do Real connect!");
+					setConnectingState(true);
+					myClient.connect(connectOptions, invocationContext, listener);
+				}
+			}
+			
+			// if myClient is null, then create a new connection
+			else {
+				myClient = new MqttAsyncClient(serverURI, clientId,
+						persistence, new AlarmPingSender(service));
+				myClient.setCallback(this);
+
+				service.traceDebug(TAG,"Do Real connect!");
+				setConnectingState(true);
+				myClient.connect(connectOptions, invocationContext, listener);
+			}
 		} catch (Exception e) {
 			handleException(resultBundle, e);
 		}

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

@@ -354,6 +354,18 @@ public void connect(String clientHandle, MqttConnectOptions connectOptions,
   void reconnect() {
 	traceDebug(TAG, "Reconnect to server, client size=" + connections.size());
 	for (MqttConnection client : connections.values()) {
+			traceDebug("Reconnect Client:",
+					client.getClientId() + '/' + client.getServerURI());
+			// persist model connection data to retrieve persistId with
+			// clientHandle;
+			String[] connectionsurl = client.getServerURI().split(":");
+			boolean issll = connectionsurl[0].startsWith("ssl") ? true : false;
+			ModelConnectionPersistence con = ModelConnectionPersistence
+					.createConnection(client.getClientId(),
+							connectionsurl[1].substring(2),
+							Integer.valueOf(connectionsurl[2]),
+							this.getApplicationContext(), issll, null);
+			modelConnections.put(client.getClientHandle(), con);
 		if(this.isOnline()){
 			client.reconnect();
 		}
@@ -623,6 +635,29 @@ public void onCreate() {
 	//create database persistence instance for connections;
 	persistence = new DatabaseConnectionPersistence(this);
 
+	try {
+		List<ModelConnectionPersistence> l = persistence
+				.restoreConnections(this.getApplicationContext());
+		for (ModelConnectionPersistence c : l) {
+			String handle = getClient(c.getServerURI(), c.getId(),
+					c.getCtxId(), null);
+			connections.get(handle).setConnectOptions(
+					c.getConnectionOptions());
+			if (isOnline()) {
+				// we have an internet connection - have another try
+				// at
+				// connecting
+				connect(handle, c.getConnectionOptions(), null, "0");
+			}
+		}
+
+	} catch (ConnectionPersistenceException e) {
+		Log.e("MqttService", e.toString());
+	} catch (MqttSecurityException e) {
+		Log.e("MqttService", e.toString());
+	} catch (MqttException e) {
+		Log.e("MqttService", e.toString());
+	}
   }
 
   /**