From ef1655d40bd57def1be93ddaa23dd66d8e3c1287 Mon Sep 17 00:00:00 2001
From: Ben Weiss <benweiss@google.com>
Date: Tue, 23 Feb 2021 16:39:28 +0000
Subject: [PATCH] Cleanup

* Fix AndroidManifest warnings
* Improve formatting of App
* Request access to legacy storage #cleanup
* Move image insertion in separate function
---
 .../app/src/main/AndroidManifest.xml          |  5 +++--
 .../main/java/com/example/background/App.kt   |  3 ++-
 .../workers/SaveImageToGalleryWorker.kt       | 19 +++++++++++++------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/WorkManagerSample/app/src/main/AndroidManifest.xml b/WorkManagerSample/app/src/main/AndroidManifest.xml
index f7a9e7d..15ac76a 100644
--- a/WorkManagerSample/app/src/main/AndroidManifest.xml
+++ b/WorkManagerSample/app/src/main/AndroidManifest.xml
@@ -25,12 +25,13 @@
 
     <application
         android:name=".App"
-        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:allowBackup="true"
+        android:theme="@style/AppTheme"
+        android:requestLegacyExternalStorage="true">
 
         <provider
                 android:name="androidx.work.impl.WorkManagerInitializer"
diff --git a/WorkManagerSample/app/src/main/java/com/example/background/App.kt b/WorkManagerSample/app/src/main/java/com/example/background/App.kt
index 2521a87..2bd61c4 100644
--- a/WorkManagerSample/app/src/main/java/com/example/background/App.kt
+++ b/WorkManagerSample/app/src/main/java/com/example/background/App.kt
@@ -31,5 +31,6 @@ class App : Application(), Configuration.Provider {
     override fun getWorkManagerConfiguration() =
         Configuration.Builder()
             .setWorkerFactory(RenameWorkerFactory())
-            .setMinimumLoggingLevel(Log.VERBOSE).build()
+            .setMinimumLoggingLevel(Log.VERBOSE)
+            .build()
 }
diff --git a/WorkManagerSample/lib/src/main/java/com/example/background/workers/SaveImageToGalleryWorker.kt b/WorkManagerSample/lib/src/main/java/com/example/background/workers/SaveImageToGalleryWorker.kt
index 773ab3c..8917042 100644
--- a/WorkManagerSample/lib/src/main/java/com/example/background/workers/SaveImageToGalleryWorker.kt
+++ b/WorkManagerSample/lib/src/main/java/com/example/background/workers/SaveImageToGalleryWorker.kt
@@ -16,10 +16,12 @@
 
 package com.example.background.workers
 
+import android.content.ContentResolver
 import android.content.Context
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.provider.MediaStore
+import android.provider.MediaStore.Images.Media
 import android.util.Log
 import androidx.work.Data
 import androidx.work.Worker
@@ -38,17 +40,15 @@ class SaveImageToGalleryWorker(appContext: Context, workerParams: WorkerParamete
     override fun doWork(): Result {
         val resolver = applicationContext.contentResolver
         return try {
-            val resourceUri = Uri.parse(inputData.getString(Constants.KEY_IMAGE_URI))
-            val bitmap = BitmapFactory.decodeStream(resolver.openInputStream(resourceUri))
-            val imageUrl = MediaStore.Images.Media.insertImage(
-                resolver, bitmap, DATE_FORMATTER.format(Date()), TITLE)
-            if (imageUrl.isEmpty()) {
+            val input = Uri.parse(inputData.getString(Constants.KEY_IMAGE_URI))
+            val imageLocation = insertImage(resolver, input)
+            if (imageLocation.isNullOrEmpty()) {
                 Log.e(TAG, "Writing to MediaStore failed")
                 Result.failure()
             }
             // Set the result of the worker by calling setOutputData().
             val output = Data.Builder()
-                .putString(Constants.KEY_IMAGE_URI, imageUrl)
+                .putString(Constants.KEY_IMAGE_URI, imageLocation)
                 .build()
             Result.success(output)
         } catch (exception: Exception) {
@@ -57,6 +57,13 @@ class SaveImageToGalleryWorker(appContext: Context, workerParams: WorkerParamete
         }
     }
 
+    private fun insertImage(resolver: ContentResolver, resourceUri: Uri): String? {
+        val bitmap = BitmapFactory.decodeStream(resolver.openInputStream(resourceUri))
+        return Media.insertImage(
+            resolver, bitmap, DATE_FORMATTER.format(Date()), TITLE
+        )
+    }
+
     companion object {
         private const val TAG = "SvImageToGalleryWrkr"
         private const val TITLE = "Filtered Image"
-- 
GitLab