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

Fix destroy of ContactsManager in LinphoneManager

Browse source
This commit is contained in:
Erwan Croze 2017-05-18 15:59:41 +02:00
parent ca572887b2
commit 8b719d2011
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/android/org/linphone/LinphoneManager.java
View file

@ -1098,13 +1098,13 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
} }
public static void ContactsManagerDestroy() { public static void ContactsManagerDestroy() {
if (ContactsManager.getInstance() != null) if (LinphoneManager.instance != null && LinphoneManager.instance.mServiceContext != null)
ContactsManager.getInstance().destroy(); LinphoneManager.instance.mServiceContext.getContentResolver().unregisterContentObserver(ContactsManager.getInstance());
ContactsManager.getInstance().destroy();
} }
public static void BluetoothManagerDestroy() { public static void BluetoothManagerDestroy() {
if (BluetoothManager.getInstance() != null) BluetoothManager.getInstance().destroy();
BluetoothManager.getInstance().destroy();
} }
public static synchronized void destroy() { public static synchronized void destroy() {

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

@ -799,7 +799,6 @@ public final class LinphoneService extends Service {
} }
instance = null; instance = null;
getContentResolver().unregisterContentObserver(ContactsManager.getInstance());
LinphoneManager.destroy(); LinphoneManager.destroy();
// Make sure our notification is gone. // Make sure our notification is gone.