From 40ee88eba508ec3ee585f15d6d19cb89d3fab75a Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Tue, 31 Jan 2017 14:02:26 +0100 Subject: [PATCH] Fix crash if linphoneService was not ready on init of contactsManager --- src/org/linphone/LinphoneActivity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index a226731a2..75265e1a6 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -183,10 +183,12 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick if (getPackageManager().checkPermission(Manifest.permission.WRITE_SYNC_SETTINGS, getPackageName()) != PackageManager.PERMISSION_GRANTED) { checkSyncPermission(); } else { - ContactsManager.getInstance().initializeSyncAccount(getApplicationContext(), getContentResolver()); + if (LinphoneService.isReady()) + ContactsManager.getInstance().initializeSyncAccount(getApplicationContext(), getContentResolver()); } } else { - ContactsManager.getInstance().initializeContactManager(getApplicationContext(), getContentResolver()); + if (LinphoneService.isReady()) + ContactsManager.getInstance().initializeContactManager(getApplicationContext(), getContentResolver()); } setContentView(R.layout.main);