commit 2cd17d3482a136b2cc8ef1e0b1faa019b82ed0d6
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Thu Feb 27 15:57:20 2014 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Thu Feb 27 15:57:20 2014 -0500
tree cdebd51052065006c7309c153bc1fd645e989428
parent e41ecd4f3a9fec55d16d8c2b8a233479925f7ac9

Remove automatic double hangup

This was introduced in order to prevent the infinite busy ringtone.
Unfortunately it does not fix our sdes issue.

Refs #41441

src/org/sflphone/service/SipService.java

diff --git a/src/org/sflphone/service/SipService.java b/src/org/sflphone/service/SipService.java
index ad45073..125284f 100644
--- a/src/org/sflphone/service/SipService.java
+++ b/src/org/sflphone/service/SipService.java
@@ -360,11 +360,7 @@
                     Log.i(TAG, "SipService.placeCall() thread running...");
                     Conference toAdd;
                     if(call.getAccount().useSecureLayer()){
-                        Bundle secureArgs = new Bundle();
-                        secureArgs.putBoolean(SecureSipCall.DISPLAY_SAS, call.getAccount().getSrtpDetails().getDetailBoolean(AccountDetailSrtp.CONFIG_ZRTP_DISPLAY_SAS));
-                        secureArgs.putBoolean(SecureSipCall.DISPLAY_SAS_ONCE, call.getAccount().getSrtpDetails().getDetailBoolean(AccountDetailSrtp.CONFIG_ZRTP_DISPLAY_SAS_ONCE));
-                        secureArgs.putBoolean(SecureSipCall.DISPLAY_WARNING_ZRTP_NOT_SUPPORTED, call.getAccount().getSrtpDetails().getDetailBoolean(AccountDetailSrtp.CONFIG_ZRTP_NOT_SUPP_WARNING));
-                        SecureSipCall secureCall = new SecureSipCall(call, secureArgs);
+                        SecureSipCall secureCall = new SecureSipCall(call);
                         toAdd = new Conference(secureCall);
                     } else {
                         toAdd = new Conference(call);
@@ -404,13 +400,13 @@
         @Override
         public void hangUp(final String callID) {
             mMediaManager.stopRing();
+            Log.e(TAG, "HANGING UP");
             getExecutor().execute(new SipRunnable() {
                 @Override
                 protected void doRun() throws SameThreadException {
                     Log.i(TAG, "SipService.hangUp() thread running...");
                     callManagerJNI.hangUp(callID);
                     removeCall(callID);
-                    Log.i(TAG, "mConferences.size():"+mConferences.size());
                     if(mConferences.size() == 0) {
                         Log.i(TAG, "No more calls!");
                         mMediaManager.abandonAudioFocus();
@@ -777,6 +773,7 @@
 
         @Override
         public void hangUpConference(final String confID) throws RemoteException {
+            Log.e(TAG, "HANGING UP CONF");
             getExecutor().execute(new SipRunnable() {
                 @Override
                 protected void doRun() throws SameThreadException, RemoteException {