Updates smack library to 3.2.2.

6 files changed, 11 insertions, 7 deletions

diff --git a/lib/installer-exclude/smack-src.jar b/lib/installer-exclude/smack-src.jar
deleted file mode 100644
index 5e17d59..0000000
--- a/lib/installer-exclude/smack-src.jar
+++ /dev/null
diff --git a/lib/installer-exclude/smack.jar b/lib/installer-exclude/smack.jar
index afc4f37..2619dcd 100644
--- a/lib/installer-exclude/smack.jar
+++ b/lib/installer-exclude/smack.jar
diff --git a/lib/installer-exclude/smackx-debug.jar b/lib/installer-exclude/smackx-debug.jar
index d226856..67988a0 100644
--- a/lib/installer-exclude/smackx-debug.jar
+++ b/lib/installer-exclude/smackx-debug.jar
diff --git a/lib/installer-exclude/smackx.jar b/lib/installer-exclude/smackx.jar
index fb2a38d..da82d0c 100644
--- a/lib/installer-exclude/smackx.jar
+++ b/lib/installer-exclude/smackx.jar
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/FileElement.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/FileElement.java
index 2fdd84d..934b151 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/FileElement.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/FileElement.java
@@ -97,7 +97,7 @@ public class FileElement
         if (getDate() != null)
         {
             buffer.append("date=\"").append(
-                DelayInformation.UTC_FORMAT
+                DelayInformation.XEP_0091_UTC_FORMAT
                 .format(this.getDate())).append("\" ");
         }
 
@@ -248,7 +248,8 @@ public class FileElement
                     file.setHash(hash);
 
                     if (date != null)
-                        file.setDate(DelayInformation.UTC_FORMAT.parse(date));
+                        file.setDate(DelayInformation.
+                            XEP_0091_UTC_FORMAT.parse(date));
 
                     if (thumbnail != null)
                         file.setThumbnailElement(thumbnail);
diff --git a/test/net/java/sip/communicator/slick/protocol/generic/TestOperationSetFileTransfer.java b/test/net/java/sip/communicator/slick/protocol/generic/TestOperationSetFileTransfer.java
index 4c184c2..c71ed46 100644
--- a/test/net/java/sip/communicator/slick/protocol/generic/TestOperationSetFileTransfer.java
+++ b/test/net/java/sip/communicator/slick/protocol/generic/TestOperationSetFileTransfer.java
@@ -353,7 +353,7 @@ public abstract class TestOperationSetFileTransfer
         if(!enableTestReceiverDecline())
             return;
 
-        logger.trace("Start test: receiver will decline incoming fileTransfer");
+        logger.info("Start test: receiver will decline incoming fileTransfer");
 
         File fileToTransfer = getTempFileToTransfer(12345);
 
@@ -452,9 +452,11 @@ public abstract class TestOperationSetFileTransfer
             fileTransferStatusEvent
                 = senderStatusListener.collectedEvents.get(0);
 
-            assertEquals("Event must be refused"
-                         ,FileTransferStatusChangeEvent.REFUSED
-                         ,fileTransferStatusEvent.getNewStatus());
+            assertTrue("Event must be refused (or failed)"
+                         ,(fileTransferStatusEvent.getNewStatus()
+                            == FileTransferStatusChangeEvent.REFUSED)
+                          || (fileTransferStatusEvent.getNewStatus()
+                                == FileTransferStatusChangeEvent.FAILED));
         }
         finally
         {
@@ -817,7 +819,8 @@ public abstract class TestOperationSetFileTransfer
         /**
          * Creates an instance of this call event collector and registers it
          * with listenedOpSet.
-         * @param listenedOpSet the operation set
+         * @param name of collector
+         * @param statusCollector the event collector
          */
         public FileTransferEventCollector(
             String name, FileTransferStatusEventCollector statusCollector)