From b9b0b6134f348f641229feab8773fbd5a17206d4 Mon Sep 17 00:00:00 2001
From: Thiago Camargo <thiago@b35dd754-fafc-0310-a699-88a17e54d16e>
Date: Tue, 27 Mar 2007 16:53:46 +0000
Subject: [PATCH] Fixes in Negotiations and Listeners

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7733 b35dd754-fafc-0310-a699-88a17e54d16e
---
 .../smackx/jingle/IncomingJingleSession.java  | 31 +++++++------------
 .../smackx/jingle/JingleMediaTest.java        |  1 -
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/IncomingJingleSession.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/IncomingJingleSession.java
index b223dee89..70fd71938 100644
--- a/jingle/extension/source/org/jivesoftware/smackx/jingle/IncomingJingleSession.java
+++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/IncomingJingleSession.java
@@ -124,7 +124,6 @@ public class IncomingJingleSession extends JingleSession {
         }
 
         setMediaNeg(new MediaNegotiator(this, payloadTypes));
-
         if (resolver.getType().equals(TransportResolver.Type.rawupd)) {
             setTransportNeg(new TransportNegotiator.RawUdp(this, resolver));
         }
@@ -132,11 +131,6 @@ public class IncomingJingleSession extends JingleSession {
             setTransportNeg(new TransportNegotiator.Ice(this, resolver));
         }
 
-        updatePacketListener();
-
-        // Establish the default state
-        setState(accepting);
-
     }
 
     /**
@@ -161,20 +155,24 @@ public class IncomingJingleSession extends JingleSession {
      * @throws XMPPException
      */
     public void start(JingleSessionRequest initialJingleSessionRequest) throws XMPPException {
+        // Establish the default state
+        setState(accepting);
+
+        updatePacketListener();
+
         Jingle packet = initialJingleSessionRequest.getJingle();
         if (packet != null) {
 
             // Initialize the session information
             setSid(packet.getSid());
 
-            sendAck(packet);
+            respond(packet);
         }
         else {
             throw new XMPPException(
                     "Session request with null Jingle packet.");
         }
-        // Set the new session state
-        setState(pending);
+
     }
 
     /**
@@ -183,18 +181,9 @@ public class IncomingJingleSession extends JingleSession {
      * @throws XMPPException
      */
     public void start() throws XMPPException {
-        start(this.getInitialSessionRequest());
+        start(getInitialSessionRequest());
     }
-
-    /**
-     * Force a call acceptance. Used to accept a hooked call.
-     *
-     * @deprecated Avoid to use this method. Not compliance.
-     */
-    public void accept() {
-        setState(active);
-    }
-
+   
     /**
      * Get the initial Jingle packet request
      *
@@ -233,6 +222,8 @@ public class IncomingJingleSession extends JingleSession {
          * @throws XMPPException
          */
         public Jingle eventInitiate(Jingle inJingle) throws XMPPException {
+            // Set the new session state
+            setState(pending);
             return super.eventInitiate(inJingle);
         }
 
diff --git a/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleMediaTest.java b/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleMediaTest.java
index 99742ecb5..f2d8d8bc9 100644
--- a/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleMediaTest.java
+++ b/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleMediaTest.java
@@ -110,7 +110,6 @@ public class JingleMediaTest extends SmackTestCase {
 
                 IncomingJingleSession incomingJingleSession = (IncomingJingleSession) jm1.getSession(js0.getConnection().getUser());
                 incomingJingleSession.removeAllStateListeners();
-                incomingJingleSession.accept();
 
                 Thread.sleep(15000);