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

Cloud sync: fixes

Browse Source
This commit is contained in:
M66B
2023-01-21 13:52:57 +01:00
parent f17aa78ad2
commit 76c6fc2e6c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,7 +232,7 @@ public class CloudSync {
return;
}
List<EntityAccount> accounts = db.account().getSynchronizingAccounts(null);
List<EntityAccount> accounts = db.account().getAccounts();
EntityLog.log(context, EntityLog.Type.Cloud,
"Cloud accounts=" + (accounts == null ? null : accounts.size()));
if (accounts == null || accounts.size() == 0)
@@ -242,14 +242,14 @@ public class CloudSync {
JSONArray jaccountuuidlist = new JSONArray();
for (EntityAccount account : accounts)
if (!TextUtils.isEmpty(account.uuid)) {
if (account.synchronize && !TextUtils.isEmpty(account.uuid)) {
jaccountuuidlist.put(account.uuid);
JSONArray jidentitieuuids = new JSONArray();
List<EntityIdentity> identities = db.identity().getIdentities(account.id);
if (identities != null)
for (EntityIdentity identity : identities)
if (!TextUtils.isEmpty(identity.uuid)) {
if (identity.synchronize && !TextUtils.isEmpty(identity.uuid)) {
jidentitieuuids.put(identity.uuid);
JSONObject jidentity = identity.toJSON();
@@ -377,7 +377,7 @@ public class CloudSync {
"Cloud account " + raccount.uuid + "=" +
(laccount == null ? "insert" :
(EntityAccount.areEqual(raccount, laccount,
laccount.auth_type == ServiceAuthenticator.AUTH_TYPE_PASSWORD, true)
laccount.auth_type == ServiceAuthenticator.AUTH_TYPE_PASSWORD, false)
? "equal" : "update")) +
" rev=" + revision +
" left=" + (left == null ? null : left.name + ":" + left.type) +
@@ -483,13 +483,12 @@ public class CloudSync {
"Cloud identity " + ridentity.uuid + "=" +
(lidentity == null ? "insert" :
(EntityIdentity.areEqual(ridentity, lidentity,
lidentity.auth_type == ServiceAuthenticator.AUTH_TYPE_PASSWORD, true)
lidentity.auth_type == ServiceAuthenticator.AUTH_TYPE_PASSWORD, false)
? "equal" : "update")) +
" rev=" + revision +
" size=" + value.length());
ridentity.id = null;
ridentity.primary = false;
ridentity.last_modified = rrevision;
try {
@@ -503,6 +502,7 @@ public class CloudSync {
}
} else {
ridentity.id = lidentity.id;
ridentity.account = lidentity.account;
db.identity().updateIdentity(ridentity);
}

4
app/src/main/java/eu/faircode/email/DB.java
View File

@@ -561,7 +561,7 @@ public abstract class DB extends RoomDatabase {
" AFTER UPDATE ON account" +
" BEGIN" +
" UPDATE account SET last_modified = strftime('%s') * 1000" +
" WHERE id = NEW.id" +
" WHERE OLD.id = NEW.id" +
" AND OLD.last_modified = NEW.last_modified" +
" AND (NEW.auth_type = " + AUTH_TYPE_PASSWORD + " OR OLD.password = NEW.password)" +
" AND OLD.keep_alive_ok IS NEW.keep_alive_ok" +
@@ -580,7 +580,7 @@ public abstract class DB extends RoomDatabase {
" AFTER UPDATE ON identity" +
" BEGIN" +
" UPDATE identity SET last_modified = strftime('%s') * 1000" +
" WHERE id = NEW.id" +
" WHERE OLD.id = NEW.id" +
" AND OLD.last_modified = NEW.last_modified" +
" AND OLD.state IS NEW.state" +
" AND OLD.error IS NEW.error" +