From ea1b7c0a6d9417794a88b2a816f3237908d525af Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 6 Dec 2019 08:17:19 +0100
Subject: [PATCH] Certificate email case insensitive

---
 .../main/java/eu/faircode/email/DaoCertificate.java  | 12 ++++--------
 .../java/eu/faircode/email/FragmentCertificates.java |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/DaoCertificate.java b/app/src/main/java/eu/faircode/email/DaoCertificate.java
index 4774844040..632fc4fd1e 100644
--- a/app/src/main/java/eu/faircode/email/DaoCertificate.java
+++ b/app/src/main/java/eu/faircode/email/DaoCertificate.java
@@ -29,20 +29,16 @@ import java.util.List;
 @Dao
 public interface DaoCertificate {
     @Query("SELECT * FROM certificate" +
-            " ORDER BY (email = :email) DESC, email, subject")
-    LiveData<List<EntityCertificate>> liveCertificates(String email);
-
-    @Query("SELECT * FROM certificate" +
-            " WHERE id = :id")
-    EntityCertificate getCertificate(long id);
+            " ORDER BY email, subject")
+    LiveData<List<EntityCertificate>> liveCertificates();
 
     @Query("SELECT * FROM certificate" +
             " WHERE fingerprint = :fingerprint" +
-            " AND email = :email")
+            " AND email = :email COLLATE NOCASE")
     EntityCertificate getCertificate(String fingerprint, String email);
 
     @Query("SELECT * FROM certificate" +
-            " WHERE email = :email")
+            " WHERE email = :email COLLATE NOCASE")
     List<EntityCertificate> getCertificateByEmail(String email);
 
     @Insert
diff --git a/app/src/main/java/eu/faircode/email/FragmentCertificates.java b/app/src/main/java/eu/faircode/email/FragmentCertificates.java
index 1253bef0b6..251928625d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCertificates.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCertificates.java
@@ -94,7 +94,7 @@ public class FragmentCertificates extends FragmentBase {
         super.onActivityCreated(savedInstanceState);
 
         DB db = DB.getInstance(getContext());
-        db.certificate().liveCertificates(null).observe(getViewLifecycleOwner(), new Observer<List<EntityCertificate>>() {
+        db.certificate().liveCertificates().observe(getViewLifecycleOwner(), new Observer<List<EntityCertificate>>() {
             @Override
             public void onChanged(List<EntityCertificate> certificates) {
                 if (certificates == null)