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

Undo move dialog

Browse Source
pull/147/head
M66B 7 years ago
parent e49d09ab9c
commit 27bf3dcf1e
3 changed files with 83 additions and 54 deletions
Show Stats Download Patch File Download Diff File

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

@ -110,9 +110,6 @@ public class FragmentMessages extends FragmentEx {
private List<Long> archives = new ArrayList<>(); private List<Long> archives = new ArrayList<>();
private List<Long> trashes = new ArrayList<>(); private List<Long> trashes = new ArrayList<>();
private boolean moving = false;
private boolean closing = false;
private AdapterMessage.ViewType viewType; private AdapterMessage.ViewType viewType;
private SelectionTracker<Long> selectionTracker = null; private SelectionTracker<Long> selectionTracker = null;
private LiveData<PagedList<TupleMessageEx>> messages = null; private LiveData<PagedList<TupleMessageEx>> messages = null;
@ -148,7 +145,7 @@ public class FragmentMessages extends FragmentEx {
zoom = prefs.getInt("zoom", compact ? 0 : 1); zoom = prefs.getInt("zoom", compact ? 0 : 1);
threading = prefs.getBoolean("threading", true); threading = prefs.getBoolean("threading", true);
actionbar = prefs.getBoolean("actionbar", true); actionbar = prefs.getBoolean("actionbar", true);
autoclose = prefs.getBoolean("autoclose", false); autoclose = prefs.getBoolean("autoclose", true);
if (TextUtils.isEmpty(search)) if (TextUtils.isEmpty(search))
if (thread == null) if (thread == null)
@ -357,8 +354,6 @@ public class FragmentMessages extends FragmentEx {
@Override @Override
public void move(long id, String name, boolean type) { public void move(long id, String name, boolean type) {
moving = true;
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("id", id); args.putLong("id", id);
args.putString("name", name); args.putString("name", name);
@ -384,8 +379,6 @@ public class FragmentMessages extends FragmentEx {
result.target = db.folder().getFolderByName(message.account, name); result.target = db.folder().getFolderByName(message.account, name);
result.ids.add(message.id); result.ids.add(message.id);
db.message().setMessageUiHide(id, true);
db.setTransactionSuccessful(); db.setTransactionSuccessful();
} finally { } finally {
db.endTransaction(); db.endTransaction();
@ -396,7 +389,7 @@ public class FragmentMessages extends FragmentEx {
@Override @Override
protected void onLoaded(Bundle args, MessageTarget result) { protected void onLoaded(Bundle args, MessageTarget result) {
moveUndo(result); moveAsk(result);
} }
@Override @Override
@ -532,8 +525,6 @@ public class FragmentMessages extends FragmentEx {
return; return;
Log.i(Helper.TAG, "Swiped dir=" + direction + " message=" + message.id); Log.i(Helper.TAG, "Swiped dir=" + direction + " message=" + message.id);
moving = true;
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("id", message.id); args.putLong("id", message.id);
args.putBoolean("thread", viewType != AdapterMessage.ViewType.THREAD); args.putBoolean("thread", viewType != AdapterMessage.ViewType.THREAD);
@ -626,8 +617,6 @@ public class FragmentMessages extends FragmentEx {
} }
private void onActionMove(String folderType) { private void onActionMove(String folderType) {
moving = true;
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("account", account); args.putLong("account", account);
args.putString("thread", thread); args.putString("thread", thread);
@ -651,10 +640,8 @@ public class FragmentMessages extends FragmentEx {
List<EntityMessage> messages = db.message().getMessageByThread( List<EntityMessage> messages = db.message().getMessageByThread(
account, thread, threading ? null : id, null); account, thread, threading ? null : id, null);
for (EntityMessage threaded : messages) for (EntityMessage threaded : messages)
if (!result.target.id.equals(threaded.folder)) { if (!result.target.id.equals(threaded.folder))
result.ids.add(threaded.id); result.ids.add(threaded.id);
db.message().setMessageUiHide(threaded.id, true);
}
db.setTransactionSuccessful(); db.setTransactionSuccessful();
} finally { } finally {
@ -666,7 +653,7 @@ public class FragmentMessages extends FragmentEx {
@Override @Override
protected void onLoaded(Bundle args, MessageTarget result) { protected void onLoaded(Bundle args, MessageTarget result) {
moveUndo(result); moveAsk(result);
} }
@Override @Override
@ -1007,8 +994,6 @@ public class FragmentMessages extends FragmentEx {
} }
private void onActionMove(String type) { private void onActionMove(String type) {
moving = true;
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString("type", type); args.putString("type", type);
args.putLongArray("ids", getSelection()); args.putLongArray("ids", getSelection());
@ -1034,10 +1019,8 @@ public class FragmentMessages extends FragmentEx {
account = message.account; account = message.account;
List<EntityMessage> messages = db.message().getMessageByThread( List<EntityMessage> messages = db.message().getMessageByThread(
message.account, message.thread, threading ? null : id, message.folder); message.account, message.thread, threading ? null : id, message.folder);
for (EntityMessage threaded : messages) { for (EntityMessage threaded : messages)
result.ids.add(threaded.id); result.ids.add(threaded.id);
db.message().setMessageUiHide(threaded.id, true);
}
} }
} }
@ -1053,7 +1036,7 @@ public class FragmentMessages extends FragmentEx {
@Override @Override
protected void onLoaded(Bundle args, MessageTarget result) { protected void onLoaded(Bundle args, MessageTarget result) {
moveUndo(result); moveAsk(result);
} }
@Override @Override
@ -1112,8 +1095,6 @@ public class FragmentMessages extends FragmentEx {
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override @Override
public boolean onMenuItemClick(final MenuItem target) { public boolean onMenuItemClick(final MenuItem target) {
moving = true;
args.putLong("target", target.getItemId()); args.putLong("target", target.getItemId());
selectionTracker.clearSelection(); selectionTracker.clearSelection();
@ -1154,7 +1135,7 @@ public class FragmentMessages extends FragmentEx {
@Override @Override
protected void onLoaded(Bundle args, MessageTarget result) { protected void onLoaded(Bundle args, MessageTarget result) {
moveUndo(result); moveAsk(result);
} }
@Override @Override
@ -1675,12 +1656,8 @@ public class FragmentMessages extends FragmentEx {
public void onChanged(@Nullable PagedList<TupleMessageEx> messages) { public void onChanged(@Nullable PagedList<TupleMessageEx> messages) {
if (messages == null || if (messages == null ||
(viewType == AdapterMessage.ViewType.THREAD && messages.size() == 0 && autoclose)) { (viewType == AdapterMessage.ViewType.THREAD && messages.size() == 0 && autoclose)) {
if (moving) finish();
closing = true; return;
else {
finish();
return;
}
} }
if (viewType == AdapterMessage.ViewType.THREAD) { if (viewType == AdapterMessage.ViewType.THREAD) {
@ -1752,13 +1729,10 @@ public class FragmentMessages extends FragmentEx {
// Auto close when: // Auto close when:
// - no more non archived/trashed/outgoing messages // - no more non archived/trashed/outgoing messages
if (count == 0) if (count == 0) {
if (moving) finish();
closing = true; return;
else { }
finish();
return;
}
} }
} }
} else { } else {
@ -1823,7 +1797,64 @@ public class FragmentMessages extends FragmentEx {
}.load(this, args); }.load(this, args);
} }
private void moveAsk(final MessageTarget result) {
if (result.target == null) {
// TODO: unhide messages
return;
}
String title = getResources().getQuantityString(
R.plurals.title_moving_messages, result.ids.size(),
result.ids.size(), result.target.getDisplayName(getContext()));
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
.setMessage(title)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Bundle args = new Bundle();
args.putSerializable("result", result);
// Move messages
new SimpleTask<Void>() {
@Override
protected Void onLoad(Context context, Bundle args) {
DB db = DB.getInstance(context);
try {
db.beginTransaction();
for (long id : result.ids) {
EntityMessage message = db.message().getMessage(id);
if (message != null) {
Log.i(Helper.TAG, "Move id=" + id + " target=" + result.target.name);
EntityFolder folder = db.folder().getFolderByName(message.account, result.target.name);
EntityOperation.queue(db, message, EntityOperation.MOVE, folder.id);
}
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
return null;
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
}
}.load(FragmentMessages.this, args);
}
})
.setNegativeButton(android.R.string.cancel, null)
.show();
}
private void moveUndo(final MessageTarget result) { private void moveUndo(final MessageTarget result) {
if (result.target == null) {
// TODO: unhide messages
return;
}
// Show undo snackbar // Show undo snackbar
final Snackbar snackbar = Snackbar.make( final Snackbar snackbar = Snackbar.make(
view, view,
@ -1833,8 +1864,6 @@ public class FragmentMessages extends FragmentEx {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
snackbar.dismiss(); snackbar.dismiss();
moving = false;
closing = false;
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putSerializable("result", result); args.putSerializable("result", result);
@ -1866,10 +1895,6 @@ public class FragmentMessages extends FragmentEx {
public void run() { public void run() {
Log.i(Helper.TAG, "Move timeout"); Log.i(Helper.TAG, "Move timeout");
moving = false;
if (closing)
finish();
// Remove snackbar // Remove snackbar
if (snackbar.isShown()) if (snackbar.isShown())
snackbar.dismiss(); snackbar.dismiss();
@ -1882,15 +1907,14 @@ public class FragmentMessages extends FragmentEx {
try { try {
db.beginTransaction(); db.beginTransaction();
if (result.target != null) for (long id : result.ids) {
for (long id : result.ids) { EntityMessage message = db.message().getMessage(id);
EntityMessage message = db.message().getMessage(id); if (message != null && message.ui_hide) {
if (message != null && message.ui_hide) { Log.i(Helper.TAG, "Move id=" + id + " target=" + result.target.name);
Log.i(Helper.TAG, "Move id=" + id + " target=" + result.target.name); EntityFolder folder = db.folder().getFolderByName(message.account, result.target.name);
EntityFolder folder = db.folder().getFolderByName(message.account, result.target.name); EntityOperation.queue(db, message, EntityOperation.MOVE, folder.id);
EntityOperation.queue(db, message, EntityOperation.MOVE, folder.id);
}
} }
}
db.setTransactionSuccessful(); db.setTransactionSuccessful();
} finally { } finally {

2
app/src/main/java/eu/faircode/email/FragmentOptions.java
Unescape View File

@ -295,7 +295,7 @@ public class FragmentOptions extends FragmentEx implements SharedPreferences.OnS
} }
}); });
swAutoclose.setChecked(prefs.getBoolean("autoclose", false)); swAutoclose.setChecked(prefs.getBoolean("autoclose", true));
swAutoclose.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { swAutoclose.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {

5
app/src/main/res/values/strings.xml
Unescape View File

@ -41,6 +41,11 @@
<item quantity="other">%1$d new</item> <item quantity="other">%1$d new</item>
</plurals> </plurals>
<plurals name="title_moving_messages">
<item quantity="one">Move %1$d message to %2$s ?</item>
<item quantity="other">Move %1$d messages to %2$s ?</item>
</plurals>
<string name="title_notification_failed">\'%1$s\' failed</string> <string name="title_notification_failed">\'%1$s\' failed</string>
<string name="menu_setup">Setup</string> <string name="menu_setup">Setup</string>

Write Preview
Loading…
Cancel
Save