From 00ccfaa59d52ac5f32127530122ee83d57e9baa5 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Tue, 5 Nov 2013 16:16:14 +0100
Subject: [PATCH] Small fixes for android app and test app

---
 src/org/linphone/StatusFragment.java        |  4 +++-
 tests/src/org/linphone/test/CallsVideo.java | 12 ++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java
index c2f78ecb8..3f58660c9 100644
--- a/src/org/linphone/StatusFragment.java
+++ b/src/org/linphone/StatusFragment.java
@@ -244,8 +244,10 @@ public class StatusFragment extends Fragment {
 	
 	private String getStatusIconText(LinphoneCore.RegistrationState state) {
 		Context context = getActivity();
-		if (!isAttached)
+		if (!isAttached && LinphoneActivity.isInstanciated())
 			context = LinphoneActivity.instance();
+		else if (!isAttached && LinphoneService.isReady())
+			context = LinphoneService.instance();
 		
 		try {
 			if (state == RegistrationState.RegistrationOk && LinphoneManager.getLcIfManagerNotDestroyedOrNull().getDefaultProxyConfig().isRegistered()) {
diff --git a/tests/src/org/linphone/test/CallsVideo.java b/tests/src/org/linphone/test/CallsVideo.java
index b84d266cd..9dcf7b4e8 100644
--- a/tests/src/org/linphone/test/CallsVideo.java
+++ b/tests/src/org/linphone/test/CallsVideo.java
@@ -51,6 +51,7 @@ public class CallsVideo extends SampleTest {
 		solo.clickOnView(solo.getView(org.linphone.R.id.Call));
 		
 		assertCallIsCorrectlyRunning();
+		assertCallIsRunningWithVideo();
 		
 		solo.clickOnView(solo.getView(org.linphone.R.id.hangUp));
 		solo.waitForActivity("LinphoneActivity", 5000);
@@ -61,7 +62,7 @@ public class CallsVideo extends SampleTest {
 	@LargeTest
 	public void testCDTMFRFC2833InPCMUCall() {
 		disableAllEnabledAudioCodecs();
-		solo.clickOnText(aContext.getString(org.linphone.R.string.pref_codec_pcmu));
+		solo.clickOnText("PCMU");
 		goBackToDialerAfterCodecChanges();
 		solo.sleep(1000);
 		
@@ -138,6 +139,7 @@ public class CallsVideo extends SampleTest {
 		solo.clickOnView(solo.getView(org.linphone.R.id.Call));
 		
 		assertCallIsCorrectlyRunning();
+		assertCallIsRunningWithVideo();
 		
 		solo.clickOnView(solo.getView(org.linphone.R.id.hangUp));
 		solo.waitForActivity("LinphoneActivity", 5000);
@@ -236,6 +238,7 @@ public class CallsVideo extends SampleTest {
 		solo.drag(10, topLayout.getMeasuredWidth() - 10, slidersTop, slidersTop, 10);
 		
 		assertCallIsCorrectlyRunning();
+		assertCallIsRunningWithVideo();
 	}
 	
 	//TODO: Test each video codec
@@ -295,6 +298,7 @@ public class CallsVideo extends SampleTest {
 		solo.clickOnView(solo.getView(org.linphone.R.id.Call));
 		
 		assertCallIsCorrectlyRunning();
+		assertCallIsRunningWithVideo();
 		
 		Assert.assertTrue(solo.getView(org.linphone.R.id.video).isEnabled());
 		solo.clickOnView(solo.getView(org.linphone.R.id.video));
@@ -305,6 +309,11 @@ public class CallsVideo extends SampleTest {
 		solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
 	}
 	
+	private void assertCallIsRunningWithVideo() {
+		LinphoneCall call = LinphoneManager.getLc().getCalls()[0];
+		Assert.assertTrue(call.getCurrentParamsCopy().getVideoEnabled());
+	}
+	
 	private void assertCallIsCorrectlyRunning() {
 		solo.waitForActivity("InCallActivity", 5000);
 		solo.assertCurrentActivity("Expected InCall Activity", InCallActivity.class);
@@ -320,7 +329,6 @@ public class CallsVideo extends SampleTest {
 		}
 		
 		Assert.assertEquals(LinphoneCall.State.StreamsRunning, call.getState());
-		Assert.assertTrue(call.getCurrentParamsCopy().getVideoEnabled());
 	}
 	
 	private void goToSettings() {