Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Small fixes for android app and test app

Browse source
This commit is contained in:
Sylvain Berfini 2013-11-05 16:16:14 +01:00
parent 7836e307a3
commit 00ccfaa59d
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/org/linphone/StatusFragment.java
View file

@ -244,8 +244,10 @@ public class StatusFragment extends Fragment {
private String getStatusIconText(LinphoneCore.RegistrationState state) { private String getStatusIconText(LinphoneCore.RegistrationState state) {
Context context = getActivity(); Context context = getActivity();
if (!isAttached) if (!isAttached && LinphoneActivity.isInstanciated())
context = LinphoneActivity.instance(); context = LinphoneActivity.instance();
else if (!isAttached && LinphoneService.isReady())
context = LinphoneService.instance();
try { try {
if (state == RegistrationState.RegistrationOk && LinphoneManager.getLcIfManagerNotDestroyedOrNull().getDefaultProxyConfig().isRegistered()) { if (state == RegistrationState.RegistrationOk && LinphoneManager.getLcIfManagerNotDestroyedOrNull().getDefaultProxyConfig().isRegistered()) {

12
tests/src/org/linphone/test/CallsVideo.java
View file

@ -51,6 +51,7 @@ public class CallsVideo extends SampleTest {
solo.clickOnView(solo.getView(org.linphone.R.id.Call)); solo.clickOnView(solo.getView(org.linphone.R.id.Call));
assertCallIsCorrectlyRunning(); assertCallIsCorrectlyRunning();
assertCallIsRunningWithVideo();
solo.clickOnView(solo.getView(org.linphone.R.id.hangUp)); solo.clickOnView(solo.getView(org.linphone.R.id.hangUp));
solo.waitForActivity("LinphoneActivity", 5000); solo.waitForActivity("LinphoneActivity", 5000);
@ -61,7 +62,7 @@ public class CallsVideo extends SampleTest {
@LargeTest @LargeTest
public void testCDTMFRFC2833InPCMUCall() { public void testCDTMFRFC2833InPCMUCall() {
disableAllEnabledAudioCodecs(); disableAllEnabledAudioCodecs();
solo.clickOnText(aContext.getString(org.linphone.R.string.pref_codec_pcmu)); solo.clickOnText("PCMU");
goBackToDialerAfterCodecChanges(); goBackToDialerAfterCodecChanges();
solo.sleep(1000); solo.sleep(1000);
@ -138,6 +139,7 @@ public class CallsVideo extends SampleTest {
solo.clickOnView(solo.getView(org.linphone.R.id.Call)); solo.clickOnView(solo.getView(org.linphone.R.id.Call));
assertCallIsCorrectlyRunning(); assertCallIsCorrectlyRunning();
assertCallIsRunningWithVideo();
solo.clickOnView(solo.getView(org.linphone.R.id.hangUp)); solo.clickOnView(solo.getView(org.linphone.R.id.hangUp));
solo.waitForActivity("LinphoneActivity", 5000); solo.waitForActivity("LinphoneActivity", 5000);
@ -236,6 +238,7 @@ public class CallsVideo extends SampleTest {
solo.drag(10, topLayout.getMeasuredWidth() - 10, slidersTop, slidersTop, 10); solo.drag(10, topLayout.getMeasuredWidth() - 10, slidersTop, slidersTop, 10);
assertCallIsCorrectlyRunning(); assertCallIsCorrectlyRunning();
assertCallIsRunningWithVideo();
} }
//TODO: Test each video codec //TODO: Test each video codec
@ -295,6 +298,7 @@ public class CallsVideo extends SampleTest {
solo.clickOnView(solo.getView(org.linphone.R.id.Call)); solo.clickOnView(solo.getView(org.linphone.R.id.Call));
assertCallIsCorrectlyRunning(); assertCallIsCorrectlyRunning();
assertCallIsRunningWithVideo();
Assert.assertTrue(solo.getView(org.linphone.R.id.video).isEnabled()); Assert.assertTrue(solo.getView(org.linphone.R.id.video).isEnabled());
solo.clickOnView(solo.getView(org.linphone.R.id.video)); 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); solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
} }
private void assertCallIsRunningWithVideo() {
LinphoneCall call = LinphoneManager.getLc().getCalls()[0];
Assert.assertTrue(call.getCurrentParamsCopy().getVideoEnabled());
}
private void assertCallIsCorrectlyRunning() { private void assertCallIsCorrectlyRunning() {
solo.waitForActivity("InCallActivity", 5000); solo.waitForActivity("InCallActivity", 5000);
solo.assertCurrentActivity("Expected InCall Activity", InCallActivity.class); solo.assertCurrentActivity("Expected InCall Activity", InCallActivity.class);
@ -320,7 +329,6 @@ public class CallsVideo extends SampleTest {
} }
Assert.assertEquals(LinphoneCall.State.StreamsRunning, call.getState()); Assert.assertEquals(LinphoneCall.State.StreamsRunning, call.getState());
Assert.assertTrue(call.getCurrentParamsCopy().getVideoEnabled());
} }
private void goToSettings() { private void goToSettings() {