From a3202fd10893737684c0a82f810b6972ec90f779 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Fri, 7 Oct 2011 14:47:16 +0200 Subject: [PATCH] Fix position of onCreate() call on ManagerWait aware activities --- src/org/linphone/ConferenceActivity.java | 2 +- src/org/linphone/DialerActivity.java | 2 +- src/org/linphone/LinphoneManager.java | 2 +- submodules/linphone | 2 +- test/org/linphone/TestConferenceActivity.java | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java index 477878e71..2b481b3d8 100644 --- a/src/org/linphone/ConferenceActivity.java +++ b/src/org/linphone/ConferenceActivity.java @@ -110,7 +110,6 @@ public class ConferenceActivity extends ListActivity implements @Override protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.conferencing); - super.onCreate(savedInstanceState); confHeaderView = findViewById(R.id.conf_header); confHeaderView.setOnClickListener(this); @@ -128,6 +127,7 @@ public class ConferenceActivity extends ListActivity implements waitHelper = new LinphoneManagerWaitHelper(this, this); waitHelper.doManagerDependentOnCreate(); // workaroundStatusBarBug(); + super.onCreate(savedInstanceState); } @Override diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java index fbc1183d4..c2ca73673 100644 --- a/src/org/linphone/DialerActivity.java +++ b/src/org/linphone/DialerActivity.java @@ -106,7 +106,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin private LinphoneManagerWaitHelper waitHelper; public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); setContentView(R.layout.dialer); 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.doManagerDependentOnCreate(); instance = this; + super.onCreate(savedInstanceState); } @Override diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 045c1188e..4ada1ec1c 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -961,7 +961,7 @@ public final class LinphoneManager implements LinphoneCoreListener { private LinphoneServiceListener serviceListener; List simpleListeners; public ListenerDispatcher(List simpleListeners) { - this.simpleListeners = simpleListeners; + this.simpleListeners = simpleListeners; // yes, really keeps a reference, not a copy } @SuppressWarnings("unchecked") diff --git a/submodules/linphone b/submodules/linphone index 490945660..0109d8680 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 490945660d975abd2520f92a95ef781b1eaff7e3 +Subproject commit 0109d8680d1dd3985d03854ee1a9670b355a7ba3 diff --git a/test/org/linphone/TestConferenceActivity.java b/test/org/linphone/TestConferenceActivity.java index 3510de0be..a7cb40db0 100644 --- a/test/org/linphone/TestConferenceActivity.java +++ b/test/org/linphone/TestConferenceActivity.java @@ -95,11 +95,12 @@ public class TestConferenceActivity extends ConferenceActivity { @Override protected void onCreate(Bundle savedInstanceState) { LinphoneManagerWaitHelper.disabled=true; - super.onCreate(savedInstanceState); //if (!serviceStarted) startService(new Intent(ACTION_MAIN).setClass(this, LinphoneService.class)); findViewById(R.id.toggleMuteMic).setOnClickListener(null); findViewById(R.id.toggleSpeaker).setOnClickListener(null); + + super.onCreate(savedInstanceState); }