From d0d61c5aa317685f06802a202a2f46c71e1da962 Mon Sep 17 00:00:00 2001 From: Rahul Ravikumar Date: Thu, 19 Apr 2018 16:52:46 -0700 Subject: Rename Worker#getAppContext to Worker#getApplicationContext() Test: Existing unit tests pass. Change-Id: I17e4a8596d43c942c37485833a8eb007587582a4 Fixes: b/78288767 (cherry picked from commit f80b700a707b5c29592dc06b3c4ae70f57e8a456) --- .../main/java/androidx/work/integration/testapp/ToastWorker.java | 2 +- .../integration/testapp/imageprocessing/ImageCleanupWorker.java | 5 +++-- .../integration/testapp/imageprocessing/ImageProcessingWorker.java | 6 +++--- .../work/integration/testapp/imageprocessing/ImageSetupWorker.java | 2 +- .../work/integration/testapp/sherlockholmes/TextMappingWorker.java | 5 +++-- .../work/integration/testapp/sherlockholmes/TextReducingWorker.java | 4 ++-- .../work/integration/testapp/sherlockholmes/TextStartupWorker.java | 2 +- .../src/androidTest/java/androidx/work/impl/WorkerWrapperTest.java | 2 +- work/workmanager/src/main/java/androidx/work/Worker.java | 2 +- .../java/androidx/work/impl/workers/ConstraintTrackingWorker.java | 4 ++-- 10 files changed, 18 insertions(+), 16 deletions(-) (limited to 'work') diff --git a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/ToastWorker.java b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/ToastWorker.java index 397c11f3a65..305c6f5a311 100644 --- a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/ToastWorker.java +++ b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/ToastWorker.java @@ -50,7 +50,7 @@ public class ToastWorker extends Worker { @Override public void run() { Log.d("ToastWorker", message); - Toast.makeText(getAppContext(), message, Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), message, Toast.LENGTH_SHORT).show(); } }); return WorkerResult.SUCCESS; diff --git a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/imageprocessing/ImageCleanupWorker.java b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/imageprocessing/ImageCleanupWorker.java index bac6f2838fb..92d99481feb 100644 --- a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/imageprocessing/ImageCleanupWorker.java +++ b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/imageprocessing/ImageCleanupWorker.java @@ -36,7 +36,8 @@ public class ImageCleanupWorker extends Worker { @Override public @NonNull WorkerResult doWork() { Log.d(TAG, "Started"); - List images = TestDatabase.getInstance(getAppContext()).getImageDao().getImages(); + List images = TestDatabase.getInstance(getApplicationContext()) + .getImageDao().getImages(); for (Image image : images) { if (!TextUtils.isEmpty(image.mProcessedFilePath)) { if (new File(image.mProcessedFilePath).delete()) { @@ -48,7 +49,7 @@ public class ImageCleanupWorker extends Worker { Log.d(TAG, image.mOriginalAssetName + "was not processed"); } } - TestDatabase.getInstance(getAppContext()).getImageDao().clear(); + TestDatabase.getInstance(getApplicationContext()).getImageDao().clear(); Log.d(TAG, "Cleanup Complete!"); return WorkerResult.SUCCESS; } diff --git a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/imageprocessing/ImageProcessingWorker.java b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/imageprocessing/ImageProcessingWorker.java index e77f7017af5..0eb7cf1d614 100644 --- a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/imageprocessing/ImageProcessingWorker.java +++ b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/imageprocessing/ImageProcessingWorker.java @@ -68,7 +68,7 @@ public class ImageProcessingWorker extends Worker { return WorkerResult.FAILURE; } - int processed = TestDatabase.getInstance(getAppContext()) + int processed = TestDatabase.getInstance(getApplicationContext()) .getImageDao() .setProcessed(uriString, filePath); @@ -85,7 +85,7 @@ public class ImageProcessingWorker extends Worker { Uri uri = Uri.parse(uriString); InputStream inputStream = null; try { - inputStream = getAppContext().getContentResolver().openInputStream(uri); + inputStream = getApplicationContext().getContentResolver().openInputStream(uri); BitmapFactory.Options options = new BitmapFactory.Options(); options.inSampleSize = 4; // Sample down to save memory options.inMutable = true; // Allow editing of bitmap @@ -121,7 +121,7 @@ public class ImageProcessingWorker extends Worker { FileOutputStream os = null; try { File tempFile = File.createTempFile("compressed_", ".jpg", - getAppContext().getCacheDir()); + getApplicationContext().getCacheDir()); os = new FileOutputStream(tempFile); if (!bitmap.compress(Bitmap.CompressFormat.JPEG, 25, os)) { return null; diff --git a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/imageprocessing/ImageSetupWorker.java b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/imageprocessing/ImageSetupWorker.java index c1754593636..85919b35981 100644 --- a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/imageprocessing/ImageSetupWorker.java +++ b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/imageprocessing/ImageSetupWorker.java @@ -46,7 +46,7 @@ public class ImageSetupWorker extends Worker { Image image = new Image(); image.mOriginalAssetName = uriString; image.mIsProcessed = false; - TestDatabase.getInstance(getAppContext()).getImageDao().insert(image); + TestDatabase.getInstance(getApplicationContext()).getImageDao().insert(image); return WorkerResult.SUCCESS; } diff --git a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/sherlockholmes/TextMappingWorker.java b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/sherlockholmes/TextMappingWorker.java index 28fb4a5ad1b..aea53077654 100644 --- a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/sherlockholmes/TextMappingWorker.java +++ b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/sherlockholmes/TextMappingWorker.java @@ -60,7 +60,7 @@ public class TextMappingWorker extends Worker { String inputFileName = input.getString(INPUT_FILE, null); String outputFileName = "out_" + inputFileName; - AssetManager assetManager = getAppContext().getAssets(); + AssetManager assetManager = getApplicationContext().getAssets(); InputStream inputStream = null; Scanner scanner = null; try { @@ -94,7 +94,8 @@ public class TextMappingWorker extends Worker { FileOutputStream fileOutputStream = null; DataOutputStream dataOutputStream = null; try { - fileOutputStream = getAppContext().openFileOutput(outputFileName, Context.MODE_PRIVATE); + fileOutputStream = getApplicationContext() + .openFileOutput(outputFileName, Context.MODE_PRIVATE); dataOutputStream = new DataOutputStream(fileOutputStream); for (Map.Entry entry : mWordCount.entrySet()) { dataOutputStream.writeUTF(entry.getKey()); diff --git a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/sherlockholmes/TextReducingWorker.java b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/sherlockholmes/TextReducingWorker.java index 9c82fc64165..6dddb61a7e6 100644 --- a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/sherlockholmes/TextReducingWorker.java +++ b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/sherlockholmes/TextReducingWorker.java @@ -53,7 +53,7 @@ public class TextReducingWorker extends Worker { FileInputStream fileInputStream = null; DataInputStream dataInputStream = null; try { - fileInputStream = getAppContext().openFileInput(inputFiles[i]); + fileInputStream = getApplicationContext().openFileInput(inputFiles[i]); dataInputStream = new DataInputStream(fileInputStream); while (dataInputStream.available() > 0) { String word = dataInputStream.readUTF(); @@ -87,7 +87,7 @@ public class TextReducingWorker extends Worker { sortedList.addAll(mWordCount.entrySet()); Collections.sort(sortedList, (o1, o2) -> o2.getValue().compareTo(o1.getValue())); - TestDatabase db = TestDatabase.getInstance(getAppContext()); + TestDatabase db = TestDatabase.getInstance(getApplicationContext()); db.beginTransaction(); try { for (Map.Entry entry : sortedList) { diff --git a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/sherlockholmes/TextStartupWorker.java b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/sherlockholmes/TextStartupWorker.java index c8992e8eef2..4655565f3ec 100644 --- a/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/sherlockholmes/TextStartupWorker.java +++ b/work/integration-tests/testapp/src/main/java/androidx/work/integration/testapp/sherlockholmes/TextStartupWorker.java @@ -28,7 +28,7 @@ public class TextStartupWorker extends Worker { @Override public @NonNull WorkerResult doWork() { - TestDatabase db = TestDatabase.getInstance(getAppContext()); + TestDatabase db = TestDatabase.getInstance(getApplicationContext()); db.getWordCountDao().clear(); Log.d("Startup", "Database cleared"); return WorkerResult.SUCCESS; diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/WorkerWrapperTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/WorkerWrapperTest.java index 48b283b2d5c..8d4ce71a55e 100644 --- a/work/workmanager/src/androidTest/java/androidx/work/impl/WorkerWrapperTest.java +++ b/work/workmanager/src/androidTest/java/androidx/work/impl/WorkerWrapperTest.java @@ -565,7 +565,7 @@ public class WorkerWrapperTest extends DatabaseTest { null); assertThat(worker, is(notNullValue())); - assertThat(worker.getAppContext(), is(equalTo(mContext.getApplicationContext()))); + assertThat(worker.getApplicationContext(), is(equalTo(mContext.getApplicationContext()))); } @Test diff --git a/work/workmanager/src/main/java/androidx/work/Worker.java b/work/workmanager/src/main/java/androidx/work/Worker.java index a5678a88249..243a29c29cf 100644 --- a/work/workmanager/src/main/java/androidx/work/Worker.java +++ b/work/workmanager/src/main/java/androidx/work/Worker.java @@ -44,7 +44,7 @@ public abstract class Worker { private @NonNull Data mOutputData = Data.EMPTY; private @Nullable RuntimeExtras mRuntimeExtras; - public final @NonNull Context getAppContext() { + public final @NonNull Context getApplicationContext() { return mAppContext; } diff --git a/work/workmanager/src/main/java/androidx/work/impl/workers/ConstraintTrackingWorker.java b/work/workmanager/src/main/java/androidx/work/impl/workers/ConstraintTrackingWorker.java index 4ae5649cecb..75abadc2a70 100644 --- a/work/workmanager/src/main/java/androidx/work/impl/workers/ConstraintTrackingWorker.java +++ b/work/workmanager/src/main/java/androidx/work/impl/workers/ConstraintTrackingWorker.java @@ -72,7 +72,7 @@ public class ConstraintTrackingWorker extends Worker implements WorkConstraintsC // Instantiate the delegated worker. Use the same workSpecId, and the same Data // as this Worker's Data are a superset of the delegate's Worker's Data. mDelegate = WorkerWrapper.workerFromClassName( - getAppContext(), + getApplicationContext(), className, getId(), getInputData(), @@ -91,7 +91,7 @@ public class ConstraintTrackingWorker extends Worker implements WorkConstraintsC return WorkerResult.FAILURE; } WorkConstraintsTracker workConstraintsTracker = - new WorkConstraintsTracker(getAppContext(), this); + new WorkConstraintsTracker(getApplicationContext(), this); // Start tracking workConstraintsTracker.replace(Collections.singletonList(workSpec)); -- cgit v1.2.3