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

Fixed identity selection changing, refactoring

Browse Source
This commit is contained in:
M66B
2019-01-25 15:41:00 +00:00
parent ad9c675fa4
commit 8306b0eb50
5 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1379,7 +1379,7 @@ public class FragmentCompose extends FragmentBase {
if ("edit".equals(action))
throw new IllegalStateException("Draft not found hide=" + (result.draft != null));
List<EntityIdentity> identities = db.identity().getIdentities();
List<TupleIdentityEx> identities = db.identity().getIdentities(true);
EntityMessage ref = db.message().getMessage(reference);
if (ref == null) {
@@ -1640,16 +1640,14 @@ public class FragmentCompose extends FragmentBase {
getActivity().invalidateOptionsMenu();
DB db = DB.getInstance(getContext());
db.identity().liveIdentities().observe(getViewLifecycleOwner(), new Observer<List<TupleIdentityEx>>() {
new SimpleTask<List<TupleIdentityEx>>() {
@Override
public void onChanged(List<TupleIdentityEx> identities) {
protected List<TupleIdentityEx> onExecute(Context context, Bundle args) {
DB db = DB.getInstance(context);
List<TupleIdentityEx> identities = db.identity().getIdentities(true);
if (identities == null)
identities = new ArrayList<>();
Log.i("Set identities=" + identities.size());
// Sort identities
Collections.sort(identities, new Comparator<TupleIdentityEx>() {
@Override
@@ -1664,6 +1662,13 @@ public class FragmentCompose extends FragmentBase {
}
});
return identities;
}
@Override
protected void onExecuted(Bundle args, List<TupleIdentityEx> identities) {
Log.i("Set identities=" + identities.size());
// Show identities
IdentityAdapter adapter = new IdentityAdapter(getContext(), identities);
adapter.setDropDownViewResource(R.layout.spinner_item1_dropdown);
@@ -1677,9 +1682,15 @@ public class FragmentCompose extends FragmentBase {
break;
}
}
}
});
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
}
}.execute(FragmentCompose.this, new Bundle(), "compose:identities");
DB db = DB.getInstance(getContext());
db.attachment().liveAttachments(result.draft.id).observe(getViewLifecycleOwner(),
new Observer<List<EntityAttachment>>() {