commit 3874e557ab7b54f78566363f6deeb3d08933f5dd
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Nov 04 17:20:12 2013 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Nov 04 17:20:12 2013 -0500
tree 2bbdd1196d8c8a4ac8cdfde37299f0c051c5f498
parent 72e3732126bed85c98ded7cbdd958f5523d6c3de

* #33928: refactor recording callback

src/org/sflphone/model/BubblesView.java

diff --git a/src/org/sflphone/model/BubblesView.java b/src/org/sflphone/model/BubblesView.java
index c53f18a..6c2923f 100644
--- a/src/org/sflphone/model/BubblesView.java
+++ b/src/org/sflphone/model/BubblesView.java
@@ -370,7 +370,8 @@
                     return true;

                 case Bubble.actions.RECORD:

                     try {

-                        callback.mCallbacks.getService().toggleRecordingCall(expand.getCallID());

+                        boolean isRecording = callback.mCallbacks.getService().toggleRecordingCall(expand.getCallID());

+                        ((BubbleUser) expand).associated_call.setRecording(isRecording);

                     } catch (RemoteException e1) {

                         e1.printStackTrace();

                     }

src/org/sflphone/model/Conference.java

diff --git a/src/org/sflphone/model/Conference.java b/src/org/sflphone/model/Conference.java
index 9ff5570..3303d4b 100644
--- a/src/org/sflphone/model/Conference.java
+++ b/src/org/sflphone/model/Conference.java
@@ -146,7 +146,10 @@
     }
 
     public boolean isRecording() {
-        return recording;
+        if(hasMultipleParticipants())
+            return recording;
+        else
+            return participants.get(0).isRecording();
     }
 
     public boolean isOnGoing() {

src/org/sflphone/model/SipCall.java

diff --git a/src/org/sflphone/model/SipCall.java b/src/org/sflphone/model/SipCall.java
index 63989f5..f70649b 100644
--- a/src/org/sflphone/model/SipCall.java
+++ b/src/org/sflphone/model/SipCall.java
@@ -338,7 +338,7 @@
 
         public static SipCall buildMyselfCall(ContentResolver cr, String displayName) {
             return new SipCall("default", null, SipCall.state.CALL_TYPE_UNDETERMINED, state.CALL_STATE_NONE, state.MEDIA_STATE_NONE,
-                    CallContact.ContactBuilder.buildUserContact(cr, displayName));
+                    CallContact.ContactBuilder.buildUserContact(cr));
 
         }