Add UploadServiceFacade for testability

Author: shiki

WordPress/src/main/java/org/wordpress/android/ui/uploads/LocalDraftUploadStarter.kt

@@ -32,10 +32,8 @@ class LocalDraftUploadStarter @Inject constructor(
     private val context: Context,
     private val postStore: PostStore,
     private val siteStore: SiteStore,
-    /**
-     * The Coroutine dispatcher used for querying in FluxC.
-     */
     @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
+    private val uploadServiceFacade: UploadServiceFacade,
     private val networkUtilsWrapper: NetworkUtilsWrapper,
     connectionStatus: LiveData<ConnectionStatus>
 ) : CoroutineScope {
@@ -76,10 +74,15 @@ class LocalDraftUploadStarter @Inject constructor(
 
     private fun upload(scope: CoroutineScope, site: SiteModel) = scope.launch(Dispatchers.IO) {
         postStore.getLocalDraftPosts(site)
-                .filterNot { UploadService.isPostUploadingOrQueued(it) }
+                .filterNot { uploadServiceFacade.isPostUploadingOrQueued(it) }
                 .forEach { localDraft ->
-                    val intent = UploadService.getUploadPostServiceIntent(context, localDraft, false, false, true)
-                    context.startService(intent)
+                    uploadServiceFacade.uploadPost(
+                            context = context,
+                            post = localDraft,
+                            trackAnalytics = false,
+                            publish = false,
+                            isRetry = true
+                    )
                 }
     }
 }

WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadServiceFacade.kt

@@ -0,0 +1,20 @@
+package org.wordpress.android.ui.uploads
+
+import android.content.Context
+import org.wordpress.android.fluxc.model.PostModel
+import javax.inject.Inject
+
+/**
+ * An injectable class built on top of [UploadService].
+ *
+ * The main purpose of this is to provide testability for classes that use [UploadService]. This should never
+ * contain any static methods.
+ */
+class UploadServiceFacade @Inject constructor() {
+    fun uploadPost(context: Context, post: PostModel, trackAnalytics: Boolean, publish: Boolean, isRetry: Boolean) {
+        val intent = UploadService.getUploadPostServiceIntent(context, post, trackAnalytics, publish, isRetry)
+        context.startService(intent)
+    }
+
+    fun isPostUploadingOrQueued(post: PostModel) = UploadService.isPostUploadingOrQueued(post)
+}