From 81f82e010d52cebb8272289326cbae91e18250a5 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Fri, 21 Nov 2014 15:40:33 +0100
Subject: [PATCH] Fix #645: Activate ICE, make an audio call and then enable
 video while ICE setup isn't finished.

-> We now wait until no media transition is occurring to re-enable the video button
---
 Classes/LinphoneUI/UIVideoButton.m | 68 +++++++++++-------------------
 1 file changed, 25 insertions(+), 43 deletions(-)

diff --git a/Classes/LinphoneUI/UIVideoButton.m b/Classes/LinphoneUI/UIVideoButton.m
index e84384323..2a9be6509 100644
--- a/Classes/LinphoneUI/UIVideoButton.m
+++ b/Classes/LinphoneUI/UIVideoButton.m
@@ -20,11 +20,14 @@
 #import "UIVideoButton.h"
 #include "LinphoneManager.h"
 
-@implementation UIVideoButton
+@implementation UIVideoButton {
+    BOOL last_update_state;
+}
 
 @synthesize waitView;
 
 - (void)initUIVideoButton {
+    last_update_state = FALSE;
 }
 
 - (id)init{
@@ -94,51 +97,30 @@
 }
 
 - (bool)onUpdate {
-    bool val = false;
+    bool video_enabled = false;
+
 #ifdef VIDEO_ENABLED
-    if(linphone_core_video_enabled([LinphoneManager getLc])) {
-        LinphoneCall* currentCall = linphone_core_get_current_call([LinphoneManager getLc]);
-        if (currentCall) {
-            LinphoneCallState state = linphone_call_get_state(currentCall);
-            switch (state) {
-                case LinphoneCallUpdating:
-                {
-                    [self setEnabled:FALSE];
-                    break;
-                }
-                case LinphoneCallStreamsRunning:
-                {
-                    [waitView stopAnimating];
-                    [self setEnabled:TRUE];
-                    if (linphone_call_params_video_enabled(linphone_call_get_current_params(currentCall))) {
-                        val = true;
-                    }
-                    break;
-                }
-
-                default:
-                {
-                    // Disable button if the call is not running
-                    [self setEnabled:FALSE];
-                    [waitView stopAnimating];
-                    break;
-                }
-
-            }
-        } else {
-            // Disable button if there is no call
-            [self setEnabled:FALSE];
-            [waitView stopAnimating];
-        }
-    } else {
-        // Disable button if video is not enabled
-        [self setEnabled:FALSE];
-        [waitView stopAnimating];
+    LinphoneCall* currentCall = linphone_core_get_current_call([LinphoneManager getLc]);
+    if( linphone_call_media_in_progress(currentCall) ){
+        // YAYA WE PREVENT TRANSITION DUE TO PROGRESS
+    }
+    if( linphone_core_video_enabled([LinphoneManager getLc])
+       && currentCall
+       && !linphone_call_media_in_progress(currentCall)
+       && linphone_call_get_state(currentCall) == LinphoneCallStreamsRunning) {
+        video_enabled = TRUE;
     }
-#else //VIDEO_ENABLED
-    [self setEnabled:FALSE];
 #endif //VIDEO_ENABLED
-    return val;
+
+    [self setEnabled:video_enabled];
+    if( last_update_state != video_enabled )
+        [waitView stopAnimating];
+    if( video_enabled ){
+        video_enabled = linphone_call_params_video_enabled(linphone_call_get_current_params(currentCall));
+    }
+    last_update_state = video_enabled;
+
+    return video_enabled;
 }
 
 - (void)dealloc {