msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Merge duplicate contact suggestions

Browse Source
pull/178/head
M66B 5 years ago
parent 18bf595098
commit ba608d4e69
3 changed files with 67 additions and 29 deletions
Show Stats Download Patch File Download Diff File

8
app/src/main/java/eu/faircode/email/DaoContact.java
Unescape View File

@ -57,17 +57,15 @@ public interface DaoContact {
" AND email = :email COLLATE NOCASE")
EntityContact getContact(long account, int type, String email);
@Query("SELECT id AS _id, name, email, NULL AS photo, 1 AS local" +
@Query("SELECT *" +
" FROM contact" +
" WHERE (:account IS NULL OR account = :account)" +
" AND (:type IS NULL OR type = :type)" +
" AND (email LIKE :query COLLATE NOCASE OR name LIKE :query COLLATE NOCASE)" +
" AND state <> " + EntityContact.STATE_IGNORE +
" GROUP BY name, email" +
" ORDER BY" +
" CASE WHEN name IS NULL THEN 1 ELSE 0 END" +
", name COLLATE NOCASE, email COLLATE NOCASE")
Cursor searchContacts(Long account, Integer type, String query);
" LIMIT " + EntityContact.MAX_SUGGEST)
List<EntityContact> searchContacts(Long account, Integer type, String query);
@Insert
long insertContact(EntityContact contact);

2
app/src/main/java/eu/faircode/email/EntityContact.java
Unescape View File

@ -61,6 +61,8 @@ public class EntityContact implements Serializable {
static final int STATE_FAVORITE = 1;
static final int STATE_IGNORE = 2;
static final int MAX_SUGGEST = 50; // per category: Android, local to/from
@PrimaryKey(autoGenerate = true)
public Long id;
@NonNull

86
app/src/main/java/eu/faircode/email/FragmentCompose.java
Unescape View File

@ -35,7 +35,6 @@ import android.content.pm.PackageManager;
import android.content.res.ColorStateList;
import android.database.Cursor;
import android.database.MatrixCursor;
import android.database.MergeCursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
@ -152,10 +151,13 @@ import java.net.UnknownHostException;
import java.security.PrivateKey;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.text.Collator;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@ -740,19 +742,18 @@ public class FragmentCompose extends FragmentBase {
public Cursor runQuery(CharSequence typed) {
Log.i("Suggest contact=" + typed);
MatrixCursor provided = new MatrixCursor(new String[]{"_id", "name", "email", "photo", "local"});
MatrixCursor result = new MatrixCursor(new String[]{"_id", "name", "email", "photo", "local"});
if (typed == null)
return provided;
return result;
String wildcard = "%" + typed + "%";
List<Cursor> cursors = new ArrayList<>();
Map<String, EntityContact> map = new HashMap<>();
boolean contacts = Helper.hasPermission(getContext(), Manifest.permission.READ_CONTACTS);
if (contacts) {
Cursor cursor = resolver.query(
ContactsContract.CommonDataKinds.Email.CONTENT_URI,
new String[]{
ContactsContract.CommonDataKinds.Email.CONTACT_ID,
ContactsContract.Contacts.DISPLAY_NAME,
ContactsContract.CommonDataKinds.Email.DATA,
ContactsContract.Contacts.PHOTO_THUMBNAIL_URI
@ -761,30 +762,67 @@ public class FragmentCompose extends FragmentBase {
" AND (" + ContactsContract.Contacts.DISPLAY_NAME + " LIKE ?" +
" OR " + ContactsContract.CommonDataKinds.Email.DATA + " LIKE ?)",
new String[]{wildcard, wildcard},
"CASE WHEN " + ContactsContract.Contacts.DISPLAY_NAME + " NOT LIKE '%@%' THEN 0 ELSE 1 END" +
", " + ContactsContract.Contacts.DISPLAY_NAME + " COLLATE NOCASE" +
", " + ContactsContract.CommonDataKinds.Email.DATA + " COLLATE NOCASE");
while (cursor != null && cursor.moveToNext())
provided.newRow()
.add(cursor.getLong(0)) // id
.add(cursor.getString(1)) // name
.add(cursor.getString(2)) // email
.add(cursor.getString(3)) // photo
.add(0); // local
null);
while (map.size() < EntityContact.MAX_SUGGEST &&
cursor != null && cursor.moveToNext()) {
EntityContact item = new EntityContact();
item.id = 0L;
item.name = cursor.getString(0);
item.email = cursor.getString(1);
item.avatar = cursor.getString(2);
EntityContact existing = map.get(item.email);
if (existing == null ||
(existing.avatar == null && item.avatar != null))
map.put(item.email, item);
}
}
cursors.add(provided);
List<EntityContact> items = new ArrayList<>();
if (suggest_sent)
cursors.add(db.contact().searchContacts(null, EntityContact.TYPE_TO, wildcard));
items.addAll(db.contact().searchContacts(null, EntityContact.TYPE_TO, wildcard));
if (suggest_received)
cursors.add(db.contact().searchContacts(null, EntityContact.TYPE_FROM, wildcard));
items.addAll(db.contact().searchContacts(null, EntityContact.TYPE_FROM, wildcard));
for (EntityContact item : items)
if (!map.containsKey(item.email))
map.put(item.email, item);
if (cursors.size() == 1)
return cursors.get(0);
else
return new MergeCursor(cursors.toArray(new Cursor[0]));
items = new ArrayList<>(map.values());
final Collator collator = Collator.getInstance(Locale.getDefault());
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
Collections.sort(items, new Comparator<EntityContact>() {
@Override
public int compare(EntityContact i1, EntityContact i2) {
int l = i1.id.compareTo(i2.id);
if (l != 0)
return l;
if (TextUtils.isEmpty(i1.name) && !TextUtils.isEmpty(i2.name))
return 1;
if (!TextUtils.isEmpty(i1.name) && TextUtils.isEmpty(i2.name))
return -1;
int n = collator.compare(i1.name, i2.name);
if (n != 0)
return n;
return collator.compare(i1.email, i2.email);
}
});
for (int i = 0; i < items.size(); i++) {
EntityContact item = items.get(i);
result.newRow()
.add(i + 1) // id
.add(TextUtils.isEmpty(item.name) ? "-" : item.name)
.add(item.email)
.add(item.avatar)
.add(item.id == 0 ? 0 : 1);
}
return result;
}
});

Write Preview
Loading…
Cancel
Save