Revert "Update WorkManager to 1.0.0-alpha05"

This reverts commit 4dc84cb due to https://issuetracker.google.com/issues/111801342
muzei · Jul 25, 2018 · ba6d22b · ba6d22b
1 parent 60cc028
commit ba6d22b
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 15 deletions.
diff --git a/android-client-common/src/main/java/com/google/android/apps/muzei/sync/ArtworkLoadWorker.kt b/android-client-common/src/main/java/com/google/android/apps/muzei/sync/ArtworkLoadWorker.kt
@@ -62,7 +62,7 @@ class ArtworkLoadWorker : Worker() {
         private const val ARTWORK_LOAD_THROTTLE = 250 // quarter second
 
         internal fun enqueueNext() {
-            val workManager = WorkManager.getInstance()
+            val workManager = WorkManager.getInstance() ?: return
             workManager.beginUniqueWork(TAG, ExistingWorkPolicy.REPLACE,
                     OneTimeWorkRequestBuilder<ArtworkLoadWorker>().build())
                     .enqueue()
@@ -72,7 +72,7 @@ class ArtworkLoadWorker : Worker() {
                 loadFrequencySeconds: Long,
                 loadOnWifi: Boolean
         ) {
-            val workManager = WorkManager.getInstance()
+            val workManager = WorkManager.getInstance() ?: return
             workManager.enqueueUniquePeriodicWork(PERIODIC_TAG, ExistingPeriodicWorkPolicy.REPLACE,
                     PeriodicWorkRequestBuilder<ArtworkLoadWorker>(
                             loadFrequencySeconds, TimeUnit.SECONDS,
@@ -88,7 +88,7 @@ class ArtworkLoadWorker : Worker() {
         }
 
         fun cancelPeriodic() {
-            val workManager = WorkManager.getInstance()
+            val workManager = WorkManager.getInstance() ?: return
             workManager.cancelUniqueWork(PERIODIC_TAG)
         }
     }

diff --git a/...d-client-common/src/main/java/com/google/android/apps/muzei/sync/ProviderChangedWorker.kt b/...d-client-common/src/main/java/com/google/android/apps/muzei/sync/ProviderChangedWorker.kt
@@ -62,7 +62,7 @@ class ProviderChangedWorker : Worker() {
         private const val PREF_PERSISTENT_LISTENERS = "persistentListeners"
 
         internal fun enqueueSelected() {
-            val workManager = WorkManager.getInstance()
+            val workManager = WorkManager.getInstance() ?: return
             workManager.enqueue(OneTimeWorkRequestBuilder<ProviderChangedWorker>()
                     .setInputData(Data.Builder()
                             .putString(TAG, "selected")
@@ -71,7 +71,7 @@ class ProviderChangedWorker : Worker() {
         }
 
         internal fun enqueueChanged() {
-            val workManager = WorkManager.getInstance()
+            val workManager = WorkManager.getInstance() ?: return
             workManager.enqueue(OneTimeWorkRequestBuilder<ProviderChangedWorker>()
                     .setInputData(Data.Builder()
                             .putString(TAG, "changed")
@@ -146,7 +146,7 @@ class ProviderChangedWorker : Worker() {
 
         @RequiresApi(Build.VERSION_CODES.N)
         private fun scheduleObserver(contentUri: Uri) {
-            val workManager = WorkManager.getInstance()
+            val workManager = WorkManager.getInstance() ?: return
             workManager.enqueue(OneTimeWorkRequestBuilder<ProviderChangedWorker>()
                     .addTag(PERSISTENT_CHANGED_TAG)
                     .setInputData(Data.Builder()
@@ -160,18 +160,18 @@ class ProviderChangedWorker : Worker() {
         }
 
         private fun cancelObserver() {
-            val workManager = WorkManager.getInstance()
+            val workManager = WorkManager.getInstance() ?: return
             workManager.cancelAllWorkByTag(PERSISTENT_CHANGED_TAG)
         }
     }
 
     override fun doWork() = runBlocking(syncSingleThreadContext) {
-        val tag = inputData.getString(TAG) ?: ""
+        val tag = inputData.getString(TAG, "") ?: ""
         // First schedule the observer to pick up any changes fired
         // by the work done in handleProviderChange
         if (tag == PERSISTENT_CHANGED_TAG &&
                 Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            inputData.getString(EXTRA_CONTENT_URI)?.toUri()?.run {
+            inputData.getString(EXTRA_CONTENT_URI, "")?.toUri()?.run {
                 scheduleObserver(this)
             }
         }

diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ buildscript {
         roomVersion = "1.1.1"
         pagingVersion = "1.0.1"
         navigationVersion = "1.0.0-alpha04"
-        workManagerVersion = "1.0.0-alpha05"
+        workManagerVersion = "1.0.0-alpha04"
         playServicesWearableVersion = "15.0.1"
         firebaseCoreVersion = "16.0.1"
         firebasePerfVersion = "16.0.0"

diff --git a/example-unsplash/src/main/java/com/example/muzei/unsplash/UnsplashExampleWorker.kt b/example-unsplash/src/main/java/com/example/muzei/unsplash/UnsplashExampleWorker.kt
@@ -33,7 +33,7 @@ class UnsplashExampleWorker : Worker() {
         private const val TAG = "UnsplashExample"
 
         internal fun enqueueLoad() {
-            val workManager = WorkManager.getInstance()
+            val workManager = WorkManager.getInstance() ?: return
             workManager.enqueue(OneTimeWorkRequestBuilder<UnsplashExampleWorker>()
                     .setConstraints(Constraints.Builder()
                             .setRequiredNetworkType(NetworkType.CONNECTED)

diff --git a/...featured-art/src/main/java/com/google/android/apps/muzei/featuredart/FeaturedArtWorker.kt b/...featured-art/src/main/java/com/google/android/apps/muzei/featuredart/FeaturedArtWorker.kt
@@ -81,7 +81,7 @@ class FeaturedArtWorker : Worker() {
                 Log.d(TAG, "Enqueuing next artwork with delay of " +
                     DateUtils.formatElapsedTime(TimeUnit.MILLISECONDS.toSeconds(delay)))
             }
-            val workManager = WorkManager.getInstance()
+            val workManager = WorkManager.getInstance() ?: return
             workManager.beginUniqueWork(
                     TAG,
                     ExistingWorkPolicy.KEEP,

diff --git a/source-gallery/src/main/java/com/google/android/apps/muzei/gallery/GalleryScanWorker.kt b/source-gallery/src/main/java/com/google/android/apps/muzei/gallery/GalleryScanWorker.kt
@@ -56,6 +56,7 @@ class GalleryScanWorker : Worker() {
 
         fun enqueueInitialScan(ids: List<Long>) {
             val workManager = WorkManager.getInstance()
+                    ?: return
             workManager.enqueue(ids.map { id ->
                 OneTimeWorkRequestBuilder<GalleryScanWorker>()
                         .addTag(INITIAL_SCAN_TAG)
@@ -68,6 +69,7 @@ class GalleryScanWorker : Worker() {
 
         fun enqueueRescan() {
             val workManager = WorkManager.getInstance()
+                    ?: return
             workManager.beginUniqueWork("rescan",
                     ExistingWorkPolicy.REPLACE,
                     OneTimeWorkRequestBuilder<GalleryScanWorker>()

diff --git a/...le/src/main/java/com/google/android/apps/muzei/complications/ArtworkComplicationWorker.kt b/...le/src/main/java/com/google/android/apps/muzei/complications/ArtworkComplicationWorker.kt
@@ -41,7 +41,7 @@ class ArtworkComplicationWorker : Worker() {
         private const val TAG = "ArtworkComplication"
 
         internal fun scheduleComplicationUpdate() {
-            val workManager = WorkManager.getInstance()
+            val workManager = WorkManager.getInstance() ?: return
             workManager.beginUniqueWork(TAG, ExistingWorkPolicy.REPLACE,
                     OneTimeWorkRequestBuilder<ArtworkComplicationWorker>()
                             .setConstraints(Constraints.Builder()
@@ -55,7 +55,7 @@ class ArtworkComplicationWorker : Worker() {
         }
 
         internal fun cancelComplicationUpdate() {
-            val workManager = WorkManager.getInstance()
+            val workManager = WorkManager.getInstance() ?: return
             workManager.cancelUniqueWork(TAG)
             if (BuildConfig.DEBUG) {
                 Log.d(TAG, "Work cancelled")

diff --git a/wearable/src/main/java/com/google/android/apps/muzei/datalayer/DataLayerLoadWorker.kt b/wearable/src/main/java/com/google/android/apps/muzei/datalayer/DataLayerLoadWorker.kt
@@ -56,7 +56,7 @@ class DataLayerLoadWorker : Worker() {
          * @param showNotification Show a notification to activate Muzei if the artwork is not found
          */
         fun enqueueLoad(showNotification: Boolean = false) {
-            val workManager = WorkManager.getInstance()
+            val workManager = WorkManager.getInstance() ?: return
             workManager.enqueue(OneTimeWorkRequestBuilder<DataLayerLoadWorker>().apply{
                 if (showNotification) {
                     setInputData(Data.Builder()