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

Replace PackageManager by context on permission check

Browse source
This commit is contained in:
Erwan Croze 2016-11-17 12:34:26 +01:00
parent c73cdc2061
commit 44137ec872
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,13 +32,11 @@ import org.linphone.core.LinphoneFriend;
import org.linphone.core.LinphoneProxyConfig; import org.linphone.core.LinphoneProxyConfig;
import org.linphone.mediastream.Log; import org.linphone.mediastream.Log;
import android.*;
import android.accounts.Account; import android.accounts.Account;
import android.accounts.AccountManager; import android.accounts.AccountManager;
import android.content.ContentProviderOperation; import android.content.ContentProviderOperation;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.database.Cursor; import android.database.Cursor;
import android.database.MatrixCursor; import android.database.MatrixCursor;
@ -162,8 +160,10 @@ public class ContactsManager extends ContentObserver {
} }
public boolean hasContactsAccess() { public boolean hasContactsAccess() {
if (context == null)
return false;
int contacts = context.getPackageManager().checkPermission(android.Manifest.permission.READ_CONTACTS, context.getPackageName()); int contacts = context.getPackageManager().checkPermission(android.Manifest.permission.READ_CONTACTS, context.getPackageName());
return contacts == PackageManager.PERMISSION_GRANTED && !context.getResources().getBoolean(R.bool.force_use_of_linphone_friends); return contacts == context.getPackageManager().PERMISSION_GRANTED && !context.getResources().getBoolean(R.bool.force_use_of_linphone_friends);
} }
public void setLinphoneContactsPrefered(boolean isPrefered) { public void setLinphoneContactsPrefered(boolean isPrefered) {

2
submodules/linphone

@ -1 +1 @@
Subproject commit 76b6d803bc5efff7eb51f846e9806b07a5f2669d Subproject commit 1f5cf605310dc96881aa83ff1f74547a70a4dfa4