Skip to content

Commit cc10e2d

Browse files
committed
Worker: remove work from the foreground
* This shouldn't be necessary anymore after the previous fix
1 parent 22c82d4 commit cc10e2d

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

app/src/main/java/com/thewizrd/simpleweather/services/WeatherUpdaterWorker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import android.content.Context;
1010
import android.content.Intent;
1111
import android.content.pm.PackageManager;
12-
import android.content.pm.ServiceInfo;
1312
import android.location.Criteria;
1413
import android.location.Location;
1514
import android.location.LocationListener;
@@ -27,7 +26,6 @@
2726
import androidx.work.Constraints;
2827
import androidx.work.ExistingPeriodicWorkPolicy;
2928
import androidx.work.ExistingWorkPolicy;
30-
import androidx.work.ForegroundInfo;
3129
import androidx.work.ListenableWorker;
3230
import androidx.work.NetworkType;
3331
import androidx.work.OneTimeWorkRequest;
@@ -190,6 +188,7 @@ public ListenableFuture<Result> startWork() {
190188
final boolean hasBackgroundLocationAccess = Build.VERSION.SDK_INT < Build.VERSION_CODES.Q ||
191189
ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_BACKGROUND_LOCATION) == PackageManager.PERMISSION_GRANTED;
192190

191+
/*
193192
// Request work to be in foreground (only for Oreo+)
194193
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
195194
try {
@@ -206,6 +205,7 @@ public ListenableFuture<Result> startWork() {
206205
// no-op
207206
}
208207
}
208+
*/
209209

210210
return MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor()).submit(new Callable<Result>() {
211211
@Override

app/src/main/java/com/thewizrd/simpleweather/services/WidgetUpdaterWorker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import android.app.NotificationManager;
77
import android.content.Context;
88
import android.content.Intent;
9-
import android.content.pm.ServiceInfo;
109
import android.os.Build;
1110
import android.util.Log;
1211

@@ -16,7 +15,6 @@
1615
import androidx.work.Constraints;
1716
import androidx.work.ExistingPeriodicWorkPolicy;
1817
import androidx.work.ExistingWorkPolicy;
19-
import androidx.work.ForegroundInfo;
2018
import androidx.work.OneTimeWorkRequest;
2119
import androidx.work.PeriodicWorkRequest;
2220
import androidx.work.WorkInfo;
@@ -140,6 +138,7 @@ private static boolean cancelWork(@NonNull Context context) {
140138
@NonNull
141139
@Override
142140
public Result doWork() {
141+
/*
143142
// Request work to be in foreground (only for Oreo+)
144143
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
145144
try {
@@ -152,6 +151,7 @@ public Result doWork() {
152151
// no-op
153152
}
154153
}
154+
*/
155155

156156
if (Settings.isWeatherLoaded()) {
157157
if (WeatherWidgetService.widgetsExist(mContext)) {

wearapp/src/main/java/com/thewizrd/simpleweather/services/WeatherUpdaterWorker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import android.content.Context;
99
import android.content.Intent;
1010
import android.content.pm.PackageManager;
11-
import android.content.pm.ServiceInfo;
1211
import android.location.Criteria;
1312
import android.location.Location;
1413
import android.location.LocationListener;
@@ -26,7 +25,6 @@
2625
import androidx.work.Constraints;
2726
import androidx.work.ExistingPeriodicWorkPolicy;
2827
import androidx.work.ExistingWorkPolicy;
29-
import androidx.work.ForegroundInfo;
3028
import androidx.work.ListenableWorker;
3129
import androidx.work.NetworkType;
3230
import androidx.work.OneTimeWorkRequest;
@@ -181,6 +179,7 @@ public ListenableFuture<Result> startWork() {
181179
final boolean hasBackgroundLocationAccess = Build.VERSION.SDK_INT < Build.VERSION_CODES.Q ||
182180
ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_BACKGROUND_LOCATION) == PackageManager.PERMISSION_GRANTED;
183181

182+
/*
184183
// Request work to be in foreground (only for Oreo+)
185184
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
186185
try {
@@ -197,6 +196,7 @@ public ListenableFuture<Result> startWork() {
197196
// no-op
198197
}
199198
}
199+
*/
200200

201201
return MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor()).submit(new Callable<Result>() {
202202
@Override

0 commit comments

Comments
 (0)