mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 12:44:42 +00:00
Code Issues Releases Wiki Activity

Fixed identity selection compose

Browse source
This commit is contained in:
M66B 2018-11-09 12:21:12 +00:00
parent 40501d9941
commit 31f4445773
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/DaoIdentity.java
View file

@ -35,9 +35,10 @@ public interface DaoIdentity {
@Query("SELECT identity.* FROM identity" + @Query("SELECT identity.* FROM identity" +
" JOIN account ON account.id = identity.account" + " JOIN account ON account.id = identity.account" +
" WHERE account.synchronize = :synchronize" + " WHERE (:account IS NULL OR account.id = :account)" +
" AND account.synchronize = :synchronize" +
" AND identity.synchronize = :synchronize") " AND identity.synchronize = :synchronize")
LiveData<List<EntityIdentity>> liveIdentities(boolean synchronize); LiveData<List<EntityIdentity>> liveIdentities(Long account, boolean synchronize);
@Query("SELECT * FROM identity") @Query("SELECT * FROM identity")
List<EntityIdentity> getIdentities(); List<EntityIdentity> getIdentities();

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

@ -1299,8 +1299,8 @@ public class FragmentCompose extends FragmentEx {
DB db = DB.getInstance(getContext()); DB db = DB.getInstance(getContext());
db.identity().liveIdentities(true).removeObservers(getViewLifecycleOwner()); db.identity().liveIdentities(result.draft.account, true).removeObservers(getViewLifecycleOwner());
db.identity().liveIdentities(true).observe(getViewLifecycleOwner(), new Observer<List<EntityIdentity>>() { db.identity().liveIdentities(result.draft.account, true).observe(getViewLifecycleOwner(), new Observer<List<EntityIdentity>>() {
@Override @Override
public void onChanged(@Nullable List<EntityIdentity> identities) { public void onChanged(@Nullable List<EntityIdentity> identities) {
if (identities == null) if (identities == null)

2
app/src/main/java/eu/faircode/email/FragmentSetup.java
View file

@ -354,7 +354,7 @@ public class FragmentSetup extends FragmentEx {
} }
}); });
db.identity().liveIdentities(true).observe(getViewLifecycleOwner(), new Observer<List<EntityIdentity>>() { db.identity().liveIdentities(null, true).observe(getViewLifecycleOwner(), new Observer<List<EntityIdentity>>() {
@Override @Override
public void onChanged(@Nullable List<EntityIdentity> identities) { public void onChanged(@Nullable List<EntityIdentity> identities) {
boolean done = (identities != null && identities.size() > 0); boolean done = (identities != null && identities.size() > 0);