Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-02 07:06:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Collapsible folder selector

Browse Source
This commit is contained in:
M66B
2019-05-25 22:51:44 +02:00
parent 9dd73d9d46
commit dca3447446
7 changed files with 234 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3063,49 +3063,50 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
LinearLayoutManager llm = new LinearLayoutManager(context);
rvFolder.setLayoutManager(llm);
final AdapterFolderSelect adapter = new AdapterFolderSelect(context, owner, new AdapterFolderSelect.IFolderSelectedListener() {
@Override
public void onFolderSelected(EntityFolder folder) {
dialog.dismiss();
final AdapterFolder adapter = new AdapterFolder(context, owner, data.message.account, false,
new AdapterFolder.IFolderSelectedListener() {
@Override
public void onFolderSelected(TupleFolderEx folder) {
dialog.dismiss();
if (copy) {
Bundle args = new Bundle();
args.putLong("id", data.message.id);
args.putLong("target", folder.id);
if (copy) {
Bundle args = new Bundle();
args.putLong("id", data.message.id);
args.putLong("target", folder.id);
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
long id = args.getLong("id");
long target = args.getLong("target");
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
long id = args.getLong("id");
long target = args.getLong("target");
DB db = DB.getInstance(context);
try {
db.beginTransaction();
DB db = DB.getInstance(context);
try {
db.beginTransaction();
EntityMessage message = db.message().getMessage(id);
if (message == null)
return null;
EntityOperation.queue(context, message, EntityOperation.COPY, target);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
EntityMessage message = db.message().getMessage(id);
if (message == null)
return null;
}
EntityOperation.queue(context, message, EntityOperation.COPY, target);
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:copy");
} else
properties.move(data.message.id, folder.name, false);
}
});
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(context, owner, ex);
}
}.execute(context, owner, args, "message:copy");
} else
properties.move(data.message.id, folder.name, false);
}
});
rvFolder.setAdapter(adapter);
@@ -3117,14 +3118,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
args.putLong("id", data.message.id);
args.putBoolean("copy", copy);
new SimpleTask<List<EntityFolder>>() {
new SimpleTask<List<TupleFolderEx>>() {
@Override
protected List<EntityFolder> onExecute(Context context, Bundle args) {
protected List<TupleFolderEx> onExecute(Context context, Bundle args) {
long id = args.getLong("id");
boolean copy = args.getBoolean("copy");
EntityMessage message;
List<EntityFolder> folders;
List<TupleFolderEx> folders;
DB db = DB.getInstance(context);
try {
@@ -3134,7 +3135,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (message == null)
return null;
folders = db.folder().getFolders(message.account);
folders = db.folder().getFoldersEx(message.account);
db.setTransactionSuccessful();
} finally {
@@ -3144,24 +3145,20 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (folders == null)
return null;
List<EntityFolder> targets = new ArrayList<>();
for (EntityFolder folder : folders)
if (!folder.hide &&
!folder.id.equals(message.folder) &&
List<TupleFolderEx> targets = new ArrayList<>();
for (TupleFolderEx folder : folders)
if (!folder.id.equals(message.folder) &&
(copy ||
(!EntityFolder.ARCHIVE.equals(folder.type) &&
!EntityFolder.TRASH.equals(folder.type) &&
!EntityFolder.JUNK.equals(folder.type))))
targets.add(folder);
if (targets.size() > 0)
Collections.sort(targets, targets.get(0).getComparator(context));
return targets;
}
@Override
protected void onExecuted(final Bundle args, List<EntityFolder> folders) {
protected void onExecuted(final Bundle args, List<TupleFolderEx> folders) {
if (folders == null)
folders = new ArrayList<>();