Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-01 06:38:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Used untrusted group instead relation

Browse Source
This commit is contained in:
M66B
2019-07-21 10:31:34 +02:00
parent 29246a0f2b
commit adad5602f0
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/eu/faircode/email/ContactInfo.java
View File

@@ -253,6 +253,19 @@ public class ContactInfo {
if (Helper.hasPermission(context, Manifest.permission.READ_CONTACTS)) {
ContentResolver resolver = context.getContentResolver();
long untrusted = -1;
try (Cursor cursor = resolver.query(
ContactsContract.Groups.CONTENT_URI,
new String[]{ContactsContract.Groups._ID},
ContactsContract.Groups.TITLE + " = ? COLLATE NOCASE",
new String[]{"untrusted"},
null)) {
if (cursor != null && cursor.moveToNext())
untrusted = cursor.getLong(0);
}
Log.i("Untrusted group=" + untrusted);
try (Cursor cursor = resolver.query(ContactsContract.CommonDataKinds.Email.CONTENT_URI,
new String[]{
ContactsContract.CommonDataKinds.Photo.CONTACT_ID,
@@ -266,17 +279,22 @@ public class ContactInfo {
String lookupKey = cursor.getString(1);
String email = cursor.getString(2);
Cursor relation = resolver.query(
try (Cursor group = resolver.query(
ContactsContract.Data.CONTENT_URI,
new String[]{ContactsContract.CommonDataKinds.Relation.NAME},
ContactsContract.Data.MIMETYPE + " = '" + ContactsContract.CommonDataKinds.Relation.CONTENT_ITEM_TYPE + "'" +
" AND " + ContactsContract.CommonDataKinds.Relation.NAME + " = 'UNTRUSTED' COLLATE NOCASE" +
" AND " + ContactsContract.CommonDataKinds.Relation.CONTACT_ID + " = ?",
new String[]{Long.toString(contactId)},
null);
if (relation != null && relation.moveToNext()) {
Log.i("Contact email=" + email + " relation=" + relation.getString(0));
continue;
new String[]{ContactsContract.CommonDataKinds.GroupMembership.GROUP_ROW_ID},
ContactsContract.Data.MIMETYPE + " = ?" +
" AND " + ContactsContract.CommonDataKinds.GroupMembership.GROUP_ROW_ID + "= ?" +
" AND " + ContactsContract.CommonDataKinds.GroupMembership.CONTACT_ID + " = ?",
new String[]{
ContactsContract.CommonDataKinds.GroupMembership.CONTENT_ITEM_TYPE,
Long.toString(untrusted),
Long.toString(contactId)
},
null)) {
if (group != null && group.moveToNext()) {
Log.i("Contact email=" + email + " untrusted");
continue;
}
}
Uri uri = ContactsContract.Contacts.getLookupUri(contactId, lookupKey);