securesipcall: Hold references to SipCall and SecureSiCall in conferences.

Refs #40939

src/org/sflphone/client/CallActivity.java

@@ -246,9 +246,7 @@ public class CallActivity extends FragmentActivity implements IMFragment.Callbac
 
     @Override
     public void updateDisplayedConference(Conference c) {
-        Log.e(TAG, "toUpdate.getParticipants() :"+ c.getParticipants().size());
         if(mDisplayedConference.equals(c)){
-            Log.e(TAG, "It's equal");
             mDisplayedConference = c;
         }
     }

src/org/sflphone/fragments/CallFragment.java

@@ -283,9 +283,10 @@ public class CallFragment extends CallableWrapperFragment implements CallInterfa
     public void displaySAS(Conference updated, final String securedCallID) {
         Log.i(TAG, "displaySAS");
         mCallbacks.updateDisplayedConference(updated);
-        SecureSipCall display = (SecureSipCall) getConference().getCallById(securedCallID);
+        SipCall call = getConference().getCallById(securedCallID);
 
-        if (display != null) {
+        if (call != null && call instanceof SecureSipCall) {
+            SecureSipCall display = (SecureSipCall) call;
             if (!display.isConfirmedSAS()) {
                 final Button sas = (Button) getView().findViewById(R.id.confirm_sas);
                 sas.setText("Confirm SAS: " + display.getSAS());

src/org/sflphone/model/Conference.java

@@ -96,7 +96,17 @@ public class Conference implements Parcelable {
     public void writeToParcel(Parcel out, int flags) {
         out.writeString(id);
         out.writeInt(mConfState);
-        out.writeTypedList(participants);
+        ArrayList<SipCall> normal_calls = new ArrayList<SipCall>();
+        ArrayList<SecureSipCall> secure_calls = new ArrayList<SecureSipCall>();
+
+        for(SipCall part : participants){
+            if(part instanceof SecureSipCall)
+                secure_calls.add((SecureSipCall) part);
+            else
+                normal_calls.add(part);
+        }
+        out.writeTypedList(secure_calls);
+        out.writeTypedList(normal_calls);
         out.writeByte((byte) (recording ? 1 : 0));
         out.writeTypedList(messages);
     }
@@ -116,7 +126,10 @@ public class Conference implements Parcelable {
         participants = new ArrayList<SipCall>();
         id = in.readString();
         mConfState = in.readInt();
+        ArrayList<SecureSipCall> tmp = new ArrayList<SecureSipCall>();
+        in.readTypedList(tmp, SecureSipCall.CREATOR);
         in.readTypedList(participants, SipCall.CREATOR);
+        participants.addAll(tmp);
         recording = in.readByte() == 1 ? true : false;
         messages = new ArrayList<SipMessage>();
         in.readTypedList(messages, SipMessage.CREATOR);

src/org/sflphone/model/SecureSipCall.java

@@ -85,7 +85,7 @@ public class SecureSipCall extends SipCall {
 
 
     public SecureSipCall(SipCall call, Bundle secure){
-        super(call.getBundle());
+        super(call);
         confirmedSAS = secure.getBoolean(SecureSipCall.DISPLAY_SAS, false);
         alertIfZrtpNotSupported = secure.getBoolean(SecureSipCall.DISPLAY_WARNING_ZRTP_NOT_SUPPORTED, false);
         displaySASOnHold = secure.getBoolean(SecureSipCall.DISPLAY_SAS_ONCE, false);

src/org/sflphone/model/SipCall.java

@@ -56,6 +56,17 @@ public class SipCall implements Parcelable {
     private int mCallType;
     private int mCallState = state.CALL_STATE_NONE;
 
+    public SipCall(SipCall call) {
+        mCallID = call.mCallID;
+        mAccount = call.mAccount;
+        mContact = call.mContact;
+        isRecording = call.isRecording;
+        timestampStart_ = call.timestampStart_;
+        timestampEnd_ = call.timestampEnd_;
+        mCallType = call.mCallType;
+        mCallState = call.mCallState;
+    }
+
 
     public boolean isSecured() {
         return false;