Fix position of onCreate() call on ManagerWait aware activities

This commit is contained in:
Guillaume Beraudo 2011-10-07 14:47:16 +02:00
parent 607a5caafe
commit a3202fd108
5 changed files with 6 additions and 5 deletions

View file

@ -110,7 +110,6 @@ public class ConferenceActivity extends ListActivity implements
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.conferencing); setContentView(R.layout.conferencing);
super.onCreate(savedInstanceState);
confHeaderView = findViewById(R.id.conf_header); confHeaderView = findViewById(R.id.conf_header);
confHeaderView.setOnClickListener(this); confHeaderView.setOnClickListener(this);
@ -128,6 +127,7 @@ public class ConferenceActivity extends ListActivity implements
waitHelper = new LinphoneManagerWaitHelper(this, this); waitHelper = new LinphoneManagerWaitHelper(this, this);
waitHelper.doManagerDependentOnCreate(); waitHelper.doManagerDependentOnCreate();
// workaroundStatusBarBug(); // workaroundStatusBarBug();
super.onCreate(savedInstanceState);
} }
@Override @Override

View file

@ -106,7 +106,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
private LinphoneManagerWaitHelper waitHelper; private LinphoneManagerWaitHelper waitHelper;
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.dialer); setContentView(R.layout.dialer);
useIncallActivity = getResources().getBoolean(R.bool.use_incall_activity); useIncallActivity = getResources().getBoolean(R.bool.use_incall_activity);
@ -160,6 +159,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin
waitHelper = new LinphoneManagerWaitHelper(this, this); waitHelper = new LinphoneManagerWaitHelper(this, this);
waitHelper.doManagerDependentOnCreate(); waitHelper.doManagerDependentOnCreate();
instance = this; instance = this;
super.onCreate(savedInstanceState);
} }
@Override @Override

View file

@ -961,7 +961,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
private LinphoneServiceListener serviceListener; private LinphoneServiceListener serviceListener;
List<LinphoneSimpleListener> simpleListeners; List<LinphoneSimpleListener> simpleListeners;
public ListenerDispatcher(List<LinphoneSimpleListener> simpleListeners) { public ListenerDispatcher(List<LinphoneSimpleListener> simpleListeners) {
this.simpleListeners = simpleListeners; this.simpleListeners = simpleListeners; // yes, really keeps a reference, not a copy
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")

@ -1 +1 @@
Subproject commit 490945660d975abd2520f92a95ef781b1eaff7e3 Subproject commit 0109d8680d1dd3985d03854ee1a9670b355a7ba3

View file

@ -95,11 +95,12 @@ public class TestConferenceActivity extends ConferenceActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
LinphoneManagerWaitHelper.disabled=true; LinphoneManagerWaitHelper.disabled=true;
super.onCreate(savedInstanceState);
//if (!serviceStarted) startService(new Intent(ACTION_MAIN).setClass(this, LinphoneService.class)); //if (!serviceStarted) startService(new Intent(ACTION_MAIN).setClass(this, LinphoneService.class));
findViewById(R.id.toggleMuteMic).setOnClickListener(null); findViewById(R.id.toggleMuteMic).setOnClickListener(null);
findViewById(R.id.toggleSpeaker).setOnClickListener(null); findViewById(R.id.toggleSpeaker).setOnClickListener(null);
super.onCreate(savedInstanceState);
} }