From da16da5bfab66fb6ea9dcb335c6ad28d199607c0 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 22 Jun 2022 17:08:58 +0200 Subject: [PATCH] Revert "Fixed FTS when connect unmetered only" This reverts commit 8dd1ff69ecee27bfb31afa3f42fa9067d231b2d8. --- .../main/java/eu/faircode/email/ServiceSynchronize.java | 2 +- .../java/eu/faircode/email/TupleAccountNetworkState.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index 093bc9c254..e94cb49112 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -291,7 +291,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences accounts++; } if (current.accountState.synchronize) - operations += current.getOperations(); + operations += current.accountState.operations; long account = current.command.getLong("account", -1); if (account > 0 && !current.accountState.id.equals(account)) diff --git a/app/src/main/java/eu/faircode/email/TupleAccountNetworkState.java b/app/src/main/java/eu/faircode/email/TupleAccountNetworkState.java index a88fa5eb4b..2ce6a6b6fd 100644 --- a/app/src/main/java/eu/faircode/email/TupleAccountNetworkState.java +++ b/app/src/main/java/eu/faircode/email/TupleAccountNetworkState.java @@ -69,14 +69,6 @@ public class TupleAccountNetworkState { return (this.networkState.isSuitable() && this.accountState.shouldRun(enabled)); } - public int getOperations() { - boolean unmetered = jconditions.optBoolean("unmetered"); - if (unmetered && !this.networkState.isUnmetered()) - return 0; - - return accountState.operations; - } - @Override public boolean equals(@Nullable Object obj) { if (obj instanceof TupleAccountNetworkState) {