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

Reworking Contact read access

Browse source
This commit is contained in:
Erwan Croze 2016-12-27 10:43:14 +01:00
parent 696319453d
commit b6fe5b6c2a
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1227,7 +1227,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
int readContactsI = -1; int readContactsI = -1;
for (int i = 0; i < permissions.length; i++) { for (int i = 0; i < permissions.length; i++) {
Log.i("[Permission] " + permissions[i] + " is " + (grantResults[i] == PackageManager.PERMISSION_GRANTED ? "granted" : "denied")); Log.i("[Permission] " + permissions[i] + " is " + (grantResults[i] == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));
if (permissions[i] == Manifest.permission.READ_CONTACTS) if (permissions[i].compareTo(Manifest.permission.READ_CONTACTS) == 0)
readContactsI = i; readContactsI = i;
} }
@ -1247,14 +1247,6 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
} }
break; break;
case PERMISSIONS_READ_EXTERNAL_STORAGE_DEVICE_RINGTONE: case PERMISSIONS_READ_EXTERNAL_STORAGE_DEVICE_RINGTONE:
if (readContactsI >= 0 && grantResults[readContactsI] == PackageManager.PERMISSION_GRANTED) {
ContactsManager.getInstance().enableContactsAccess();
}
if (!fetchedContactsOnce) {
ContactsManager.getInstance().enableContactsAccess();
ContactsManager.getInstance().fetchContactsAsync();
fetchedContactsOnce = true;
}
if (permissions[0].compareTo(Manifest.permission.READ_EXTERNAL_STORAGE) != 0) if (permissions[0].compareTo(Manifest.permission.READ_EXTERNAL_STORAGE) != 0)
break; break;
boolean enableRingtone = (grantResults[0] == PackageManager.PERMISSION_GRANTED); boolean enableRingtone = (grantResults[0] == PackageManager.PERMISSION_GRANTED);
@ -1266,6 +1258,14 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
((SettingsFragment) fragment).startEchoTester(); ((SettingsFragment) fragment).startEchoTester();
break; break;
} }
if (readContactsI >= 0 && grantResults[readContactsI] == PackageManager.PERMISSION_GRANTED) {
ContactsManager.getInstance().enableContactsAccess();
if (!fetchedContactsOnce) {
ContactsManager.getInstance().enableContactsAccess();
ContactsManager.getInstance().fetchContactsAsync();
fetchedContactsOnce = true;
}
}
} }
@Override @Override