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

Made multiple select a pro feature

Browse Source
pull/146/head
M66B 7 years ago
parent 58a59f8c16
commit f8c21cdce4
1 changed files with 100 additions and 94 deletions
Show Stats Download Patch File Download Diff File

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

@ -549,120 +549,126 @@ public class FragmentMessages extends FragmentEx {
fabMove.setOnClickListener(new View.OnClickListener() { fabMove.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Bundle args = new Bundle(); if (Helper.isPro(getContext())) {
args.putLong("folder", folder); Bundle args = new Bundle();
args.putLong("folder", folder);
new SimpleTask<List<EntityFolder>>() {
@Override
protected List<EntityFolder> onLoad(Context context, Bundle args) {
long folder = args.getLong("folder");
DB db = DB.getInstance(context);
EntityFolder source = db.folder().getFolder(folder); new SimpleTask<List<EntityFolder>>() {
List<EntityFolder> folders = db.folder().getFolders(source.account); @Override
List<EntityFolder> targets = new ArrayList<>(); protected List<EntityFolder> onLoad(Context context, Bundle args) {
for (EntityFolder f : folders) long folder = args.getLong("folder");
if (!f.id.equals(folder) && !EntityFolder.DRAFTS.equals(f.type)) DB db = DB.getInstance(context);
targets.add(f);
EntityFolder source = db.folder().getFolder(folder);
List<EntityFolder> folders = db.folder().getFolders(source.account);
List<EntityFolder> targets = new ArrayList<>();
for (EntityFolder f : folders)
if (!f.id.equals(folder) && !EntityFolder.DRAFTS.equals(f.type))
targets.add(f);
final Collator collator = Collator.getInstance(Locale.getDefault());
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
Collections.sort(targets, new Comparator<EntityFolder>() {
@Override
public int compare(EntityFolder f1, EntityFolder f2) {
int s = Integer.compare(
EntityFolder.FOLDER_SORT_ORDER.indexOf(f1.type),
EntityFolder.FOLDER_SORT_ORDER.indexOf(f2.type));
if (s != 0)
return s;
return collator.compare(
f1.name == null ? "" : f1.name,
f2.name == null ? "" : f2.name);
}
});
final Collator collator = Collator.getInstance(Locale.getDefault()); return targets;
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc }
Collections.sort(targets, new Comparator<EntityFolder>() { @Override
@Override protected void onLoaded(final Bundle args, List<EntityFolder> folders) {
public int compare(EntityFolder f1, EntityFolder f2) { PopupMenu popupMenu = new PopupMenu(getContext(), popupAnchor);
int s = Integer.compare(
EntityFolder.FOLDER_SORT_ORDER.indexOf(f1.type), int order = 0;
EntityFolder.FOLDER_SORT_ORDER.indexOf(f2.type)); for (EntityFolder folder : folders) {
if (s != 0) String name = (folder.display == null
return s; ? Helper.localizeFolderName(getContext(), folder.name)
return collator.compare( : folder.display);
f1.name == null ? "" : f1.name, popupMenu.getMenu().add(Menu.NONE, folder.id.intValue(), order++, name);
f2.name == null ? "" : f2.name);
} }
});
return targets; popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
} @Override
public boolean onMenuItemClick(final MenuItem target) {
MutableSelection<Long> selection = new MutableSelection<>();
selectionTracker.copySelection(selection);
@Override long[] ids = new long[selection.size()];
protected void onLoaded(final Bundle args, List<EntityFolder> folders) { int i = 0;
PopupMenu popupMenu = new PopupMenu(getContext(), popupAnchor); for (Long id : selection)
ids[i++] = id;
int order = 0; selectionTracker.clearSelection();
for (EntityFolder folder : folders) {
String name = (folder.display == null
? Helper.localizeFolderName(getContext(), folder.name)
: folder.display);
popupMenu.getMenu().add(Menu.NONE, folder.id.intValue(), order++, name);
}
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(final MenuItem target) {
MutableSelection<Long> selection = new MutableSelection<>();
selectionTracker.copySelection(selection);
long[] ids = new long[selection.size()];
int i = 0;
for (Long id : selection)
ids[i++] = id;
selectionTracker.clearSelection(); args.putLongArray("ids", ids);
args.putLong("target", target.getItemId());
args.putLongArray("ids", ids); new SimpleTask<Void>() {
args.putLong("target", target.getItemId()); @Override
protected Void onLoad(Context context, Bundle args) {
long[] ids = args.getLongArray("ids");
long target = args.getLong("target");
new SimpleTask<Void>() { DB db = DB.getInstance(context);
@Override try {
protected Void onLoad(Context context, Bundle args) { db.beginTransaction();
long[] ids = args.getLongArray("ids");
long target = args.getLong("target");
DB db = DB.getInstance(context); for (long id : ids) {
try { EntityMessage message = db.message().getMessage(id);
db.beginTransaction(); List<EntityMessage> messages =
db.message().getMessageByThread(message.account, message.thread);
for (long id : ids) { for (EntityMessage threaded : messages) {
EntityMessage message = db.message().getMessage(id); if (threaded.folder.equals(message.folder)) {
List<EntityMessage> messages = db.message().setMessageUiHide(threaded.id, true);
db.message().getMessageByThread(message.account, message.thread); EntityOperation.queue(db, threaded, EntityOperation.MOVE, target);
for (EntityMessage threaded : messages) { }
if (threaded.folder.equals(message.folder)) {
db.message().setMessageUiHide(threaded.id, true);
EntityOperation.queue(db, threaded, EntityOperation.MOVE, target);
} }
} }
}
db.setTransactionSuccessful(); db.setTransactionSuccessful();
} finally { } finally {
db.endTransaction(); db.endTransaction();
} }
EntityOperation.process(context); EntityOperation.process(context);
return null; return null;
} }
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getContext(), ex); Helper.unexpectedError(getContext(), ex);
} }
}.load(FragmentMessages.this, args); }.load(FragmentMessages.this, args);
return true; return true;
} }
}); });
popupMenu.show(); popupMenu.show();
} }
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getContext(), ex); Helper.unexpectedError(getContext(), ex);
} }
}.load(FragmentMessages.this, args); }.load(FragmentMessages.this, args);
} else {
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
fragmentTransaction.commit();
}
} }
}); });

Write Preview
Loading…
Cancel
Save