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

Workaround core instanciation fragility

Browse source 
During core creation the globalstate callback is
triggered before the java object is instantiated.

Code in listener try to access the core object.
This commit is contained in:
Guillaume Beraudo 2011-12-02 11:58:37 +01:00
parent d3bc9e7e6c
commit 1cca9a7b84
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/org/linphone/LinphoneService.java
View file

@ -324,7 +324,8 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
mNotif.iconLevel = level; mNotif.iconLevel = level;
mNotif.when=System.currentTimeMillis(); mNotif.when=System.currentTimeMillis();
String text = getString(textId); String text = getString(textId);
if (text.contains("%s")) { if (text.contains("%s") && LinphoneManager.getLc() != null) {
// Test for null lc is to avoid a NPE when Android mess up badly with the String resources.
LinphoneProxyConfig lpc = LinphoneManager.getLc().getDefaultProxyConfig(); LinphoneProxyConfig lpc = LinphoneManager.getLc().getDefaultProxyConfig();
String id = lpc != null ? lpc.getIdentity() : ""; String id = lpc != null ? lpc.getIdentity() : "";
text = String.format(text, id); text = String.format(text, id);
@ -375,13 +376,16 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
public void onGlobalStateChanged(final GlobalState state, final String message) { public void onGlobalStateChanged(final GlobalState state, final String message) {
if (state == GlobalState.GlobalOn) { if (state == GlobalState.GlobalOn) {
sendNotification(IC_LEVEL_OFFLINE, R.string.notification_started); sendNotification(IC_LEVEL_OFFLINE, R.string.notification_started);
mHandler.post(new Runnable() { // Slightly delay the propagation of the state change.
// This is to let the linphonecore finish to be created
// in the java part.
mHandler.postDelayed(new Runnable() {
public void run() { public void run() {
if (guiListener() != null) if (guiListener() != null)
guiListener().onGlobalStateChangedToOn(message); guiListener().onGlobalStateChangedToOn(message);
} }
}); }, 50);
} }
} }