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

Fix linphone icon showing despite service stopped.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-12-08 10:37:12 +01:00
parent eba187eedb
commit 835e757c86
1 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -200,7 +200,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
mIncallNotif.when=System.currentTimeMillis(); mIncallNotif.when=System.currentTimeMillis();
mIncallNotif.flags &= Notification.FLAG_ONGOING_EVENT; mIncallNotif.flags &= Notification.FLAG_ONGOING_EVENT;
mIncallNotif.setLatestEventInfo(this, mNotificationTitle, getString(notificationTextId), mNotifContentIntent); mIncallNotif.setLatestEventInfo(this, mNotificationTitle, getString(notificationTextId), mNotifContentIntent);
mNM.notify(INCALL_NOTIF_ID, mIncallNotif); notifyWrapper(INCALL_NOTIF_ID, mIncallNotif);
} }
public void refreshIncallIcon(LinphoneCall currentCall) { public void refreshIncallIcon(LinphoneCall currentCall) {
@ -267,7 +267,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
// continue // continue
} }
mNM.notify(id, notification); notifyWrapper(id, notification);
} }
/** /**
@ -320,7 +320,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
} }
} }
private void sendNotification(int level, int textId) { private synchronized void sendNotification(int level, int textId) {
mNotif.iconLevel = level; mNotif.iconLevel = level;
mNotif.when=System.currentTimeMillis(); mNotif.when=System.currentTimeMillis();
String text = getString(textId); String text = getString(textId);
@ -332,9 +332,22 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
} }
mNotif.setLatestEventInfo(this, mNotificationTitle, text, mNotifContentIntent); mNotif.setLatestEventInfo(this, mNotificationTitle, text, mNotifContentIntent);
mNM.notify(NOTIF_ID, mNotif); notifyWrapper(NOTIF_ID, mNotif);
} }
/**
* Wrap notifier to avoid setting the linphone icons while the service
* is stopping. When the (rare) bug is triggered, the linphone icon is
* present despite the service is not running. To trigger it one could
* stop linphone as soon as it is started. Transport configured with TLS.
*/
private synchronized void notifyWrapper(int id, Notification notification) {
if (instance != null) {
mNM.notify(id, notification);
} else {
Log.i("Service not ready, discarding notification");
}
}
@ -344,15 +357,16 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
} }
@Override @Override
public void onDestroy() { public synchronized void onDestroy() {
super.onDestroy(); instance=null;
LinphoneManager.getLc().setPresenceInfo(0, null, OnlineStatus.Offline);
LinphoneManager.destroy();
// Make sure our notification is gone. // Make sure our notification is gone.
stopForegroundCompat(NOTIF_ID); stopForegroundCompat(NOTIF_ID);
mNM.cancel(INCALL_NOTIF_ID); mNM.cancel(INCALL_NOTIF_ID);
LinphoneManager.getLcIfManagerNotDestroyedOrNull().setPresenceInfo(0, null, OnlineStatus.Offline); super.onDestroy();
LinphoneManager.destroy();
instance=null;
} }
@ -392,6 +406,10 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
public void onRegistrationStateChanged(final RegistrationState state, public void onRegistrationStateChanged(final RegistrationState state,
final String message) { final String message) {
if (instance == null) {
Log.i("Service not ready, discarding registration state change to ",state.toString());
return;
}
if (state == RegistrationState.RegistrationOk && LinphoneManager.getLc().getDefaultProxyConfig().isRegistered()) { if (state == RegistrationState.RegistrationOk && LinphoneManager.getLc().getDefaultProxyConfig().isRegistered()) {
sendNotification(IC_LEVEL_ORANGE, R.string.notification_registered); sendNotification(IC_LEVEL_ORANGE, R.string.notification_registered);
} }
@ -412,6 +430,10 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
public void onCallStateChanged(final LinphoneCall call, final State state, final String message) { public void onCallStateChanged(final LinphoneCall call, final State state, final String message) {
if (instance == null) {
Log.i("Service not ready, discarding call state change to ",state.toString());
return;
}
if (state == LinphoneCall.State.IncomingReceived) { if (state == LinphoneCall.State.IncomingReceived) {
//wakeup linphone //wakeup linphone
startActivity(new Intent() startActivity(new Intent()