Case insensitive canonical email addresses

pull/152/head
M66B 6 years ago
parent f0e8e6211b
commit c4e6c3f27f

@ -56,7 +56,7 @@ public interface DaoIdentity {
@Query("SELECT * FROM identity WHERE id = :id") @Query("SELECT * FROM identity WHERE id = :id")
EntityIdentity getIdentity(long id); EntityIdentity getIdentity(long id);
@Query("SELECT * FROM identity WHERE account = :account AND email = :email") @Query("SELECT * FROM identity WHERE account = :account AND email = :email COLLATE NOCASE")
EntityIdentity getIdentity(long account, String email); EntityIdentity getIdentity(long account, String email);
@Query("SELECT COUNT(*) FROM identity WHERE synchronize") @Query("SELECT COUNT(*) FROM identity WHERE synchronize")

@ -651,7 +651,7 @@ public class Helper {
if (extra.length > 0) if (extra.length > 0)
a[0] = extra[0]; a[0] = extra[0];
} }
return TextUtils.join("@", a); return TextUtils.join("@", a).toLowerCase();
} }
static void writeText(File file, String content) throws IOException { static void writeText(File file, String content) throws IOException {

Loading…
Cancel
Save