Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-02 19:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added notification move action

Browse Source
This commit is contained in:
M66B
2019-10-23 12:51:20 +02:00
parent ee39642758
commit f262eb3e3e
11 changed files with 2084 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/eu/faircode/email/FragmentAccount.java
View File

@@ -122,6 +122,8 @@ public class FragmentAccount extends FragmentBase {
private Spinner spLeft;
private Spinner spRight;
private Spinner spMove;
private Button btnSave;
private ContentLoadingProgressBar pbSave;
private CheckBox cbIdentity;
@@ -217,6 +219,7 @@ public class FragmentAccount extends FragmentBase {
spJunk = view.findViewById(R.id.spJunk);
spLeft = view.findViewById(R.id.spLeft);
spRight = view.findViewById(R.id.spRight);
spMove = view.findViewById(R.id.spMove);
btnSave = view.findViewById(R.id.btnSave);
pbSave = view.findViewById(R.id.pbSave);
@@ -406,6 +409,8 @@ public class FragmentAccount extends FragmentBase {
spLeft.setAdapter(adapterSwipe);
spRight.setAdapter(adapterSwipe);
spMove.setAdapter(adapter);
// Initialize
Helper.setViewsEnabled(view, false);
@@ -668,6 +673,7 @@ public class FragmentAccount extends FragmentBase {
EntityFolder junk = (EntityFolder) spJunk.getSelectedItem();
EntityFolder left = (EntityFolder) spLeft.getSelectedItem();
EntityFolder right = (EntityFolder) spRight.getSelectedItem();
EntityFolder move = (EntityFolder) spMove.getSelectedItem();
if (drafts != null && drafts.id != null && drafts.id == 0L)
drafts = null;
@@ -685,6 +691,9 @@ public class FragmentAccount extends FragmentBase {
if (right != null && right.id != null && right.id == 0L)
right = null;
if (move != null && move.id != null && move.id == 0L)
move = null;
Bundle args = new Bundle();
args.putLong("id", id);
@@ -716,6 +725,7 @@ public class FragmentAccount extends FragmentBase {
args.putSerializable("junk", junk);
args.putSerializable("left", left);
args.putSerializable("right", right);
args.putSerializable("move", move);
args.putBoolean("should", should);
@@ -772,6 +782,7 @@ public class FragmentAccount extends FragmentBase {
EntityFolder junk = (EntityFolder) args.getSerializable("junk");
EntityFolder left = (EntityFolder) args.getSerializable("left");
EntityFolder right = (EntityFolder) args.getSerializable("right");
EntityFolder move = (EntityFolder) args.getSerializable("move");
boolean pro = ActivityBilling.isPro(context);
boolean should = args.getBoolean("should");
@@ -872,6 +883,9 @@ public class FragmentAccount extends FragmentBase {
if (!Objects.equals(account.swipe_right, right == null ? null : right.id))
return true;
if (!Objects.equals(account.move_to, move == null ? null : move.id))
return true;
if (account.error != null)
return true;
@@ -1045,6 +1059,19 @@ public class FragmentAccount extends FragmentBase {
}
}
if (move != null && !(move.id != null && move.id < 0)) {
boolean found = false;
for (EntityFolder folder : folders)
if (move.name.equals(folder.name)) {
found = true;
break;
}
if (!found) {
move.type = EntityFolder.USER;
folders.add(move);
}
}
db.folder().setFoldersUser(account.id);
for (EntityFolder folder : folders) {
@@ -1061,6 +1088,7 @@ public class FragmentAccount extends FragmentBase {
account.swipe_left = (left == null ? null : left.id);
account.swipe_right = (right == null ? null : right.id);
account.move_to = (move == null ? null : move.id);
db.account().updateAccount(account);
db.setTransactionSuccessful();
@@ -1441,6 +1469,10 @@ public class FragmentAccount extends FragmentBase {
spTrash.setSelection(pos);
else if (EntityFolder.JUNK.equals(folder.type))
spJunk.setSelection(pos);
if (account != null &&
account.move_to != null && account.move_to.equals(folder.id))
spMove.setSelection(pos);
}
}