Browse Source

Fixed showing seen

main
M66B 6 years ago
parent
commit
194b7e8dea
3 changed files with 18 additions and 32 deletions
  1. +17
    -17
      app/src/main/java/eu/faircode/email/AdapterMessage.java
  2. +0
    -4
      app/src/main/java/eu/faircode/email/EntityFolder.java
  3. +1
    -11
      app/src/main/java/eu/faircode/email/EntityOperation.java

+ 17
- 17
app/src/main/java/eu/faircode/email/AdapterMessage.java View File

@ -89,17 +89,16 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
} }
private void bindTo(TupleMessageEx message) { private void bindTo(TupleMessageEx message) {
boolean outgoing = EntityFolder.isOutgoing(message.folderType);
boolean outbox = EntityFolder.TYPE_OUTBOX.equals(message.folderType);
pbLoading.setVisibility(View.GONE); pbLoading.setVisibility(View.GONE);
if (outgoing) {
if (EntityFolder.TYPE_DRAFTS.equals(message.folderType) ||
EntityFolder.TYPE_OUTBOX.equals(message.folderType) ||
EntityFolder.TYPE_SENT.equals(message.folderType)) {
tvFrom.setText(MessageHelper.getFormattedAddresses(message.to)); tvFrom.setText(MessageHelper.getFormattedAddresses(message.to));
tvTime.setText(DateUtils.getRelativeTimeSpanString(context, message.received));
tvTime.setText(DateUtils.getRelativeTimeSpanString(context, message.sent == null ? message.received : message.sent));
} else { } else {
tvFrom.setText(MessageHelper.getFormattedAddresses(message.from)); tvFrom.setText(MessageHelper.getFormattedAddresses(message.from));
tvTime.setText(message.sent == null ? null : DateUtils.getRelativeTimeSpanString(context, message.sent));
tvTime.setText(DateUtils.getRelativeTimeSpanString(context, message.received));
} }
tvSubject.setText(message.subject); tvSubject.setText(message.subject);
@ -108,20 +107,20 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
if (viewType == ViewType.FOLDER) { if (viewType == ViewType.FOLDER) {
tvCount.setText(extra + Integer.toString(message.count)); tvCount.setText(extra + Integer.toString(message.count));
tvCount.setVisibility(debug || message.count > 1 ? View.VISIBLE : View.GONE); tvCount.setVisibility(debug || message.count > 1 ? View.VISIBLE : View.GONE);
} else
} else {
tvCount.setText(extra + Helper.localizeFolderName(context, message.folderName)); tvCount.setText(extra + Helper.localizeFolderName(context, message.folderName));
tvCount.setVisibility(View.VISIBLE);
}
ivAttachments.setVisibility(message.attachments > 0 ? View.VISIBLE : View.GONE); ivAttachments.setVisibility(message.attachments > 0 ? View.VISIBLE : View.GONE);
boolean unseen = (message.thread == null && !outbox ? message.unseen > 0 : !message.seen);
int typeface = (unseen ? Typeface.BOLD : Typeface.NORMAL);
int typeface = (message.unseen > 0 ? Typeface.BOLD : Typeface.NORMAL);
tvFrom.setTypeface(null, typeface); tvFrom.setTypeface(null, typeface);
tvTime.setTypeface(null, typeface); tvTime.setTypeface(null, typeface);
tvSubject.setTypeface(null, typeface); tvSubject.setTypeface(null, typeface);
tvCount.setTypeface(null, typeface); tvCount.setTypeface(null, typeface);
int colorUnseen = Helper.resolveColor(context, unseen
int colorUnseen = Helper.resolveColor(context, message.unseen > 0
? R.attr.colorUnread : android.R.attr.textColorSecondary); ? R.attr.colorUnread : android.R.attr.textColorSecondary);
tvFrom.setTextColor(colorUnseen); tvFrom.setTextColor(colorUnseen);
tvTime.setTextColor(colorUnseen); tvTime.setTextColor(colorUnseen);
@ -143,12 +142,13 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
new Intent(context, ActivityCompose.class) new Intent(context, ActivityCompose.class)
.putExtra("id", message.id)); .putExtra("id", message.id));
else { else {
boolean outbox = EntityFolder.TYPE_OUTBOX.equals(message.folderType);
if (!outbox && !message.seen && !message.ui_seen) {
message.ui_seen = !message.ui_seen;
DB.getInstance(context).message().updateMessage(message);
EntityOperation.queue(context, message, EntityOperation.SEEN, message.ui_seen);
EntityOperation.process(context);
if (!EntityFolder.TYPE_OUTBOX.equals(message.folderType)) {
if (!message.seen && !message.ui_seen) {
message.ui_seen = !message.ui_seen;
DB.getInstance(context).message().updateMessage(message);
EntityOperation.queue(context, message, EntityOperation.SEEN, message.ui_seen);
EntityOperation.process(context);
}
} }
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context); LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);


+ 0
- 4
app/src/main/java/eu/faircode/email/EntityFolder.java View File

@ -91,10 +91,6 @@ public class EntityFolder {
TYPE_SENT TYPE_SENT
); );
static boolean isOutgoing(String type) {
return (TYPE_OUTBOX.equals(type) || TYPE_DRAFTS.equals(type) || TYPE_SENT.equals(type));
}
@PrimaryKey(autoGenerate = true) @PrimaryKey(autoGenerate = true)
public Long id; public Long id;
public Long account; // Outbox = null public Long account; // Outbox = null


+ 1
- 11
app/src/main/java/eu/faircode/email/EntityOperation.java View File

@ -80,15 +80,6 @@ public class EntityOperation {
private static void queue(Context context, EntityMessage message, String name, JSONArray jsonArray) { private static void queue(Context context, EntityMessage message, String name, JSONArray jsonArray) {
DaoOperation dao = DB.getInstance(context).operation(); DaoOperation dao = DB.getInstance(context).operation();
int purged = 0;
if (SEEN.equals(name)) {
if (message.uid == null) {
// local message
return;
}
purged = dao.deleteOperations(message.id, name);
}
EntityOperation operation = new EntityOperation(); EntityOperation operation = new EntityOperation();
operation.message = message.id; operation.message = message.id;
operation.name = name; operation.name = name;
@ -110,8 +101,7 @@ public class EntityOperation {
Log.i(Helper.TAG, "Queued op=" + operation.id + "/" + name + Log.i(Helper.TAG, "Queued op=" + operation.id + "/" + name +
" args=" + operation.args + " args=" + operation.args +
" msg=" + message.folder + "/" + message.id + " uid=" + message.uid +
" purged=" + purged);
" msg=" + message.folder + "/" + message.id + " uid=" + message.uid);
} }
public static void process(Context context) { public static void process(Context context) {


Loading…
Cancel
Save