Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 13:47:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Removed drafts warning from identities"

Browse Source 
This reverts commit 1dee158194.
This commit is contained in:
M66B
2020-08-21 07:42:45 +02:00
parent 352f757ede
commit fba7599c8c
4 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/DaoIdentity.java
View File

@@ -32,12 +32,13 @@ public interface DaoIdentity {
@Query(TupleIdentityView.query)
LiveData<List<TupleIdentityView>> liveIdentityView();
@Query("SELECT identity.*, account.name AS accountName" +
@Query("SELECT identity.*, account.name AS accountName, folder.id AS drafts" +
" FROM identity" +
" JOIN account ON account.id = identity.account")
" JOIN account ON account.id = identity.account" +
" LEFT JOIN folder ON folder.account = account.id AND folder.type = '" + EntityFolder.DRAFTS + "'")
LiveData<List<TupleIdentityEx>> liveIdentities();
@Query("SELECT identity.*, account.name AS accountName" +
@Query("SELECT identity.*, account.name AS accountName, folder.id AS drafts" +
" FROM identity" +
" JOIN account ON account.id = identity.account" +
" JOIN folder ON folder.account = identity.account AND folder.type = '" + EntityFolder.DRAFTS + "'" +
@@ -45,7 +46,7 @@ public interface DaoIdentity {
" AND account.synchronize")
LiveData<List<TupleIdentityEx>> liveComposableIdentities();
@Query("SELECT identity.*, account.name AS accountName" +
@Query("SELECT identity.*, account.name AS accountName, folder.id AS drafts" +
" FROM identity" +
" JOIN account ON account.id = identity.account" +
" JOIN folder ON folder.account = identity.account AND folder.type = '" + EntityFolder.DRAFTS + "'" +