Simplifications, fixes

pull/146/head
M66B 6 years ago
parent b0362207fe
commit 8d4f8ce225

@ -546,15 +546,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
draft.subject = context.getString(R.string.app_name) + " " + BuildConfig.VERSION_NAME + " crash log";
draft.content = true;
draft.received = new Date().getTime();
draft.seen = false;
draft.answered = false;
draft.flagged = false;
draft.ui_seen = false;
draft.ui_answered = false;
draft.ui_flagged = false;
draft.ui_hide = false;
draft.ui_found = false;
draft.ui_ignored = false;
draft.getAvatar(context);
draft.id = db.message().insertMessage(draft);
draft.write(context, body);
@ -829,15 +820,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
draft.subject = context.getString(R.string.app_name) + " " + BuildConfig.VERSION_NAME + " debug info";
draft.content = true;
draft.received = new Date().getTime();
draft.seen = false;
draft.answered = false;
draft.flagged = false;
draft.ui_seen = false;
draft.ui_answered = false;
draft.ui_flagged = false;
draft.ui_hide = false;
draft.ui_found = false;
draft.ui_ignored = false;
draft.getAvatar(context);
draft.id = db.message().insertMessage(draft);
draft.write(context, body);

@ -116,24 +116,24 @@ public class EntityMessage implements Serializable {
@NonNull
public Long stored = new Date().getTime();
@NonNull
public Boolean seen;
public Boolean seen = false;
@NonNull
public Boolean answered;
public Boolean answered = false;
@NonNull
public Boolean flagged;
public Boolean flagged = false;
public String[] keywords; // user flags
@NonNull
public Boolean ui_seen;
public Boolean ui_seen = false;
@NonNull
public Boolean ui_answered;
public Boolean ui_answered = false;
@NonNull
public Boolean ui_flagged;
public Boolean ui_flagged = false;
@NonNull
public Boolean ui_hide;
public Boolean ui_hide = false;
@NonNull
public Boolean ui_found;
public Boolean ui_found = false;
@NonNull
public Boolean ui_ignored;
public Boolean ui_ignored = false;
public String error;
public Long last_attempt; // send

@ -1204,15 +1204,6 @@ public class FragmentCompose extends FragmentEx {
result.draft.content = true;
result.draft.received = new Date().getTime();
result.draft.seen = false;
result.draft.answered = false;
result.draft.flagged = false;
result.draft.ui_seen = false;
result.draft.ui_answered = false;
result.draft.ui_flagged = false;
result.draft.ui_hide = false;
result.draft.ui_found = false;
result.draft.ui_ignored = false;
result.draft.getAvatar(context);
result.draft.id = db.message().insertMessage(result.draft);

@ -2098,10 +2098,10 @@ public class ServiceSynchronize extends LifecycleService {
message.sent = (imessage.getSentDate() == null ? null : imessage.getSentDate().getTime());
message.seen = seen;
message.answered = answered;
message.flagged = false;
message.flagged = flagged;
message.ui_seen = seen;
message.ui_answered = answered;
message.ui_flagged = false;
message.ui_flagged = flagged;
message.ui_hide = false;
message.ui_found = found;
message.ui_ignored = false;

Loading…
Cancel
Save