mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

Fixes in Negotiations

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@7723 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Thiago Camargo
2007-03-27 04:38:57 +00:00
committed by thiago
parent 64f9f574e7
commit 07608bf83c
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/jingle/src/java/org/jivesoftware/sparkplugin/IncomingCall.java
View File

@ -73,6 +73,15 @@ public class IncomingCall implements JingleSessionListener, ChatRoomClosingListe
notificationUI = new GenericNotification("Establishing call. Please wait...", SparkRes.getImageIcon(SparkRes.BUSY_IMAGE)); notificationUI = new GenericNotification("Establishing call. Please wait...", SparkRes.getImageIcon(SparkRes.BUSY_IMAGE));
// Accept the request
try {
session = request.accept();
} catch (XMPPException e) {
Log.error(e);
}
session.addListener(this);
showIncomingCall(request); showIncomingCall(request);
} }
@ -200,8 +209,7 @@ public class IncomingCall implements JingleSessionListener, ChatRoomClosingListe
}); });
incomingCall.getRejectButton().addActionListener(new ActionListener() { incomingCall.getRejectButton().addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
request.reject();
rejectIncomingCall(); rejectIncomingCall();
} }
}); });
@ -215,11 +223,10 @@ public class IncomingCall implements JingleSessionListener, ChatRoomClosingListe
TaskEngine.getInstance().submit(ringer); TaskEngine.getInstance().submit(ringer);
// End after 30 seconds max. // End after 30 seconds max.
TimerTask endTask = new SwingTimerTask() { TimerTask endTask = new SwingTimerTask() {
public void doRun() { public void doRun() {
if(session == null){ if (session == null) {
rejectIncomingCall(); rejectIncomingCall();
} }
} }
@ -241,11 +248,6 @@ public class IncomingCall implements JingleSessionListener, ChatRoomClosingListe
} }
try { try {
// Accept the request
session = request.accept();
session.addListener(this);
// Start the call // Start the call
session.start(); session.start();
} }