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

Added snooze to message view, refactoring

Browse Source
pull/148/head
M66B 7 years ago
parent fa8a081148
commit 00b0d6919f
4 changed files with 104 additions and 24 deletions
Show Stats Download Patch File Download Diff File

1
FAQ.md
Unescape View File

@ -1099,6 +1099,7 @@ to justify making FairEmail available in the [Google Play Family Library](https:
**(67) How can I snooze conversations?** **(67) How can I snooze conversations?**
Multiple select one of more conversations (long press to start multiple selecting), tap the three dot button and select *Snooze ...*. Multiple select one of more conversations (long press to start multiple selecting), tap the three dot button and select *Snooze ...*.
Alternatively, use the *Snooze ...* 'more' menu in the expanded message view.
Select the time the conversation(s) should snooze and confirm by tapping OK. Select the time the conversation(s) should snooze and confirm by tapping OK.
The conversations will be hidden for the selected time and shown again afterwards. The conversations will be hidden for the selected time and shown again afterwards.
You will receive a new message notification as reminder. You will receive a new message notification as reminder.

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

@ -1816,49 +1816,69 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}.execute(context, owner, args, "message:unseen"); }.execute(context, owner, args, "message:unseen");
} }
private void onMenuJunk(final ActionData data) { private void onMenuSnooze(final ActionData data) {
String who = MessageHelper.formatAddresses(data.message.from); DialogDuration.show(context, owner, R.string.title_snooze,
new DialogBuilderLifecycle(context, owner) new DialogDuration.IDialogDuration() {
.setMessage(context.getString(R.string.title_ask_spam_who, who))
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onDurationSelected(long duration, long time) {
if (!Helper.isPro(context)) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(new Intent(ActivityView.ACTION_SHOW_PRO));
return;
}
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("id", data.message.id); args.putLong("id", data.message.id);
args.putLong("wakeup", duration == 0 ? -1 : time);
new SimpleTask<Void>() { new SimpleTask<Long>() {
@Override @Override
protected Void onExecute(Context context, Bundle args) { protected Long onExecute(Context context, Bundle args) {
long id = args.getLong("id"); long id = args.getLong("id");
Long wakeup = args.getLong("wakeup");
if (wakeup < 0)
wakeup = null;
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
try { try {
db.beginTransaction(); db.beginTransaction();
EntityMessage message = db.message().getMessage(id); EntityMessage message = db.message().getMessage(id);
if (message == null) if (message != null) {
return null; List<EntityMessage> messages = db.message().getMessageByThread(
message.account, message.thread, threading ? null : id, message.folder);
EntityFolder junk = db.folder().getFolderByType(message.account, EntityFolder.JUNK); for (EntityMessage threaded : messages) {
EntityOperation.queue(context, db, message, EntityOperation.MOVE, junk.id); db.message().setMessageSnoozed(threaded.id, wakeup);
EntityMessage.snooze(context, threaded.id, wakeup);
}
}
db.setTransactionSuccessful(); db.setTransactionSuccessful();
} finally { } finally {
db.endTransaction(); db.endTransaction();
} }
return null; return wakeup;
}
@Override
protected void onExecuted(Bundle args, Long wakeup) {
if (wakeup != null)
properties.finish();
} }
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(context, owner, ex); Helper.unexpectedError(context, owner, ex);
} }
}.execute(context, owner, args, "message:spam"); }.execute(context, owner, args, "message:snooze");
} }
})
.setNegativeButton(android.R.string.cancel, null) @Override
.show(); public void onDismiss() {
}
});
} }
private void onMenuDelete(final ActionData data) { private void onMenuDelete(final ActionData data) {
@ -1882,6 +1902,51 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}.execute(context, owner, args, "message:delete"); }.execute(context, owner, args, "message:delete");
} }
private void onMenuJunk(final ActionData data) {
String who = MessageHelper.formatAddresses(data.message.from);
new DialogBuilderLifecycle(context, owner)
.setMessage(context.getString(R.string.title_ask_spam_who, who))
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Bundle args = new Bundle();
args.putLong("id", data.message.id);
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
long id = args.getLong("id");
DB db = DB.getInstance(context);
try {
db.beginTransaction();
EntityMessage message = db.message().getMessage(id);
if (message == null)
return null;
EntityFolder junk = db.folder().getFolderByType(message.account, EntityFolder.JUNK);
EntityOperation.queue(context, db, message, EntityOperation.MOVE, junk.id);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
return null;
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(context, owner, ex);
}
}.execute(context, owner, args, "message:spam");
}
})
.setNegativeButton(android.R.string.cancel, null)
.show();
}
private void onMenuShare(ActionData data) { private void onMenuShare(ActionData data) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("id", data.message.id); args.putLong("id", data.message.id);
@ -2168,12 +2233,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
popupMenu.getMenu().findItem(R.id.menu_unseen).setEnabled(data.message.uid != null); popupMenu.getMenu().findItem(R.id.menu_unseen).setEnabled(data.message.uid != null);
popupMenu.getMenu().findItem(R.id.menu_delete).setVisible(debug);
popupMenu.getMenu().findItem(R.id.menu_junk).setEnabled(data.message.uid != null); popupMenu.getMenu().findItem(R.id.menu_junk).setEnabled(data.message.uid != null);
popupMenu.getMenu().findItem(R.id.menu_junk).setVisible( popupMenu.getMenu().findItem(R.id.menu_junk).setVisible(
data.hasJunk && !EntityFolder.JUNK.equals(data.message.folderType)); data.hasJunk && !EntityFolder.JUNK.equals(data.message.folderType));
popupMenu.getMenu().findItem(R.id.menu_delete).setVisible(debug);
popupMenu.getMenu().findItem(R.id.menu_share).setEnabled(data.message.content); popupMenu.getMenu().findItem(R.id.menu_share).setEnabled(data.message.content);
popupMenu.getMenu().findItem(R.id.menu_show_headers).setChecked(show_headers); popupMenu.getMenu().findItem(R.id.menu_show_headers).setChecked(show_headers);
@ -2206,13 +2271,16 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
case R.id.menu_unseen: case R.id.menu_unseen:
onMenuUnseen(data); onMenuUnseen(data);
return true; return true;
case R.id.menu_junk: case R.id.menu_snooze:
onMenuJunk(data); onMenuSnooze(data);
return true; return true;
case R.id.menu_delete: case R.id.menu_delete:
// For emergencies // For emergencies
onMenuDelete(data); onMenuDelete(data);
return true; return true;
case R.id.menu_junk:
onMenuJunk(data);
return true;
case R.id.menu_share: case R.id.menu_share:
onMenuShare(data); onMenuShare(data);
return true; return true;
@ -2682,5 +2750,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
void scrollTo(int pos, int dy); void scrollTo(int pos, int dy);
void move(long id, String target, boolean type); void move(long id, String target, boolean type);
void finish();
} }
} }

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

@ -664,6 +664,11 @@ public class FragmentMessages extends FragmentBase {
} }
}.execute(FragmentMessages.this, args, "messages:move"); }.execute(FragmentMessages.this, args, "messages:move");
} }
@Override
public void finish() {
FragmentMessages.this.finish();
}
}; };
private ItemTouchHelper.Callback touchHelper = new ItemTouchHelper.Callback() { private ItemTouchHelper.Callback touchHelper = new ItemTouchHelper.Callback() {

8
app/src/main/res/menu/menu_message.xml
Unescape View File

@ -17,13 +17,17 @@
android:title="@string/title_unseen" /> android:title="@string/title_unseen" />
<item <item
android:id="@+id/menu_junk" android:id="@+id/menu_snooze"
android:title="@string/title_spam" /> android:title="@string/title_snooze" />
<item <item
android:id="@+id/menu_delete" android:id="@+id/menu_delete"
android:title="@string/title_delete" /> android:title="@string/title_delete" />
<item
android:id="@+id/menu_junk"
android:title="@string/title_spam" />
<item <item
android:id="@+id/menu_share" android:id="@+id/menu_share"
android:title="@string/title_share" /> android:title="@string/title_share" />

Write Preview
Loading…
Cancel
Save