From 0f02bb1a145609ae56cc5053cd6cf6be3b14e708 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 12 Oct 2011 10:33:43 +0200 Subject: [PATCH] Fix mute and speaker button state in conference. The states wasn't loaded on activity resume. --- src/org/linphone/ConferenceActivity.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java index 101183bf7..210ddf3f4 100644 --- a/src/org/linphone/ConferenceActivity.java +++ b/src/org/linphone/ConferenceActivity.java @@ -108,6 +108,8 @@ public class ConferenceActivity extends ListActivity implements // } private LinphoneManagerWaitHelper waitHelper; + private ToggleButton mMuteMicButton; + private ToggleButton mSpeakerButton; @Override protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.conferencing); @@ -122,8 +124,10 @@ public class ConferenceActivity extends ListActivity implements findViewById(R.id.conf_simple_transfer).setOnClickListener(this); findViewById(R.id.conf_simple_permute).setOnClickListener(this); - findViewById(R.id.toggleMuteMic).setOnClickListener(this); - findViewById(R.id.toggleSpeaker).setOnClickListener(this); + mMuteMicButton = (ToggleButton) findViewById(R.id.toggleMuteMic); + mMuteMicButton.setOnClickListener(this); + mSpeakerButton = (ToggleButton) findViewById(R.id.toggleSpeaker); + mSpeakerButton.setOnClickListener(this); waitHelper = new LinphoneManagerWaitHelper(this, this); waitHelper.doManagerDependentOnCreate(); @@ -141,6 +145,8 @@ public class ConferenceActivity extends ListActivity implements @Override public void onResumeWhenManagerReady() { registerLinphoneListener(true); + mSpeakerButton.setChecked(LinphoneManager.getInstance().isSpeakerOn()); + mMuteMicButton.setChecked(LinphoneManager.getLc().isMicMuted()); updateCalleeImage(); updateConfState(); updateSimpleControlButtons();