Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 21:58:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cloud sync: swipe left/right

Browse Source
This commit is contained in:
M66B
2023-01-18 18:34:33 +01:00
parent 693bb27e9a
commit 41e9935c88
3 changed files with 14 additions and 2847 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,7 +193,7 @@ public class CloudSync {
Helper.writeText(ifile, identity.toJSON().toString());
long itime = ifile.lastModified();
if (last == null || itime > last)
if (itime > last)
last = itime;
}
}
@@ -316,15 +316,25 @@ public class CloudSync {
JSONObject jaccountdata = new JSONObject(value);
JSONObject jaccount = jaccountdata.getJSONObject("account");
JSONArray jidentities = jaccountdata.getJSONArray("identities");
EntityAccount raccount = EntityAccount.fromJSON(jaccount);
EntityAccount laccount = db.account().getAccountByUUID(raccount.uuid);
JSONArray jidentities = jaccountdata.getJSONArray("identities");
String swipe_left_folder = null;
if (jaccount.has("swipe_left_folder") && !jaccount.isNull("swipe_left_folder"))
swipe_left_folder = jaccount.getString("swipe_left_folder");
String swipe_right_folder = null;
if (jaccount.has("swipe_right_folder") && !jaccount.isNull("swipe_right_folder"))
swipe_right_folder = jaccount.getString("swipe_right_folder");
Log.i("Cloud account " + raccount.uuid + "=" +
(laccount == null ? "insert" :
(EntityAccount.areEqual(raccount, laccount, laccount.auth_type == ServiceAuthenticator.AUTH_TYPE_PASSWORD, true)
? "equal" : "update")) +
" rev=" + revision +
" left=" + swipe_left_folder +
" right=" + swipe_right_folder +
" identities=" + jidentities +
" size=" + value.length());