msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Cloud sync improvements

Browse Source
pull/212/head
M66B 2 years ago
parent 630164979a
commit 632e045c7c
2 changed files with 119 additions and 114 deletions
Show Stats Download Patch File Download Diff File

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

@ -55,8 +55,9 @@ public class CloudSync {
private static final Map<String, Pair<byte[], byte[]>> keyCache = new HashMap<>();
public static JSONObject perform(Context context, String user, String password, JSONObject jrequest)
public static JSONObject perform(Context context, String user, String password, String command, JSONObject jrequest)
throws GeneralSecurityException, JSONException, IOException {
jrequest.put("command", command);
List<JSONObject> responses = new ArrayList<>();
for (JSONArray batch : partition(jrequest.getJSONArray("items"))) {
jrequest.put("items", batch);

84
app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java
Unescape View File

@ -1542,25 +1542,26 @@ public class FragmentOptionsBackup extends FragmentBase implements SharedPrefere
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int sync_status = prefs.getInt("sync_status", 0);
JSONObject jstatus = new JSONObject();
jstatus.put("key", "sync.status");
jstatus.put("rev", sync_status * 0);
JSONObject jsyncstatus = new JSONObject();
jsyncstatus.put("key", "sync.status");
jsyncstatus.put("rev", sync_status);
JSONArray jitems = new JSONArray();
jitems.put(jstatus);
jitems.put(jsyncstatus);
jrequest.put("items", jitems);
JSONObject jresponse = CloudSync.perform(context, user, password, jrequest);
JSONObject jresponse = CloudSync.perform(context, user, password, "read", jrequest);
jitems = jresponse.getJSONArray("items");
int count = jresponse.getInt("count");
if (count == 0) {
if (jitems.length() == 0) {
Log.i("Cloud server is empty");
List<EntityAccount> accounts = db.account().getSynchronizingAccounts(null);
Log.i("Cloud accounts=" + (accounts == null ? null : accounts.size()));
if (accounts != null && accounts.size() != 0) {
if (accounts == null || accounts.size() == 0)
return null; // nothing to offer
JSONArray jupload = new JSONArray();
JSONArray juuids = new JSONArray();
@ -1596,39 +1597,43 @@ public class FragmentOptionsBackup extends FragmentBase implements SharedPrefere
JSONObject jaccounts = new JSONObject();
jaccounts.put("uuids", juuids);
JSONObject jstatusdata = new JSONObject();
jstatusdata.put("accounts", jaccounts);
JSONObject jstatus = new JSONObject();
jstatus.put("accounts", jaccounts);
jstatus.put("key", "sync.status");
jstatus.put("val", jstatusdata.toString());
jstatus.put("rev", 1);
jupload.put(jstatus);
jsyncstatus.put("key", "sync.status");
jsyncstatus.put("val", jstatus.toString());
jsyncstatus.put("rev", 1);
jupload.put(jsyncstatus);
jrequest.put("command", "write");
jrequest.put("items", jupload);
CloudSync.perform(context, user, password, jrequest);
CloudSync.perform(context, user, password, "write", jrequest);
prefs.edit().putInt("sync_status", 1).apply();
}
return null;
} else if (count == 1) {
if (jitems.length() == 1) {
// New revision
} else if (jitems.length() == 1) {
JSONObject jitem = jitems.getJSONObject(0);
Log.i("Cloud status revision=" + jitem.getInt("rev") + "/" + sync_status);
int rev = jitem.getInt("rev");
Log.i("Cloud status revision=" + rev + "/" + sync_status);
if (BuildConfig.DEBUG)
sync_status--;
if (rev <= sync_status)
return null; // no changes
// New revision
JSONArray jdownload = new JSONArray();
// Get accounts
JSONObject jstatusdata = new JSONObject(jitem.getString("val"));
JSONObject jaccountinfo = jstatusdata.getJSONObject("accounts");
JSONArray juuids = jaccountinfo.getJSONArray("uuids");
JSONObject jstatus = new JSONObject(jitem.getString("val"));
JSONObject jaccounts = jstatus.getJSONObject("accounts");
JSONArray juuids = jaccounts.getJSONArray("uuids");
for (int i = 0; i < juuids.length(); i++) {
String uuid = juuids.getString(i);
JSONObject jaccount = new JSONObject();
jaccount.put("key", "account." + uuid);
jaccount.put("rev", sync_status * 0);
jaccount.put("rev", sync_status);
jdownload.put(jaccount);
Log.i("Cloud account " + uuid);
}
@ -1636,7 +1641,7 @@ public class FragmentOptionsBackup extends FragmentBase implements SharedPrefere
if (jdownload.length() > 0) {
Log.i("Cloud getting accounts");
jrequest.put("items", jdownload);
jresponse = CloudSync.perform(context, user, password, jrequest);
jresponse = CloudSync.perform(context, user, password, "sync", jrequest);
// Process accounts
Log.i("Cloud processing accounts");
@ -1644,14 +1649,15 @@ public class FragmentOptionsBackup extends FragmentBase implements SharedPrefere
jdownload = new JSONArray();
for (int i = 0; i < jitems.length(); i++) {
JSONObject jaccount = jitems.getJSONObject(i);
String key = jaccount.getString("key");
String value = jaccount.getString("val");
int revision = jaccount.getInt("rev");
String uuid = key.split("\\.")[1];
EntityAccount account = db.account().getAccountByUUID(uuid);
JSONObject jaccountdata = new JSONObject(value);
EntityAccount raccount = EntityAccount.fromJSON(jaccountdata.getJSONObject("account"));
EntityAccount laccount = db.account().getAccountByUUID(raccount.uuid);
JSONArray jidentities = jaccountdata.getJSONArray("identities");
Log.i("Cloud account " + uuid + "=" + (account != null) +
Log.i("Cloud account " + raccount.uuid + "=" + (laccount == null ? "insert" : "update") +
" rev=" + revision +
" identities=" + jidentities +
" size=" + value.length());
@ -1659,7 +1665,7 @@ public class FragmentOptionsBackup extends FragmentBase implements SharedPrefere
for (int j = 0; j < jidentities.length(); j++) {
JSONObject jidentity = new JSONObject();
jidentity.put("key", "identity." + jidentities.getString(j));
jidentity.put("rev", sync_status * 0);
jidentity.put("rev", sync_status);
jdownload.put(jidentity);
}
}
@ -1668,31 +1674,29 @@ public class FragmentOptionsBackup extends FragmentBase implements SharedPrefere
// Get identities
Log.i("Cloud getting identities");
jrequest.put("items", jdownload);
jresponse = CloudSync.perform(context, user, password, jrequest);
jresponse = CloudSync.perform(context, user, password, "sync", jrequest);
// Process identities
Log.i("Cloud processing identities");
jitems = jresponse.getJSONArray("items");
for (int i = 0; i < jitems.length(); i++) {
JSONObject jaccount = jitems.getJSONObject(i);
String key = jaccount.getString("key");
String value = jaccount.getString("val");
int revision = jaccount.getInt("rev");
String uuid = key.split("\\.")[1];
EntityIdentity identity = db.identity().getIdentityByUUID(uuid);
Log.i("Cloud identity " + uuid + "=" + (identity != null) +
EntityIdentity ridentity = EntityIdentity.fromJSON(new JSONObject(value));
EntityIdentity lidentity = db.identity().getIdentityByUUID(ridentity.uuid);
Log.i("Cloud identity " + ridentity.uuid + "=" + (lidentity == null ? "insert" : "update") +
" rev=" + revision +
" size=" + value.length());
}
}
}
} else {
// No changes
}
prefs.edit().putInt("sync_status", rev).apply();
} else
throw new IllegalArgumentException("Expected one status item");
} else
CloudSync.perform(context, user, password, jrequest);
CloudSync.perform(context, user, password, command, jrequest);
return null;
}

Write Preview
Loading…
Cancel
Save