From 84ed7ab7fd338f1c3f56c4b32b50cd43286f3453 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 14 Sep 2011 11:37:54 +0200
Subject: [PATCH] Fix mediastreamer2 build.

---
 src/org/linphone/ConferenceActivity.java    | 9 +++++++++
 src/org/linphone/LinphoneManager.java       | 5 +++++
 src/org/linphone/core/LinphoneCallImpl.java | 5 +++++
 3 files changed, 19 insertions(+)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 7178ed79d..ab7573dcb 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -23,9 +23,11 @@ import java.util.Comparator;
 import java.util.List;
 
 import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
+import org.linphone.core.Hacks;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreException;
+import org.linphone.core.Log;
 import org.linphone.core.LinphoneCall.State;
 
 import android.app.AlertDialog;
@@ -49,6 +51,11 @@ public class ConferenceActivity extends ListActivity implements
 
 	// Start Override to test block
 	protected LinphoneCore lc() {
+		final int waitSlice=20;
+		while(!LinphoneManager.isInstanciated()) {
+			Log.d("LinphoneManager is not ready, waiting for ",waitSlice, "ms");
+			Hacks.sleep(waitSlice);
+		}
 		return LinphoneManager.getLc();
 	}
 
@@ -330,6 +337,8 @@ public class ConferenceActivity extends ListActivity implements
 			public void run() {
 				CalleeListAdapter adapter = (CalleeListAdapter) getListAdapter();
 
+				String stateStr = call + " " + state.toString();
+				Log.d("ConferenceActivity received state ",stateStr);
 				switch (state.value()) {
 				case State.ID_INCOMING_RECEIVED:
 				case State.ID_OUTGOING_RINGING:
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index ac15fcd08..6bfe23710 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -1012,4 +1012,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		}
 		
 	}
+
+
+	public static final boolean isInstanciated() {
+		return instance != null;
+	}
 }
diff --git a/src/org/linphone/core/LinphoneCallImpl.java b/src/org/linphone/core/LinphoneCallImpl.java
index acad5a09f..c96593d63 100644
--- a/src/org/linphone/core/LinphoneCallImpl.java
+++ b/src/org/linphone/core/LinphoneCallImpl.java
@@ -128,4 +128,9 @@ class LinphoneCallImpl implements LinphoneCall {
 		LinphoneCallParamsImpl params = new LinphoneCallParamsImpl(getCurrentParamsCopy(nativePtr));
 		return params.localConferenceMode();
 	}
+
+	@Override
+	public String toString() {
+		return "Call " + nativePtr;
+	}
 }