Merge pull request #4 from netzme/refactor_kick_process

add interface for Auth Fail handler.

Author: destri8

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

@@ -149,6 +149,8 @@ public void onServiceDisconnected(ComponentName name) {
 
 	private volatile boolean registerReceiver = false;
 	private volatile boolean bindedService = false;
+	
+	private MqttAuthenticationFailureHandler authFailHandler;
 
 	/**
 	 * Constructor - create an MqttAndroidClient that can be used to communicate with an MQTT server on android
@@ -163,8 +165,8 @@ public void onServiceDisconnected(ComponentName name) {
 	 *            identified to the server
 	 */
 	public MqttAndroidClient(Context context, String serverURI,
-			String clientId) {
-		this(context, serverURI, clientId, null, Ack.AUTO_ACK);
+			String clientId, MqttAuthenticationFailureHandler authFailHandler) {
+		this(context, serverURI, clientId, null, Ack.AUTO_ACK, authFailHandler);
 	}
 
 	/**
@@ -183,8 +185,9 @@ public MqttAndroidClient(Context context, String serverURI,
 	 *            how the application wishes to acknowledge a message has been
 	 *            processed
 	 */
-	public MqttAndroidClient(Context ctx, String serverURI, String clientId, Ack ackType) {
-		this(ctx, serverURI, clientId, null, ackType);
+	public MqttAndroidClient(Context ctx, String serverURI, String clientId, Ack ackType, 
+			MqttAuthenticationFailureHandler authFailHandler) {
+		this(ctx, serverURI, clientId, null, ackType, authFailHandler);
 	}
 
 	/**
@@ -202,8 +205,9 @@ public MqttAndroidClient(Context ctx, String serverURI, String clientId, Ack ack
 	 * @param persistence
 	 *            The object to use to store persisted data
 	 */
-	public MqttAndroidClient(Context ctx, String serverURI, String clientId, MqttClientPersistence persistence) {
-		this(ctx, serverURI, clientId, persistence, Ack.AUTO_ACK);
+	public MqttAndroidClient(Context ctx, String serverURI, String clientId, MqttClientPersistence persistence,
+			MqttAuthenticationFailureHandler authFailHandler) {
+		this(ctx, serverURI, clientId, persistence, Ack.AUTO_ACK, authFailHandler);
 	}
 
 	/**
@@ -226,12 +230,14 @@ public MqttAndroidClient(Context ctx, String serverURI, String clientId, MqttCli
 	 *            processed.
 	 */
 	public MqttAndroidClient(Context context, String serverURI,
-			String clientId, MqttClientPersistence persistence, Ack ackType) {
+			String clientId, MqttClientPersistence persistence, Ack ackType, 
+			MqttAuthenticationFailureHandler authFailHandler) {
 		myContext = context;
 		this.serverURI = serverURI;
 		this.clientId = clientId;
 		this.persistence = persistence;
 		messageAck = ackType;
+		this.authFailHandler = authFailHandler;
 	}
 
 	 /**
@@ -286,7 +292,7 @@ public String getServerURI() {
 	@Override
 	public void close() {
 	 if (clientHandle == null) {
-		 clientHandle = mqttService.getClient(serverURI, clientId, myContext.getApplicationInfo().packageName,persistence);
+		 clientHandle = mqttService.getClient(serverURI, clientId, myContext.getApplicationInfo().packageName,persistence, authFailHandler);
 	 }
 	 mqttService.close(clientHandle);
 	}
@@ -452,7 +458,7 @@ private void registerReceiver(BroadcastReceiver receiver) {
 	private void doConnect() {
 		if (clientHandle == null) {
 			clientHandle = mqttService.getClient(serverURI, clientId,myContext.getApplicationInfo().packageName,
-					persistence);
+					persistence, authFailHandler);
 		}
 		mqttService.setTraceEnabled(traceEnabled);
 		mqttService.setTraceCallbackId(clientHandle);

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

@@ -0,0 +1,7 @@
+package org.eclipse.paho.android.service;
+
+public interface MqttAuthenticationFailureHandler {
+	boolean isApplicationAuthenticationFailure();
+
+	void onApplicationAuthenticationFailure();
+}

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

@@ -136,6 +136,8 @@ public void setClientHandle(String clientHandle) {
 
 	private WakeLock wakelock = null;
 	private String wakeLockTag = null;
+	
+	private MqttAuthenticationFailureHandler authFailHandler;
 
 	/**
 	 * Constructor - create an MqttConnection to communicate with MQTT server
@@ -154,13 +156,15 @@ public void setClientHandle(String clientHandle) {
 	 *            the "handle" by which the activity will identify us
 	 */
 	MqttConnection(MqttService service, String serverURI, String clientId,
-			MqttClientPersistence persistence, String clientHandle) {
+			MqttClientPersistence persistence, String clientHandle,
+			MqttAuthenticationFailureHandler authFailHandler) {
 		this.serverURI = serverURI.toString();
 		this.service = service;
 		this.clientId = clientId;
 		this.persistence = persistence;
 		this.clientHandle = clientHandle;
-
+		this.authFailHandler = authFailHandler;
+		
 		StringBuffer buff = new StringBuffer(this.getClass().getCanonicalName());
 		buff.append(" ");
 		buff.append(clientId);
@@ -260,7 +264,11 @@ public void onFailure(IMqttToken asyncActionToken,
 
 					// if connect fail ,try reconnect.
 					if(service.isOnline()){
-						connect(connectOptions, internel_invocationContext,connectActivityToken);
+						if(isAuthenticationFailure()) {
+							authFailHandler.onApplicationAuthenticationFailure();
+						} else {
+							connect(connectOptions, internel_invocationContext, connectActivityToken);
+						}
 					}
 
 				}
@@ -984,7 +992,7 @@ synchronized void reconnect() {
 			resultBundle.putString(
 				MqttServiceConstants.CALLBACK_INVOCATION_CONTEXT, null);
 			resultBundle.putString(MqttServiceConstants.CALLBACK_ACTION,
-				MqttServiceConstants.CONNECT_ACTION);
+					MqttServiceConstants.CONNECT_ACTION);
 
 			try {
 
@@ -1019,20 +1027,11 @@ public void onFailure(IMqttToken asyncActionToken, Throwable exception) {
                                                 } catch(InterruptedException e) {
                                                 }
 
-						if(isNotAuthenticationFailed(exception))
-						{
+						if (isAuthenticationFailure()) {
+							authFailHandler.onApplicationAuthenticationFailure();
+						} else {
 							reconnect();
 						}
-						
-					}
-
-					private boolean isNotAuthenticationFailed(Throwable throwable) {
-						int reasonCode = -1;
-						if(throwable instanceof MqttException) {
-							reasonCode = ((MqttException) throwable).getReasonCode();
-						}
-
-						return reasonCode != MqttException.REASON_CODE_FAILED_AUTHENTICATION;
 					}
 				};
 
@@ -1053,4 +1052,9 @@ private boolean isNotAuthenticationFailed(Throwable throwable) {
 	synchronized void setConnectingState(boolean isConnecting){
 		this.isConnecting = isConnecting; 
 	}
+
+	private boolean isAuthenticationFailure() {
+		return (authFailHandler != null) &&
+				authFailHandler.isApplicationAuthenticationFailure();
+	}
 }

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

@@ -296,11 +296,12 @@ void callbackToActivity(String clientHandle, Status status,
    * @return a string to be used by the Activity as a "handle" for this
    *         MqttConnection
    */
-  public String getClient(String serverURI, String clientId, String contextId,MqttClientPersistence persistence) {
+  public String getClient(String serverURI, String clientId, String contextId, 
+		  MqttClientPersistence persistence, MqttAuthenticationFailureHandler authFailHandler) {
     String clientHandle = serverURI + ":" + clientId+":"+contextId;
     if (!connections.containsKey(clientHandle)) {
-      MqttConnection client = new MqttConnection(this, serverURI,
-          clientId, persistence, clientHandle);
+      MqttConnection client = new MqttConnection(this, serverURI, 
+    		  clientId, persistence, clientHandle, authFailHandler);
       connections.put(clientHandle, client);
     }
     return clientHandle;