commit cd8fb919dae49475093e29cee877ee16051a5b7e
author alision <alexandre.lision@savoirfairelinux.com> Fri Jun 28 14:43:51 2013 -0400
committer alision <alexandre.lision@savoirfairelinux.com> Fri Jun 28 14:43:51 2013 -0400
tree b343a7fb1c4700c25868ac63fe2a28208fe09fc8
parent df1dac91353af971d2608970e174339f1f03f6f1

* #26577 calls do not appear both in and outside of conference
* #26286 possibility to hangup a conference

src/com/savoirfairelinux/sflphone/model/Conference.java

diff --git a/src/com/savoirfairelinux/sflphone/model/Conference.java b/src/com/savoirfairelinux/sflphone/model/Conference.java
index 02d06c7..4418210 100644
--- a/src/com/savoirfairelinux/sflphone/model/Conference.java
+++ b/src/com/savoirfairelinux/sflphone/model/Conference.java
@@ -1,6 +1,8 @@
 package com.savoirfairelinux.sflphone.model;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 
 import android.os.Parcel;
@@ -60,6 +62,13 @@
         participants = new ArrayList<SipCall>();
     }
 
+    public Conference(Conference c) {
+        id = c.id;
+        state = c.state;
+        participants = new ArrayList<SipCall>(c.participants);
+        recording = c.recording;
+    }
+
     public String getId() {
         return id;
     }
@@ -69,7 +78,7 @@
     }
 
     public String getState() {
-        if(participants.size() == 1){
+        if (participants.size() == 1) {
             return participants.get(0).getCallStateString();
         }
         return state;
@@ -84,16 +93,16 @@
     }
 
     public boolean contains(String callID) {
-        for (int i = 0 ; i < participants.size() ; ++i){
-            if(participants.get(i).getCallId().contentEquals(callID))
+        for (int i = 0; i < participants.size(); ++i) {
+            if (participants.get(i).getCallId().contentEquals(callID))
                 return true;
         }
         return false;
     }
 
     public SipCall getCall(String callID) {
-        for (int i = 0 ; i < participants.size() ; ++i){
-            if(participants.get(i).getCallId().contentEquals(callID))
+        for (int i = 0; i < participants.size(); ++i) {
+            if (participants.get(i).getCallId().contentEquals(callID))
                 return participants.get(i);
         }
         return null;
@@ -104,7 +113,7 @@
     }
 
     public boolean isOnHold() {
-        if(participants.size() == 1 && participants.get(0).isOnHold())
+        if (participants.size() == 1 && participants.get(0).isOnHold())
             return true;
         return state.contentEquals("HOLD");
     }
@@ -118,12 +127,12 @@
     }
 
     public boolean isOnGoing() {
-        if(participants.size() == 1 && participants.get(0).isOngoing())
+        if (participants.size() == 1 && participants.get(0).isOngoing())
             return true;
-        
+
         if (participants.size() > 1)
             return true;
-        
+
         return false;
     }