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

Fix crash if linphoneService was not ready on init of contactsManager

Browse source
This commit is contained in:
Erwan Croze 2017-01-31 14:02:26 +01:00
parent 8df31138f3
commit 40ee88eba5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/org/linphone/LinphoneActivity.java
View file

@ -183,10 +183,12 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
if (getPackageManager().checkPermission(Manifest.permission.WRITE_SYNC_SETTINGS, getPackageName()) != PackageManager.PERMISSION_GRANTED) { if (getPackageManager().checkPermission(Manifest.permission.WRITE_SYNC_SETTINGS, getPackageName()) != PackageManager.PERMISSION_GRANTED) {
checkSyncPermission(); checkSyncPermission();
} else { } else {
ContactsManager.getInstance().initializeSyncAccount(getApplicationContext(), getContentResolver()); if (LinphoneService.isReady())
ContactsManager.getInstance().initializeSyncAccount(getApplicationContext(), getContentResolver());
} }
} else { } else {
ContactsManager.getInstance().initializeContactManager(getApplicationContext(), getContentResolver()); if (LinphoneService.isReady())
ContactsManager.getInstance().initializeContactManager(getApplicationContext(), getContentResolver());
} }
setContentView(R.layout.main); setContentView(R.layout.main);