Let debugging be controlled by setprop.

Use isLoggable.

Author: devrandom

Diff for: .classpath

@@ -7,7 +7,7 @@
 	<classpathentry kind="lib" path="libs/jsoup-1.5.2.jar"/>
 	<classpathentry kind="lib" path="libs/commons-codec.jar"/>
 	<classpathentry kind="lib" path="libs/guava-r09.jar"/>
-	<classpathentry kind="lib" path="libs/asmack-android-7.jar"/>
+	<classpathentry kind="lib" path="libs/asmack-android-7.jar" sourcepath="asmack/build/src/trunk"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

Diff for: src/info/guardianproject/otr/OtrDebugLogger.java

@@ -9,7 +9,7 @@ public class OtrDebugLogger {
     public static boolean errorLog = true;
 
     public static void log(String msg) {
-        if (debugLog)
+        if (debugLog && Log.isLoggable(TAG, Log.DEBUG))
             Log.d(TAG, msg);
     }
 

Diff for: src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java

@@ -41,10 +41,8 @@
 
 import org.apache.harmony.javax.security.auth.callback.Callback;
 import org.apache.harmony.javax.security.auth.callback.CallbackHandler;
-import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.ConnectionConfiguration;
 import org.jivesoftware.smack.ConnectionConfiguration.SecurityMode;
-import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.ConnectionListener;
 import org.jivesoftware.smack.PacketCollector;
 import org.jivesoftware.smack.PacketListener;
@@ -77,7 +75,7 @@
 
 public class XmppConnection extends ImConnection implements CallbackHandler {
 
-    final static String TAG = "Gibberbot.XmppConnection";
+    final static String TAG = "GB.XmppConnection";
     private final static boolean DEBUG_ENABLED = false;
 
     private XmppContactList mContactListManager;
@@ -541,6 +539,7 @@ private void initConnection(String userName, final String password,
 
             @Override
             public void processPacket(Packet packet) {
+                debug(TAG, "receive message");
                 org.jivesoftware.smack.packet.Message smackMessage = (org.jivesoftware.smack.packet.Message) packet;
                 String address = parseAddressBase(smackMessage.getFrom());
                 ChatSession session = findOrCreateSession(address);
@@ -1602,7 +1601,9 @@ protected void setState(int state, ImErrorInfo error) {
     }
 
     public void debug(String tag, String msg) {
-        //Log.d(tag, "" + mGlobalId + " : " + msg);
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log.d(tag, "" + mGlobalId + " : " + msg);
+        }
     }
 
     @Override

Diff for: src/info/guardianproject/otr/app/im/plugin/xmpp/XmppStreamHandler.java

@@ -7,6 +7,7 @@
 import java.util.Map;
 
 import org.jivesoftware.smack.ConnectionListener;
+import org.jivesoftware.smack.PacketInterceptor;
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.packet.Packet;
@@ -27,6 +28,7 @@ public class XmppStreamHandler {
     private long previousIncomingStanzaCount = -1;
     private String sessionId;
     private long incomingStanzaCount = 0;
+    private long outgoingStanzaCount = 0;
 
     public XmppStreamHandler(MyXMPPConnection connection) {
         mConnection = connection;
@@ -112,10 +114,23 @@ public void connectionClosed() {
             }
         });
 
+        mConnection.addPacketInterceptor(new PacketInterceptor() {
+            public void interceptPacket(Packet packet) {
+                if (isSmEnabled)
+                    outgoingStanzaCount++;
+                trace("send " + outgoingStanzaCount + " : " + packet.toXML());
+            }
+        }, new PacketFilter() {
+            public boolean accept(Packet packet) {
+                return true;
+            }
+        });
+        
         mConnection.addPacketListener(new PacketListener() {
             public void processPacket(Packet packet) {
-                incomingStanzaCount++;
-                //debug("" + incomingStanzaCount + " : " + packet.toXML());
+                if (isSmEnabled)
+                    incomingStanzaCount++;
+                trace("recv " + incomingStanzaCount + " : " + packet.toXML());
                 if (packet instanceof StreamHandlingPacket) {
                     StreamHandlingPacket shPacket = (StreamHandlingPacket) packet;
                     String name = shPacket.getElementName();
@@ -132,6 +147,7 @@ public void processPacket(Packet packet) {
                     } else if ("enabled".equals(name)) {
                         debug("sm enabled " + sessionId);
                         incomingStanzaCount = 0;
+                        outgoingStanzaCount = 0;
                         isSmEnabled = true;
                         mConnection.getRoster().setOfflineOnError(false);
                         String resume = shPacket.getAttribute("resume");
@@ -176,7 +192,15 @@ public PacketExtension parseExtension(XmlPullParser parser) throws Exception {
     }
 
     private void debug(String message) {
-        //Log.d(XmppConnection.TAG, message);
+        if (Log.isLoggable(XmppConnection.TAG, Log.DEBUG)) {
+            Log.d(XmppConnection.TAG, message);
+        }
+    }
+
+    private void trace(String message) {
+        if (Log.isLoggable(XmppConnection.TAG, Log.VERBOSE)) {
+            Log.v(XmppConnection.TAG, message);
+        }
     }
 
     static class StreamHandlingPacket extends UnknownPacket {