mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed composable identities

This commit is contained in:
M66B 2019-02-03 13:50:17 +00:00
parent a2e585b0ed
commit e668ae6fa1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,8 +37,8 @@ public interface DaoIdentity {
@Query("SELECT identity.*, account.name AS accountName FROM identity" +
" JOIN account ON account.id = identity.account" +
" JOIN folder ON folder.account = identity.account AND folder.type = '" + EntityFolder.DRAFTS + "'" +
" WHERE NOT :synchronize OR account.synchronize")
List<TupleIdentityEx> getComposableIdentities(boolean synchronize);
" WHERE identity.synchronize AND account.synchronize")
List<TupleIdentityEx> getComposableIdentities();
@Query("SELECT * FROM identity WHERE account = :account")
List<EntityIdentity> getIdentities(long account);

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

@ -1487,7 +1487,7 @@ public class FragmentCompose extends FragmentBase {
if ("edit".equals(action))
throw new IllegalStateException("Draft not found hide=" + (result.draft != null));
List<TupleIdentityEx> identities = db.identity().getComposableIdentities(true);
List<TupleIdentityEx> identities = db.identity().getComposableIdentities();
EntityMessage ref = db.message().getMessage(reference);
if (ref == null) {
@ -1752,7 +1752,7 @@ public class FragmentCompose extends FragmentBase {
@Override
protected List<TupleIdentityEx> onExecute(Context context, Bundle args) {
DB db = DB.getInstance(context);
List<TupleIdentityEx> identities = db.identity().getComposableIdentities(true);
List<TupleIdentityEx> identities = db.identity().getComposableIdentities();
if (identities == null)
identities = new ArrayList<>();