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

Fix crash when service is getting killed while in background

Browse source
This commit is contained in:
Sylvain Berfini 2018-03-08 16:39:11 +01:00
parent 2eef6369bf
commit f6c0046ae7
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/android/org/linphone/LinphoneService.java
View file

@ -821,7 +821,6 @@ public final class LinphoneService extends Service {
@Override @Override
public synchronized void onDestroy() { public synchronized void onDestroy() {
if (activityCallbacks != null){ if (activityCallbacks != null){
getApplication().unregisterActivityLifecycleCallbacks(activityCallbacks); getApplication().unregisterActivityLifecycleCallbacks(activityCallbacks);
activityCallbacks = null; activityCallbacks = null;
@ -841,6 +840,12 @@ public final class LinphoneService extends Service {
mNM.cancel(INCALL_NOTIF_ID); mNM.cancel(INCALL_NOTIF_ID);
mNM.cancel(MESSAGE_NOTIF_ID); mNM.cancel(MESSAGE_NOTIF_ID);
// This will prevent the app from crashing if the service gets killed in background mode
if (LinphoneActivity.isInstanciated()) {
Log.w("Service is getting destroyed, finish LinphoneActivity");
LinphoneActivity.instance().finish();
}
super.onDestroy(); super.onDestroy();
} }