Refactoring

pull/148/head
M66B 7 years ago
parent 370b0f3107
commit 8028304485

@ -21,6 +21,7 @@ package eu.faircode.email;
import android.content.Context;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@ -163,7 +164,7 @@ public class EntityFolder implements Serializable {
public EntityFolder() {
}
long getSyncDays() {
JSONArray getSyncArgs() {
int days = sync_days;
if (last_sync != null) {
int ago_days = (int) ((new Date().getTime() - last_sync) / (24 * 3600 * 1000L)) + 1;
@ -171,7 +172,12 @@ public class EntityFolder implements Serializable {
days = ago_days;
}
return (initialize ? Math.min(DEFAULT_INIT, keep_days) : days);
JSONArray jargs = new JSONArray();
jargs.put(initialize ? Math.min(DEFAULT_INIT, keep_days) : days);
jargs.put(keep_days);
jargs.put(download);
return jargs;
}
static int getIcon(String type) {

@ -102,16 +102,11 @@ public class EntityOperation {
EntityFolder folder = db.folder().getFolder(fid);
JSONArray jargs = new JSONArray();
jargs.put(folder.getSyncDays());
jargs.put(folder.keep_days);
jargs.put(folder.download);
EntityOperation operation = new EntityOperation();
operation.folder = folder.id;
operation.message = null;
operation.name = SYNC;
operation.args = jargs.toString();
operation.args = folder.getSyncArgs().toString();
operation.created = new Date().getTime();
operation.id = db.operation().insertOperation(operation);

@ -2259,11 +2259,7 @@ public class ServiceSynchronize extends LifecycleService {
Log.i(folder.name + " connected");
// Synchronize messages
JSONArray jargs = new JSONArray();
jargs.put(folder.getSyncDays());
jargs.put(folder.keep_days);
jargs.put(folder.download);
synchronizeMessages(account, folder, (IMAPFolder) ifolder, jargs, new ServiceState());
synchronizeMessages(account, folder, (IMAPFolder) ifolder, folder.getSyncArgs(), new ServiceState());
} catch (Throwable ex) {
db.account().setAccountError(account.id, Helper.formatThrowable(ex));

Loading…
Cancel
Save