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

Cloud sync: swipe left/right folder

This commit is contained in:
M66B 2023-01-18 21:26:04 +01:00
parent cbebeb29d2
commit d0c94067bc
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/java/eu/faircode/email/CloudSync.java
View File

@ -237,13 +237,17 @@ public class CloudSync {
JSONObject jaccount = account.toJSON(); JSONObject jaccount = account.toJSON();
if (account.swipe_left != null && account.swipe_left > 0) { if (account.swipe_left != null && account.swipe_left > 0) {
EntityFolder f = db.folder().getFolder(account.swipe_left); EntityFolder f = db.folder().getFolder(account.swipe_left);
if (f != null) if (f != null) {
jaccount.put("swipe_left_folder", f.name); jaccount.put("swipe_left_name", f.name);
jaccount.put("swipe_left_type", f.type);
}
} }
if (account.swipe_right != null && account.swipe_right > 0) { if (account.swipe_right != null && account.swipe_right > 0) {
EntityFolder f = db.folder().getFolder(account.swipe_right); EntityFolder f = db.folder().getFolder(account.swipe_right);
if (f != null) if (f != null) {
jaccount.put("swipe_right_folder", f.name); jaccount.put("swipe_right_name", f.name);
jaccount.put("swipe_right_type", f.name);
}
} }
JSONObject jaccountdata = new JSONObject(); JSONObject jaccountdata = new JSONObject();
@ -320,21 +324,35 @@ public class CloudSync {
EntityAccount raccount = EntityAccount.fromJSON(jaccount); EntityAccount raccount = EntityAccount.fromJSON(jaccount);
EntityAccount laccount = db.account().getAccountByUUID(raccount.uuid); EntityAccount laccount = db.account().getAccountByUUID(raccount.uuid);
String swipe_left_folder = null; EntityFolder left = null;
if (jaccount.has("swipe_left_folder") && !jaccount.isNull("swipe_left_folder")) if (jaccount.has("swipe_left_name") && !jaccount.isNull("swipe_left_name")) {
swipe_left_folder = jaccount.getString("swipe_left_folder"); left = new EntityFolder();
left.account = null;
left.name = jaccount.getString("swipe_left_name");
left.type = jaccount.getString("swipe_left_type");
left.setProperties();
//left.setSpecials(account);
//folder.id = db.folder().insertFolder(folder);
}
String swipe_right_folder = null; EntityFolder right = null;
if (jaccount.has("swipe_right_folder") && !jaccount.isNull("swipe_right_folder")) if (jaccount.has("swipe_right_name") && !jaccount.isNull("swipe_right_name")) {
swipe_right_folder = jaccount.getString("swipe_right_folder"); right = new EntityFolder();
right.account = null;
right.name = jaccount.getString("swipe_right_name");
right.type = jaccount.getString("swipe_right_type");
right.setProperties();
//right.setSpecials(account);
//folder.id = db.folder().insertFolder(folder);
}
Log.i("Cloud account " + raccount.uuid + "=" + Log.i("Cloud account " + raccount.uuid + "=" +
(laccount == null ? "insert" : (laccount == null ? "insert" :
(EntityAccount.areEqual(raccount, laccount, laccount.auth_type == ServiceAuthenticator.AUTH_TYPE_PASSWORD, true) (EntityAccount.areEqual(raccount, laccount, laccount.auth_type == ServiceAuthenticator.AUTH_TYPE_PASSWORD, true)
? "equal" : "update")) + ? "equal" : "update")) +
" rev=" + revision + " rev=" + revision +
" left=" + swipe_left_folder + " left=" + (left == null ? null : left.name + ":" + left.type) +
" right=" + swipe_right_folder + " right=" + (right == null ? null : right.name + ":" + right.type) +
" identities=" + jidentities + " identities=" + jidentities +
" size=" + value.length()); " size=" + value.length());