msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Show recipient in outgoing folders

Browse Source
pull/146/head
M66B 7 years ago
parent f4f8d33aeb
commit f16a58bdf7
4 changed files with 101 additions and 91 deletions
Show Stats Download Patch File Download Diff File

3
app/src/main/java/eu/faircode/email/ActivityView.java
Unescape View File

@ -547,7 +547,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
draft.content = true; draft.content = true;
draft.received = new Date().getTime(); draft.received = new Date().getTime();
draft.seen = false; draft.seen = false;
draft.answered =false; draft.answered = false;
draft.flagged = false; draft.flagged = false;
draft.ui_seen = false; draft.ui_seen = false;
draft.ui_answered = false; draft.ui_answered = false;
@ -1078,6 +1078,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("account", intent.getLongExtra("account", -1)); args.putLong("account", intent.getLongExtra("account", -1));
args.putLong("folder", intent.getLongExtra("folder", -1)); args.putLong("folder", intent.getLongExtra("folder", -1));
args.putBoolean("outgoing", intent.getBooleanExtra("outgoing", false));
FragmentMessages fragment = new FragmentMessages(); FragmentMessages fragment = new FragmentMessages();
fragment.setArguments(args); fragment.setArguments(args);

3
app/src/main/java/eu/faircode/email/AdapterFolder.java
Unescape View File

@ -158,7 +158,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
lbm.sendBroadcast( lbm.sendBroadcast(
new Intent(ActivityView.ACTION_VIEW_MESSAGES) new Intent(ActivityView.ACTION_VIEW_MESSAGES)
.putExtra("account", folder.account) .putExtra("account", folder.account)
.putExtra("folder", folder.id)); .putExtra("folder", folder.id)
.putExtra("outgoing", folder.isOutgoing()));
} }
@Override @Override

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

@ -109,6 +109,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
private LifecycleOwner owner; private LifecycleOwner owner;
private FragmentManager fragmentManager; private FragmentManager fragmentManager;
private ViewType viewType; private ViewType viewType;
private boolean outgoing;
private IProperties properties; private IProperties properties;
private boolean compact; private boolean compact;
@ -307,7 +308,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
pbLoading.setVisibility(View.GONE); pbLoading.setVisibility(View.GONE);
boolean photo = false; boolean photo = false;
if (avatars) { if (avatars && !outgoing) {
if (message.avatar != null) if (message.avatar != null)
try { try {
ContentResolver resolver = context.getContentResolver(); ContentResolver resolver = context.getContentResolver();
@ -342,7 +343,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
else else
ivFlagged.setVisibility(message.count - message.unflagged > 0 ? View.VISIBLE : View.GONE); ivFlagged.setVisibility(message.count - message.unflagged > 0 ? View.VISIBLE : View.GONE);
tvFrom.setText(MessageHelper.getFormattedAddresses(message.from, !compact)); tvFrom.setText(MessageHelper.getFormattedAddresses(outgoing ? message.to : message.from, !compact));
tvTime.setText(DateUtils.getRelativeTimeSpanString(context, message.received)); tvTime.setText(DateUtils.getRelativeTimeSpanString(context, message.received));
tvSize.setText(message.size == null ? null : Helper.humanReadableByteCount(message.size, true)); tvSize.setText(message.size == null ? null : Helper.humanReadableByteCount(message.size, true));
@ -1361,12 +1362,14 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
} }
} }
AdapterMessage(Context context, LifecycleOwner owner, FragmentManager fragmentManager, ViewType viewType, IProperties properties) { AdapterMessage(Context context, LifecycleOwner owner, FragmentManager fragmentManager,
ViewType viewType, boolean outgoing, IProperties properties) {
super(DIFF_CALLBACK); super(DIFF_CALLBACK);
this.context = context; this.context = context;
this.owner = owner; this.owner = owner;
this.fragmentManager = fragmentManager; this.fragmentManager = fragmentManager;
this.viewType = viewType; this.viewType = viewType;
this.outgoing = outgoing;
this.properties = properties; this.properties = properties;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

177
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -89,8 +89,9 @@ public class FragmentMessages extends FragmentEx {
private FloatingActionButton fab; private FloatingActionButton fab;
private FloatingActionButton fabMore; private FloatingActionButton fabMore;
private long folder = -1;
private long account = -1; private long account = -1;
private long folder = -1;
private boolean outgoing = false;
private String thread = null; private String thread = null;
private boolean found = false; private boolean found = false;
private String search = null; private String search = null;
@ -133,6 +134,7 @@ public class FragmentMessages extends FragmentEx {
Bundle args = getArguments(); Bundle args = getArguments();
account = args.getLong("account", -1); account = args.getLong("account", -1);
folder = args.getLong("folder", -1); folder = args.getLong("folder", -1);
outgoing = args.getBoolean("outgoing", false);
thread = args.getString("thread"); thread = args.getString("thread");
found = args.getBoolean("found", false); found = args.getBoolean("found", false);
search = args.getString("search"); search = args.getString("search");
@ -221,109 +223,112 @@ public class FragmentMessages extends FragmentEx {
LinearLayoutManager llm = new LinearLayoutManager(getContext()); LinearLayoutManager llm = new LinearLayoutManager(getContext());
rvMessage.setLayoutManager(llm); rvMessage.setLayoutManager(llm);
adapter = new AdapterMessage(getContext(), getViewLifecycleOwner(), getFragmentManager(), viewType, new AdapterMessage.IProperties() { adapter = new AdapterMessage(
@Override getContext(), getViewLifecycleOwner(), getFragmentManager(),
public void setExpanded(long id, boolean expand) { viewType, outgoing,
if (expand) { new AdapterMessage.IProperties() {
expanded.add(id); @Override
handleExpand(id); public void setExpanded(long id, boolean expand) {
} else if (expand) {
expanded.remove(id); expanded.add(id);
} handleExpand(id);
} else
@Override expanded.remove(id);
public void setAddresses(long id, boolean show) { }
if (show)
addresses.remove(id);
else
addresses.add(id);
}
@Override @Override
public void setHeaders(long id, boolean show) { public void setAddresses(long id, boolean show) {
if (show) if (show)
headers.add(id); addresses.remove(id);
else else
headers.remove(id); addresses.add(id);
} }
@Override @Override
public void setImages(long id, boolean show) { public void setHeaders(long id, boolean show) {
if (show) if (show)
images.add(id); headers.add(id);
else else
images.remove(id); headers.remove(id);
} }
@Override @Override
public boolean isExpanded(long id) { public void setImages(long id, boolean show) {
return expanded.contains(id); if (show)
} images.add(id);
else
images.remove(id);
}
@Override @Override
public boolean showAddresses(long id) { public boolean isExpanded(long id) {
return !addresses.contains(id); return expanded.contains(id);
} }
@Override @Override
public boolean showHeaders(long id) { public boolean showAddresses(long id) {
return headers.contains(id); return !addresses.contains(id);
} }
@Override @Override
public boolean showImages(long id) { public boolean showHeaders(long id) {
return images.contains(id); return headers.contains(id);
} }
@Override @Override
public void move(long id, String name, boolean type) { public boolean showImages(long id) {
Bundle args = new Bundle(); return images.contains(id);
args.putLong("id", id); }
args.putString("name", name);
args.putBoolean("type", type);
new SimpleTask<MessageTarget>() {
@Override @Override
protected MessageTarget onLoad(Context context, Bundle args) { public void move(long id, String name, boolean type) {
long id = args.getLong("id"); Bundle args = new Bundle();
String name = args.getString("name"); args.putLong("id", id);
boolean type = args.getBoolean("type"); args.putString("name", name);
args.putBoolean("type", type);
MessageTarget result = new MessageTarget(); new SimpleTask<MessageTarget>() {
@Override
protected MessageTarget onLoad(Context context, Bundle args) {
long id = args.getLong("id");
String name = args.getString("name");
boolean type = args.getBoolean("type");
DB db = DB.getInstance(context); MessageTarget result = new MessageTarget();
try {
db.beginTransaction();
EntityMessage message = db.message().getMessage(id); DB db = DB.getInstance(context);
if (type) try {
result.target = db.folder().getFolderByType(message.account, name); db.beginTransaction();
else
result.target = db.folder().getFolderByName(message.account, name);
result.ids.add(message.id);
db.message().setMessageUiHide(id, true); EntityMessage message = db.message().getMessage(id);
if (type)
result.target = db.folder().getFolderByType(message.account, name);
else
result.target = db.folder().getFolderByName(message.account, name);
result.ids.add(message.id);
db.setTransactionSuccessful(); db.message().setMessageUiHide(id, true);
} finally {
db.endTransaction();
}
return result; db.setTransactionSuccessful();
} } finally {
db.endTransaction();
}
@Override return result;
protected void onLoaded(Bundle args, MessageTarget result) { }
moveUndo(result);
}
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onLoaded(Bundle args, MessageTarget result) {
Helper.unexpectedError(getContext(), ex); moveUndo(result);
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getContext(), ex);
}
}.load(FragmentMessages.this, args);
} }
}.load(FragmentMessages.this, args); });
}
});
rvMessage.setAdapter(adapter); rvMessage.setAdapter(adapter);

Write Preview
Loading…
Cancel
Save