From ed627d416e04dbde7c446e88dc7b66849b339fd4 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 18 Mar 2011 10:54:36 +0100
Subject: [PATCH] AddVideo handles already in video directly.

Before that it required a listener.
---
 src/org/linphone/LinphoneManager.java   |  8 ++++++++
 src/org/linphone/ui/AddVideoButton.java | 27 +++++--------------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index e41c617f7..12a23cafe 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -598,6 +598,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		void onCallStateChanged(LinphoneCall call, State state, String message);
 		void onRingerPlayerCreated(MediaPlayer mRingerPlayer);
 		void onDisplayStatus(String message);
+		void onAlreadyInVideoCall();
 	}
 
 	public interface EcCalibrationListener {
@@ -803,4 +804,11 @@ public final class LinphoneManager implements LinphoneCoreListener {
 
 		e.commit();
 	}
+
+	public void addVideo() {
+		if (!LinphoneManager.getLc().isIncall()) return;
+		if (!reinviteWithVideo()) {
+			serviceListener.onAlreadyInVideoCall();
+		}
+	}
 }
diff --git a/src/org/linphone/ui/AddVideoButton.java b/src/org/linphone/ui/AddVideoButton.java
index 6a2c8fec2..b3cad9c8c 100644
--- a/src/org/linphone/ui/AddVideoButton.java
+++ b/src/org/linphone/ui/AddVideoButton.java
@@ -26,35 +26,18 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ImageButton;
 
+/**
+ * @author Guillaume Beraudo
+ *
+ */
 public class AddVideoButton extends ImageButton implements OnClickListener {
 
-	private AlreadyInVideoCallListener alreadyInVideoCallListener;
-
 	public AddVideoButton(Context context, AttributeSet attrs) {
 		super(context, attrs);
 		setOnClickListener(this);
 	}
 
 	public void onClick(View v) {
-		if (!LinphoneManager.getLc().isIncall()) return;
-
-		// If not in video call; try to reinvite with video
-		boolean alreadyInVideoCall = !LinphoneManager.reinviteWithVideo();
-		if (alreadyInVideoCall && alreadyInVideoCallListener != null) {
-			// In video call; going back to video call activity
-			alreadyInVideoCallListener.onAlreadyInVideoCall();
-		}
+		LinphoneManager.getInstance().addVideo();
 	}
-
-	
-	public void setOnAlreadyInVideoCallListener(AlreadyInVideoCallListener listener) {
-		this.alreadyInVideoCallListener = listener;
-	}
-
-
-
-	public static interface AlreadyInVideoCallListener {
-		void onAlreadyInVideoCall();
-	}
-
 }