Merge "Fix [Bug 442853]: 'Enable Logging' is not actually implemented Android sample" into develop

Author: Al Stockdill-Mander

org.eclipse.paho.android.service/org.eclipse.paho.android.service.sample/project.properties

@@ -12,4 +12,3 @@
 
 # Project target.
 target=android-19
-android.library.reference.1=../org.eclipse.paho.android.service

org.eclipse.paho.android.service/org.eclipse.paho.android.service.sample/src/org/eclipse/paho/android/service/sample/ClientConnections.java

@@ -309,6 +309,9 @@ private void connectAction(Bundle data) {
     //setServiceNotificationCallback
     client.setServiceNotificationCallback(MyMqttServiceNtfCallback.class);
 
+    //set traceCallback
+    client.setTraceCallback(new MqttTraceCallback());
+    
     connection.addConnectionOptions(conOpt);
     Connections.getInstance(this).addConnection(connection);
     if (doConnect) {

org.eclipse.paho.android.service/org.eclipse.paho.android.service.sample/src/org/eclipse/paho/android/service/sample/Listener.java

@@ -14,10 +14,16 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.LogManager;
+
 import org.eclipse.paho.android.service.sample.R;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttSecurityException;
+
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
@@ -26,6 +32,7 @@
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.RadioGroup;
+
 import org.eclipse.paho.android.service.sample.ActionListener.Action;
 import org.eclipse.paho.android.service.sample.Connection.ConnectionStatus;
 import org.eclipse.paho.android.service.MqttAndroidClient;
@@ -274,7 +281,18 @@ private void enablePahoLogging() {
       InputStream logPropStream = context.getResources().openRawResource(R.raw.jsr47android);
       LogManager.getLogManager().readConfiguration(logPropStream);
       logging = true;
-      clientConnections.invalidateOptionsMenu();
+         
+      HashMap<String, Connection> connections = (HashMap<String,Connection>)Connections.getInstance(context).getConnections();
+      if(!connections.isEmpty()){
+    	  Entry<String, Connection> entry = connections.entrySet().iterator().next();
+    	  Connection connection = (Connection)entry.getValue();
+    	  connection.getClient().setTraceEnabled(true);
+    	  //change menu state.
+    	  clientConnections.invalidateOptionsMenu();
+    	  //Connections.getInstance(context).getConnection(clientHandle).getClient().setTraceEnabled(true);
+      }else{
+    	  Log.i("SampleListener","No connection to enable log in service");
+      }
     }
     catch (IOException e) {
       Log.e("MqttAndroidClient",
@@ -289,6 +307,17 @@ private void enablePahoLogging() {
   private void disablePahoLogging() {
     LogManager.getLogManager().reset();
     logging = false;
+    
+    HashMap<String, Connection> connections = (HashMap<String,Connection>)Connections.getInstance(context).getConnections();
+    if(!connections.isEmpty()){
+  	  Entry<String, Connection> entry = connections.entrySet().iterator().next();
+  	  Connection connection = (Connection)entry.getValue();
+  	  connection.getClient().setTraceEnabled(false);
+  	  //change menu state.
+  	  clientConnections.invalidateOptionsMenu();
+    }else{
+  	  Log.i("SampleListener","No connection to disable log in service");
+    }
     clientConnections.invalidateOptionsMenu();
   }
 

org.eclipse.paho.android.service/org.eclipse.paho.android.service.sample/src/org/eclipse/paho/android/service/sample/MqttTraceCallback.java

@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 1999, 2014 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.eclipse.paho.android.service.sample;
+
+import org.eclipse.paho.android.service.MqttTraceHandler;
+
+import android.util.Log;
+
+public class MqttTraceCallback implements MqttTraceHandler {
+
+	public void traceDebug(java.lang.String arg0, java.lang.String arg1) {
+		Log.i(arg0, arg1);
+	};
+
+	public void traceError(java.lang.String arg0, java.lang.String arg1) {
+		Log.e(arg0, arg1);
+	};
+
+	public void traceException(java.lang.String arg0, java.lang.String arg1,
+			java.lang.Exception arg2) {
+		Log.e(arg0, arg1, arg2);
+	};
+
+}