Refactoring

This commit is contained in:
M66B 2019-03-03 09:19:45 +00:00
parent 41e16cab20
commit 9a05d7ac6a
2 changed files with 6 additions and 11 deletions

View File

@ -215,7 +215,7 @@ public class EntityOperation {
else if (FOREGROUND.contains(name)) { else if (FOREGROUND.contains(name)) {
EntityAccount account = db.account().getAccount(message.account); EntityAccount account = db.account().getAccount(message.account);
if (account != null && !"connected".equals(account.state)) if (account != null && !"connected".equals(account.state))
WorkerForeground.queue(operation.folder); WorkerOperations.queue(operation.folder);
} }
} }
@ -248,7 +248,7 @@ public class EntityOperation {
if (account == null) // Outbox if (account == null) // Outbox
ServiceSend.start(context); ServiceSend.start(context);
else if (foreground && !"connected".equals(account.state)) else if (foreground && !"connected".equals(account.state))
WorkerForeground.queue(fid); WorkerOperations.queue(fid);
Log.i("Queued sync folder=" + folder + " foreground=" + foreground); Log.i("Queued sync folder=" + folder + " foreground=" + foreground);
} }

View File

@ -22,8 +22,8 @@ import androidx.work.WorkManager;
import androidx.work.Worker; import androidx.work.Worker;
import androidx.work.WorkerParameters; import androidx.work.WorkerParameters;
public class WorkerForeground extends Worker { public class WorkerOperations extends Worker {
public WorkerForeground(@NonNull Context context, @NonNull WorkerParameters args) { public WorkerOperations(@NonNull Context context, @NonNull WorkerParameters args) {
super(context, args); super(context, args);
} }
@ -118,13 +118,8 @@ public class WorkerForeground extends Worker {
return Result.success(); return Result.success();
} }
@Override
public void onStopped() {
Log.i("Worked stopped");
}
static void queue(long fid) { static void queue(long fid) {
String tag = "folder:" + fid; String tag = "operations:" + fid;
Log.i("Queuing work " + tag); Log.i("Queuing work " + tag);
try { try {
@ -139,7 +134,7 @@ public class WorkerForeground extends Worker {
Data data = new Data.Builder().putLong("folder", fid).build(); Data data = new Data.Builder().putLong("folder", fid).build();
OneTimeWorkRequest workRequest = OneTimeWorkRequest workRequest =
new OneTimeWorkRequest.Builder(WorkerForeground.class) new OneTimeWorkRequest.Builder(WorkerOperations.class)
.addTag(tag) .addTag(tag)
.setInputData(data) .setInputData(data)
.build(); .build();