TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-25 13:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update WorkManager to alpha12.

Browse Source
This commit is contained in:
Greyson Parrelli
2018-12-07 09:39:08 -08:00
parent 40f9b32a75
commit 1a50910910
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/thoughtcrime/securesms/jobmanager/Job.java
View File

@@ -9,18 +9,16 @@ import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.jobmanager.dependencies.ContextDependent;
import org.thoughtcrime.securesms.jobmanager.requirements.NetworkRequirement;
import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement;
import org.thoughtcrime.securesms.jobs.requirements.SqlCipherMigrationRequirement;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.service.GenericForegroundService;
import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import androidx.work.Data;
import androidx.work.Result;
import androidx.work.Worker;
import androidx.work.WorkerParameters;
@@ -99,7 +97,7 @@ public abstract class Job extends Worker implements Serializable {
onRun();
log("Successfully completed." + logSuffix());
return Result.SUCCESS;
return Result.success();
} else {
log("Retrying due to unmet requirements." + logSuffix());
return retry();
@@ -201,12 +199,12 @@ public abstract class Job extends Worker implements Serializable {
private Result retry() {
onRetry();
return Result.RETRY;
return Result.retry();
}
private Result cancel() {
onCanceled();
return Result.SUCCESS;
return Result.success();
}
private boolean requirementsMet(@NonNull Data data) {

10
src/org/thoughtcrime/securesms/jobmanager/WorkLockManager.java
View File

@@ -9,7 +9,7 @@ import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Semaphore;
import androidx.work.Worker;
import androidx.work.Result;
class WorkLockManager {
@@ -57,8 +57,8 @@ class WorkLockManager {
private final Semaphore lock;
private final UUID uuid;
private Worker.Result result;
private int count;
private Result result;
private int count;
private WorkLock(@NonNull UUID uuid) {
this.uuid = uuid;
@@ -78,11 +78,11 @@ class WorkLockManager {
return lock;
}
void setResult(@NonNull Worker.Result result) {
void setResult(@NonNull Result result) {
this.result = result;
}
@Nullable Worker.Result getResult() {
@Nullable Result getResult() {
return result;
}