Fixed composable identities

pull/147/head
M66B 7 years ago
parent a2e585b0ed
commit e668ae6fa1

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

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

Loading…
Cancel
Save