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

Autocorrect uuids

Browse Source
This commit is contained in:
M66B
2023-08-18 07:49:49 +02:00
parent f881e81949
commit 3ffce527cb
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
@@ -269,7 +270,8 @@ public class CloudSync {
account.auth_type != ServiceAuthenticator.AUTH_TYPE_GMAIL) {
if (uuidAccounts.contains(account.uuid)) {
Log.w("Duplicate account uuid=" + account.uuid);
continue;
account.uuid = UUID.randomUUID().toString();
db.account().setAccountUuid(account.id, account.uuid);
} else
uuidAccounts.add(account.uuid);
@@ -282,7 +284,8 @@ public class CloudSync {
if (identity.synchronize && !TextUtils.isEmpty(identity.uuid)) {
if (uuidIdentities.contains(identity.uuid)) {
Log.w("Duplicate identity uuid=" + identity.uuid);
continue;
identity.uuid = UUID.randomUUID().toString();
db.identity().setIdentityUuid(identity.id, identity.uuid);
} else
uuidIdentities.add(identity.uuid);