From c6fe5fcaf92dd2b38de67fdc64d4c47f5555f9c3 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 10 Jan 2022 19:41:10 +0100 Subject: [PATCH] Show account/identity dimmed when disabled --- app/src/main/java/eu/faircode/email/AdapterAccount.java | 1 + app/src/main/java/eu/faircode/email/AdapterIdentity.java | 1 + app/src/main/java/eu/faircode/email/DaoIdentity.java | 6 +++--- app/src/main/java/eu/faircode/email/TupleIdentityEx.java | 8 +++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java index 0b4935d3b0..ae748cdfd9 100644 --- a/app/src/main/java/eu/faircode/email/AdapterAccount.java +++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java @@ -190,6 +190,7 @@ public class AdapterAccount extends RecyclerView.Adapter> liveIdentityView(); @Query("SELECT identity.*" + - ", account.name AS accountName, account.category AS accountCategory" + + ", account.name AS accountName, account.category AS accountCategory, account.synchronize AS accountSynchronize" + ", folder.id AS drafts" + " FROM identity" + " JOIN account ON account.id = identity.account" + @@ -41,7 +41,7 @@ public interface DaoIdentity { LiveData> liveIdentities(); @Query("SELECT identity.*" + - ", account.name AS accountName, account.category AS accountCategory" + + ", account.name AS accountName, account.category AS accountCategory, account.synchronize AS accountSynchronize" + ", folder.id AS drafts" + " FROM identity" + " JOIN account ON account.id = identity.account" + @@ -51,7 +51,7 @@ public interface DaoIdentity { LiveData> liveComposableIdentities(); @Query("SELECT identity.*" + - ", account.name AS accountName, account.category AS accountCategory" + + ", account.name AS accountName, account.category AS accountCategory, account.synchronize AS accountSynchronize" + ", folder.id AS drafts" + " FROM identity" + " JOIN account ON account.id = identity.account" + diff --git a/app/src/main/java/eu/faircode/email/TupleIdentityEx.java b/app/src/main/java/eu/faircode/email/TupleIdentityEx.java index e115df18bc..c774bda45f 100644 --- a/app/src/main/java/eu/faircode/email/TupleIdentityEx.java +++ b/app/src/main/java/eu/faircode/email/TupleIdentityEx.java @@ -24,6 +24,7 @@ import java.util.Objects; public class TupleIdentityEx extends EntityIdentity { public String accountName; public String accountCategory; + public boolean accountSynchronize; public Long drafts; @Override @@ -31,9 +32,10 @@ public class TupleIdentityEx extends EntityIdentity { if (obj instanceof TupleIdentityEx) { TupleIdentityEx other = (TupleIdentityEx) obj; return (super.equals(obj) && - Objects.equals(accountCategory, other.accountCategory) && - Objects.equals(accountName, other.accountName) && - Objects.equals(drafts, other.drafts)); + Objects.equals(this.accountCategory, other.accountCategory) && + Objects.equals(this.accountName, other.accountName) && + this.accountSynchronize == other.accountSynchronize && + Objects.equals(this.drafts, other.drafts)); } else return false; }