mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed crash

This commit is contained in:
M66B 2019-01-21 07:17:17 +00:00
parent 3df3cf1255
commit c20a1667a3
1 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -703,19 +703,19 @@ public class FragmentAccount extends FragmentBase {
EntityFolder left = (EntityFolder) spLeft.getSelectedItem(); EntityFolder left = (EntityFolder) spLeft.getSelectedItem();
EntityFolder right = (EntityFolder) spRight.getSelectedItem(); EntityFolder right = (EntityFolder) spRight.getSelectedItem();
if (drafts != null && drafts.id < 0) if (drafts != null && drafts.type == null)
drafts = null; drafts = null;
if (sent != null && sent.id < 0) if (sent != null && sent.type == null)
sent = null; sent = null;
if (all != null && all.id < 0) if (all != null && all.type == null)
all = null; all = null;
if (trash != null && trash.id < 0) if (trash != null && trash.type == null)
trash = null; trash = null;
if (junk != null && junk.id < 0) if (junk != null && junk.type == null)
junk = null; junk = null;
if (left != null && left.id < 0) if (left != null && left.type == null)
left = null; left = null;
if (right != null && right.id < 0) if (right != null && right.type == null)
right = null; right = null;
Bundle args = new Bundle(); Bundle args = new Bundle();
@ -745,8 +745,8 @@ public class FragmentAccount extends FragmentBase {
args.putSerializable("all", all); args.putSerializable("all", all);
args.putSerializable("trash", trash); args.putSerializable("trash", trash);
args.putSerializable("junk", junk); args.putSerializable("junk", junk);
args.putLong("left", left == null ? -1 : left.id); args.putSerializable("left", left);
args.putLong("right", right == null ? -1 : right.id); args.putSerializable("right", right);
new SimpleTask<Void>() { new SimpleTask<Void>() {
@Override @Override
@ -796,8 +796,8 @@ public class FragmentAccount extends FragmentBase {
EntityFolder all = (EntityFolder) args.getSerializable("all"); EntityFolder all = (EntityFolder) args.getSerializable("all");
EntityFolder trash = (EntityFolder) args.getSerializable("trash"); EntityFolder trash = (EntityFolder) args.getSerializable("trash");
EntityFolder junk = (EntityFolder) args.getSerializable("junk"); EntityFolder junk = (EntityFolder) args.getSerializable("junk");
Long left = args.getLong("left"); EntityFolder left = (EntityFolder) args.getSerializable("left");
Long right = args.getLong("right"); EntityFolder right = (EntityFolder) args.getSerializable("right");
if (TextUtils.isEmpty(host)) if (TextUtils.isEmpty(host))
throw new IllegalArgumentException(context.getString(R.string.title_no_host)); throw new IllegalArgumentException(context.getString(R.string.title_no_host));
@ -820,11 +820,6 @@ public class FragmentAccount extends FragmentBase {
if (TextUtils.isEmpty(prefix)) if (TextUtils.isEmpty(prefix))
prefix = null; prefix = null;
if (left < 0)
left = null;
if (right < 0)
right = null;
Character separator = null; Character separator = null;
long now = new Date().getTime(); long now = new Date().getTime();
@ -893,8 +888,6 @@ public class FragmentAccount extends FragmentBase {
account.primary = (account.synchronize && primary); account.primary = (account.synchronize && primary);
account.notify = notify; account.notify = notify;
account.browse = browse; account.browse = browse;
account.swipe_left = left;
account.swipe_right = right;
account.poll_interval = Integer.parseInt(interval); account.poll_interval = Integer.parseInt(interval);
account.prefix = prefix; account.prefix = prefix;
@ -963,6 +956,32 @@ public class FragmentAccount extends FragmentBase {
folders.add(junk); folders.add(junk);
} }
if (left != null) {
boolean found = false;
for (EntityFolder folder : folders)
if (left.name.equals(folder.name)) {
found = true;
break;
}
if (!found) {
left.type = EntityFolder.USER;
folders.add(left);
}
}
if (right != null) {
boolean found = false;
for (EntityFolder folder : folders)
if (right.name.equals(folder.name)) {
found = true;
break;
}
if (!found) {
right.type = EntityFolder.USER;
folders.add(right);
}
}
db.folder().setFoldersUser(account.id); db.folder().setFoldersUser(account.id);
for (EntityFolder folder : folders) { for (EntityFolder folder : folders) {
@ -981,6 +1000,10 @@ public class FragmentAccount extends FragmentBase {
} }
} }
account.swipe_left = (left == null ? null : left.id);
account.swipe_right = (right == null ? null : right.id);
db.account().updateAccount(account);
db.setTransactionSuccessful(); db.setTransactionSuccessful();
} finally { } finally {
db.endTransaction(); db.endTransaction();