@ammarahmed/react-native-upload 6.22.0 → 6.24.0

package/android/build.gradle

@@ -72,10 +72,7 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:$_kotlinStdlib:$_kotlinVersion"
 
-    //noinspection GradleDependency
-    implementation 'net.gotev:uploadservice:4.9.4'
-    //noinspection GradleDependency
-    implementation 'net.gotev:uploadservice-okhttp:4.9.4'
+    implementation 'com.github.ammarahm-ed:android-upload-service:e7fdda2c3dc18b0e5b838bfb53c59b728f66a42d'
 
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.google.code.gson:gson:2.10.1'

package/android/src/main/java/com/appfolio/uploader/GlobalRequestObserverDelegate.kt

@@ -40,8 +40,8 @@ class GlobalRequestObserverDelegate(reactContext: ReactApplicationContext) : Req
     val params = Arguments.createMap()
     params.putString("id", uploadInfo.uploadId)
     params.putInt("progress", uploadInfo.progressPercent) //0-100
-    params.putLong("totalBytes", uploadInfo.totalBytes)
-    params.putLong("uploadedBytes", uploadInfo.uploadedBytes)
+    params.putDouble("totalBytes", uploadInfo.totalBytes.toDouble())
+    params.putDouble("uploadedBytes", uploadInfo.uploadedBytes.toDouble())
     sendEvent("progress", params, context)
   }
 
@@ -51,8 +51,8 @@ class GlobalRequestObserverDelegate(reactContext: ReactApplicationContext) : Req
     params.putInt("responseCode", serverResponse.code)
     params.putString("responseBody", serverResponse.bodyString)
     params.putInt("progress", uploadInfo.progressPercent)
-    params.putLong("totalBytes", uploadInfo.totalBytes)
-    params.putLong("uploadedBytes", uploadInfo.uploadedBytes)
+    params.putDouble("totalBytes", uploadInfo.totalBytes.toDouble())
+    params.putDouble("uploadedBytes", uploadInfo.uploadedBytes.toDouble())
     sendEvent("completed", params, context)
   }
 

package/android/src/main/java/com/appfolio/uploader/UploaderModule.kt

@@ -7,18 +7,24 @@ import android.content.Context
 import android.os.Build
 import android.util.Log
 import android.webkit.MimeTypeMap
+import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
-import com.appfolio.work.UploadManager
-import com.appfolio.work.UploadWorker
 import com.facebook.react.BuildConfig
 import com.facebook.react.bridge.*
+import net.gotev.uploadservice.UploadServiceConfig
+import net.gotev.uploadservice.UploadServiceConfig.defaultNotificationChannel
 import net.gotev.uploadservice.UploadServiceConfig.httpStack
 import net.gotev.uploadservice.UploadServiceConfig.initialize
+import net.gotev.uploadservice.UploadWorker
 import net.gotev.uploadservice.data.UploadNotificationConfig
 import net.gotev.uploadservice.data.UploadNotificationStatusConfig
+import net.gotev.uploadservice.extensions.startNewUpload
 import net.gotev.uploadservice.observer.request.GlobalRequestObserver
 import net.gotev.uploadservice.okhttp.OkHttpStack
+import net.gotev.uploadservice.placeholders.Placeholder
+import net.gotev.uploadservice.protocols.binary.BinaryUploadRequest
+import net.gotev.uploadservice.protocols.multipart.MultipartUploadRequest
 import okhttp3.OkHttpClient
 import java.io.File
 import java.util.concurrent.TimeUnit
@@ -119,6 +125,7 @@ class UploaderModule(val reactContext: ReactApplicationContext) : ReactContextBa
       }
       readTimeout = options.getInt("readTimeout")
     }
+
     httpStack = OkHttpStack(OkHttpClient().newBuilder()
             .followRedirects(followRedirects)
             .followSslRedirects(followSslRedirects)
@@ -197,7 +204,7 @@ class UploaderModule(val reactContext: ReactApplicationContext) : ReactContextBa
     val customUploadId = if (options.hasKey("customUploadId") && options.getType("method") == ReadableType.String) options.getString("customUploadId") else null
     try {
       val request = if (requestType == "raw") {
-        ModifiedBinaryUploadRequest(this.reactApplicationContext, url!!, limitNetwork)
+        BinaryUploadRequest(this.reactApplicationContext, url!!)
                 .setFileToUpload(filePath!!)
       } else {
         if (!options.hasKey("field")) {
@@ -208,36 +215,46 @@ class UploaderModule(val reactContext: ReactApplicationContext) : ReactContextBa
           promise.reject(java.lang.IllegalArgumentException("field must be string."))
           return
         }
-        ModifiedMultipartUploadRequest(this.reactApplicationContext, url!!, limitNetwork)
+        MultipartUploadRequest(this.reactApplicationContext, url!!)
                 .addFileToUpload(filePath!!, options.getString("field")!!)
       }
       request.setMethod(method!!)
               .setMaxRetries(maxRetries)
-      if (notification.getBoolean("enabled")) {
-        val notificationConfig = UploadNotificationConfig(
-                notificationChannelId = notificationChannelID,
-                isRingToneEnabled = notification.hasKey("enableRingTone") && notification.getBoolean("enableRingTone"),
-                progress = UploadNotificationStatusConfig(
-                        title = if (notification.hasKey("onProgressTitle")) notification.getString("onProgressTitle")!! else "",
-                        message = if (notification.hasKey("onProgressMessage")) notification.getString("onProgressMessage")!! else ""
-                ),
-                success = UploadNotificationStatusConfig(
-                        title = if (notification.hasKey("onCompleteTitle")) notification.getString("onCompleteTitle")!! else "",
-                        message = if (notification.hasKey("onCompleteMessage")) notification.getString("onCompleteMessage")!! else "",
-                        autoClear = notification.hasKey("autoClear") && notification.getBoolean("autoClear")
-                ),
-                error = UploadNotificationStatusConfig(
-                        title = if (notification.hasKey("onErrorTitle")) notification.getString("onErrorTitle")!! else "",
-                        message = if (notification.hasKey("onErrorMessage")) notification.getString("onErrorMessage")!! else ""
-                ),
-                cancelled = UploadNotificationStatusConfig(
-                        title = if (notification.hasKey("onCancelledTitle")) notification.getString("onCancelledTitle")!! else "",
-                        message = if (notification.hasKey("onCancelledMessage")) notification.getString("onCancelledMessage")!! else ""
-                )
+
+      val filename = notification.getString("filename")
+      val notificationConfig =  UploadNotificationConfig(
+        notificationChannelId = defaultNotificationChannel!!,
+        isRingToneEnabled = true,
+        progress = UploadNotificationStatusConfig(
+          title = "Uploading ${filename}",
+          message = "Uploading at ${Placeholder.UploadRate} (${Placeholder.Progress})",
+//                actions = arrayListOf(
+//                    UploadNotificationAction(
+//                        icon = android.R.drawable.ic_menu_close_clear_cancel,
+//                        title = "Cancel",
+//                        intent = context.getCancelUploadIntent(uploadId)
+//                    )
+//                )
+        ),
+        success = UploadNotificationStatusConfig(
+          title = "Upload complete",
+          message = "Upload completed successfully in ${Placeholder.ElapsedTime}",
+          autoClear = true
+        ),
+        error = UploadNotificationStatusConfig(
+          title = "Upload failed",
+          message = "Error uploading ${filename}",
+          autoClear = true
+        ),
+        cancelled = UploadNotificationStatusConfig(
+          title = "Upload cancelled",
+          message = "Upload cancelled",
+          autoClear = true
         )
-        request.setNotificationConfig { _, _ ->
-          notificationConfig
-        }
+      )
+
+      request.setNotificationConfig { _, _ ->
+        notificationConfig
       }
       if (options.hasKey("parameters")) {
         if (requestType == "raw") {
@@ -268,8 +285,7 @@ class UploaderModule(val reactContext: ReactApplicationContext) : ReactContextBa
         }
       }
       if (customUploadId != null)
-        request.setCustomUploadID(customUploadId)
-
+        request.setUploadID(customUploadId)
       val uploadId = request.startUpload()
       promise.resolve(uploadId)
     } catch (exc: java.lang.Exception) {
@@ -292,7 +308,7 @@ class UploaderModule(val reactContext: ReactApplicationContext) : ReactContextBa
     }
 
     try {
-      UploadManager.stopUpload(cancelUploadId)
+      UploadWorker.stopUpload(cancelUploadId);
       val params = Arguments.createMap()
       params.putString("id", cancelUploadId)
       this.reactContext.emitDeviceEvent("RNFileUploader-cancelled", params)
@@ -310,8 +326,8 @@ class UploaderModule(val reactContext: ReactApplicationContext) : ReactContextBa
   @ReactMethod
   fun stopAllUploads(promise: Promise) {
     try {
-      UploadManager.stopAllUploads()
-      UploadManager.taskList.forEach {
+      UploadWorker.stopAllUploads()
+      UploadWorker.taskList.forEach {
         val params = Arguments.createMap()
         params.putString("id", it)
         this.reactContext.emitDeviceEvent("RNFileUploader-cancelled", params);
@@ -339,6 +355,7 @@ class UploaderModule(val reactContext: ReactApplicationContext) : ReactContextBa
         continue
       }
 
+
       val upload = Arguments.createMap()
       
       val idTag = info.tags.toTypedArray().find { it.startsWith(UploadWorker::class.java.simpleName) }
@@ -358,7 +375,7 @@ class UploaderModule(val reactContext: ReactApplicationContext) : ReactContextBa
       uploads.pushMap(upload)
     }
 
-    val uploadTaskList = UploadManager.taskList
+    val uploadTaskList = UploadWorker.taskList
     for (task in uploadTaskList) {
       val upload = Arguments.createMap()
       upload.putString("id", task)

package/dist/index.d.ts

@@ -4,6 +4,7 @@
 import { EmitterSubscription } from 'react-native';
 export type UploadEvent = 'progress' | 'error' | 'completed' | 'cancelled';
 export type NotificationOptions = {
+    filename: string;
     /**
      * Enable or diasable notifications. Works only on Android version < 8.0 Oreo. On Android versions >= 8.0 Oreo is required by Google's policy to display a notification when a background service run  { enabled: true }
      */

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ammarahmed/react-native-upload",
-  "version": "6.22.0",
+  "version": "6.24.0",
   "description": "Cross platform http post file uploader with Android and iOS background support.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -11,6 +11,7 @@ import {
 export type UploadEvent = 'progress' | 'error' | 'completed' | 'cancelled';
 
 export type NotificationOptions = {
+  filename: string;
   /**
    * Enable or diasable notifications. Works only on Android version < 8.0 Oreo. On Android versions >= 8.0 Oreo is required by Google's policy to display a notification when a background service run  { enabled: true }
    */

package/android/src/main/java/com/appfolio/extensions/ContextExtensions.kt

@@ -1,63 +0,0 @@
-package com.appfolio.extensions
-
-import android.content.Context
-import com.appfolio.work.TaskCompletionNotifier
-import com.appfolio.work.UploadManager
-import net.gotev.uploadservice.UploadTask
-import net.gotev.uploadservice.data.UploadNotificationConfig
-import net.gotev.uploadservice.data.UploadTaskParameters
-import net.gotev.uploadservice.logger.UploadServiceLogger
-import net.gotev.uploadservice.observer.task.BroadcastEmitter
-
-data class UploadTaskCreationParameters(
-    val params: UploadTaskParameters,
-    val notificationConfig: UploadNotificationConfig
-)
-
-/**
- * Creates a new task instance based on the requested task class in the intent.
- * @param creationParameters task creation params
- * @return task instance or null if the task class is not supported or invalid
- */
-@Suppress("UNCHECKED_CAST")
-fun Context.getUploadTask(
-    creationParameters: UploadTaskCreationParameters,
-    notificationId: Int
-): UploadTask? {
-    return try {
-        val observers = arrayOf(
-            BroadcastEmitter(this),
-            TaskCompletionNotifier()
-        )
-
-        val taskClass = Class.forName(creationParameters.params.taskClass) as Class<out UploadTask>
-        val uploadTask = taskClass.newInstance().apply {
-            init(
-                context = this@getUploadTask,
-                taskParams = creationParameters.params,
-                notificationConfig = creationParameters.notificationConfig,
-                notificationId = notificationId,
-                taskObservers = observers
-            )
-        }
-
-        UploadServiceLogger.debug(
-            component = UploadManager.TAG,
-            uploadId = creationParameters.params.id,
-            message = {
-                "Successfully created new task with class: ${taskClass.name}"
-            }
-        )
-        uploadTask
-    } catch (exc: Throwable) {
-        UploadServiceLogger.error(
-            component = UploadManager.TAG,
-            uploadId = "",
-            exception = exc,
-            message = {
-                "Error while instantiating new task"
-            }
-        )
-        null
-    }
-}

package/android/src/main/java/com/appfolio/extensions/UploadExtensions.kt

@@ -1,57 +0,0 @@
-package com.appfolio.extensions
-
-import androidx.work.Constraints
-import androidx.work.Data
-import androidx.work.NetworkType
-import androidx.work.OneTimeWorkRequest
-import com.google.gson.Gson
-import net.gotev.uploadservice.data.UploadFile
-import net.gotev.uploadservice.data.UploadNotificationConfig
-import net.gotev.uploadservice.data.UploadTaskParameters
-import net.gotev.uploadservice.extensions.setOrRemove
-import net.gotev.uploadservice.persistence.PersistableData
-
-private const val PROPERTY_PARAM_NAME = "multipartParamName"
-private const val PROPERTY_REMOTE_FILE_NAME = "multipartRemoteFileName"
-private const val PROPERTY_CONTENT_TYPE = "multipartContentType"
-const val PARAM_KEY_TASK_PARAMS = "PARAM_KEY_TASK_PARAMS"
-const val PARAM_KEY_NOTIF_CONFIG = "PARAM_KEY_NOTIF_CONFIG"
-
-internal var UploadFile.parameterName: String?
-  get() = properties[PROPERTY_PARAM_NAME]
-  set(value) {
-    properties.setOrRemove(PROPERTY_PARAM_NAME, value)
-  }
-
-internal var UploadFile.remoteFileName: String?
-  get() = properties[PROPERTY_REMOTE_FILE_NAME]
-  set(value) {
-    properties.setOrRemove(PROPERTY_REMOTE_FILE_NAME, value)
-  }
-
-internal var UploadFile.contentType: String?
-  get() = properties[PROPERTY_CONTENT_TYPE]
-  set(value) {
-    properties.setOrRemove(PROPERTY_CONTENT_TYPE, value)
-  }
-
-internal fun UploadTaskParameters.toJson(): String = toPersistableData().toJson()
-
-internal fun String.toUploadTaskParameters(): UploadTaskParameters = UploadTaskParameters.createFromPersistableData(PersistableData.fromJson(this))
-
-internal fun UploadNotificationConfig.toJson(): String = Gson().toJson(this)
-
-internal fun String.toUploadNotificationConfig() = Gson().fromJson(this, UploadNotificationConfig::class.java)
-
-internal fun OneTimeWorkRequest.Builder.setData(uploadTaskParameters: UploadTaskParameters, notificationConfig: UploadNotificationConfig) {
-  val data = Data.Builder()
-  data.putString(PARAM_KEY_TASK_PARAMS, uploadTaskParameters.toJson())
-  data.putString(PARAM_KEY_NOTIF_CONFIG, notificationConfig.toJson())
-  setInputData(data.build())
-}
-
-internal fun OneTimeWorkRequest.Builder.shouldLimitNetwork(limit: Boolean) {
-  val network = if (limit) NetworkType.UNMETERED else NetworkType.CONNECTED
-  val constraints = Constraints.Builder().setRequiredNetworkType(network).build()
-  setConstraints(constraints)
-}

package/android/src/main/java/com/appfolio/uploader/ModifiedBinaryUploadRequest.kt

@@ -1,29 +0,0 @@
-package com.appfolio.uploader
-import android.content.Context
-import net.gotev.uploadservice.UploadTask
-import net.gotev.uploadservice.data.UploadFile
-import net.gotev.uploadservice.protocols.binary.BinaryUploadRequest
-import net.gotev.uploadservice.protocols.binary.BinaryUploadTask
-import java.io.FileNotFoundException
-import java.io.IOException
-
-class ModifiedBinaryUploadRequest(context: Context, serverUrl: String, limitNetwork: Boolean) :
-    ModifiedHttpUploadRequest<ModifiedBinaryUploadRequest>(context, serverUrl, limitNetwork) {
-
-  override val taskClass: Class<out UploadTask>
-    get() = BinaryUploadTask::class.java
-
-  /**
-   * Sets the file used as raw body of the upload request.
-   *
-   * @param path path to the file that you want to upload
-   * @throws FileNotFoundException if the file to upload does not exist
-   * @return [BinaryUploadRequest]
-   */
-  @Throws(IOException::class)
-  fun setFileToUpload(path: String): ModifiedBinaryUploadRequest {
-    files.clear()
-    files.add(UploadFile(path))
-    return this
-  }
-}

package/android/src/main/java/com/appfolio/uploader/ModifiedHttpUploadRequest.kt

@@ -1,57 +0,0 @@
-package com.appfolio.uploader
-
-import android.content.Context
-import androidx.work.OneTimeWorkRequest
-import androidx.work.WorkManager
-import com.appfolio.extensions.setData
-import com.appfolio.extensions.shouldLimitNetwork
-import com.appfolio.work.UploadManager
-import com.appfolio.work.UploadWorker
-import net.gotev.uploadservice.HttpUploadRequest
-import net.gotev.uploadservice.data.UploadTaskParameters
-import java.util.*
-
-abstract class ModifiedHttpUploadRequest<B : HttpUploadRequest<B>>(context: Context, serverUrl: String, private val limitNetwork: Boolean = false) :
-    HttpUploadRequest<B>(context, serverUrl) {
-
-  private var started: Boolean = false
-  private var uploadId = UUID.randomUUID().toString()
-  private val uploadTaskParameters: UploadTaskParameters
-    get() = UploadTaskParameters(
-        taskClass = taskClass.name,
-        id = uploadId,
-        serverUrl = serverUrl,
-        maxRetries = maxRetries,
-        autoDeleteSuccessfullyUploadedFiles = autoDeleteSuccessfullyUploadedFiles,
-        files = files,
-        additionalParameters = getAdditionalParameters()
-    )
-
-  override fun startUpload(): String {
-    require(files.isNotEmpty()) { "Set the file to be used in the request body first!" }
-    check(!started) {
-      "You have already called startUpload() on this Upload request instance once and you " +
-          "cannot call it multiple times. Check your code."
-    }
-
-    check(!UploadManager.taskList.contains(uploadTaskParameters.id)) {
-      "You have tried to perform startUpload() using the same uploadID of an " +
-          "already running task. You're trying to use the same ID for multiple uploads."
-    }
-
-    started = true
-    val workManager: WorkManager = WorkManager.getInstance(context)
-    val uploadRequest = OneTimeWorkRequest.Builder(UploadWorker::class.java)
-    uploadRequest.shouldLimitNetwork(limitNetwork)
-    uploadRequest.addTag("${UploadWorker::class.java.simpleName}-$uploadId")
-    uploadRequest.setData(uploadTaskParameters, notificationConfig(context, uploadId))
-    workManager.enqueue(uploadRequest.build())
-
-    return uploadTaskParameters.id;
-  }
-
-  fun setCustomUploadID(uploadID: String) {
-    this.uploadId = uploadID
-    setUploadID(uploadID)
-  }
-}

package/android/src/main/java/com/appfolio/uploader/ModifiedMultipartUploadRequest.kt

@@ -1,60 +0,0 @@
-package com.appfolio.uploader
-
-import android.content.Context
-import com.appfolio.extensions.contentType
-import com.appfolio.extensions.parameterName
-import com.appfolio.extensions.remoteFileName
-import net.gotev.uploadservice.UploadTask
-import net.gotev.uploadservice.data.UploadFile
-import net.gotev.uploadservice.protocols.multipart.MultipartUploadTask
-import java.io.FileNotFoundException
-
-class ModifiedMultipartUploadRequest(context: Context, serverUrl: String, limitNetwork: Boolean)  :
-    ModifiedHttpUploadRequest<ModifiedMultipartUploadRequest>(context, serverUrl, limitNetwork) {
-
-  override val taskClass: Class<out UploadTask>
-    get() = MultipartUploadTask::class.java
-
-  /**
-   * Adds a file to this upload request.
-   *
-   * @param filePath path to the file that you want to upload
-   * @param parameterName Name of the form parameter that will contain file's data
-   * @param fileName File name seen by the server side script. If null, the original file name
-   * will be used
-   * @param contentType Content type of the file. If null or empty, the mime type will be
-   * automatically detected. If fore some reasons autodetection fails,
-   * `application/octet-stream` will be used by default
-   * @return [ModifiedMultipartUploadRequest]
-   */
-  @Throws(FileNotFoundException::class)
-  @JvmOverloads
-  fun addFileToUpload(
-      filePath: String,
-      parameterName: String,
-      fileName: String? = null,
-      contentType: String? = null
-  ): ModifiedMultipartUploadRequest {
-    require(filePath.isNotBlank() && parameterName.isNotBlank()) {
-      "Please specify valid filePath and parameterName. They cannot be blank."
-    }
-
-    files.add(UploadFile(filePath).apply {
-      this.parameterName = parameterName
-
-      this.contentType = if (contentType.isNullOrBlank()) {
-        handler.contentType(context)
-      } else {
-        contentType
-      }
-
-      remoteFileName = if (fileName.isNullOrBlank()) {
-        handler.name(context)
-      } else {
-        fileName
-      }
-    })
-
-    return this
-  }
-}

package/android/src/main/java/com/appfolio/work/TaskCompletionNotifier.kt

@@ -1,47 +0,0 @@
-package com.appfolio.work
-
-import net.gotev.uploadservice.data.UploadInfo
-import net.gotev.uploadservice.data.UploadNotificationConfig
-import net.gotev.uploadservice.network.ServerResponse
-import net.gotev.uploadservice.observer.task.UploadTaskObserver
-
-class TaskCompletionNotifier : UploadTaskObserver {
-  override fun onStart(
-      info: UploadInfo,
-      notificationId: Int,
-      notificationConfig: UploadNotificationConfig
-  ) {
-  }
-
-  override fun onProgress(
-      info: UploadInfo,
-      notificationId: Int,
-      notificationConfig: UploadNotificationConfig
-  ) {
-  }
-
-  override fun onSuccess(
-      info: UploadInfo,
-      notificationId: Int,
-      notificationConfig: UploadNotificationConfig,
-      response: ServerResponse
-  ) {
-  }
-
-  override fun onError(
-      info: UploadInfo,
-      notificationId: Int,
-      notificationConfig: UploadNotificationConfig,
-      exception: Throwable
-  ) {
-    UploadManager.taskFailed(info.uploadId)
-  }
-
-  override fun onCompleted(
-      info: UploadInfo,
-      notificationId: Int,
-      notificationConfig: UploadNotificationConfig
-  ) {
-    UploadManager.taskCompleted(info.uploadId)
-  }
-}

package/android/src/main/java/com/appfolio/work/UploadManager.kt

@@ -1,109 +0,0 @@
-package com.appfolio.work
-
-import android.content.Context
-import com.appfolio.extensions.UploadTaskCreationParameters
-import com.appfolio.extensions.getUploadTask
-import net.gotev.uploadservice.UploadTask
-import net.gotev.uploadservice.data.UploadNotificationConfig
-import net.gotev.uploadservice.data.UploadTaskParameters
-import net.gotev.uploadservice.logger.UploadServiceLogger
-import java.util.concurrent.*
-
-class UploadManager {
-
-  companion object {
-    /**
-     * Sets the Thread Pool to use for upload operations.
-     * By default a thread pool with size equal to the number of processors is created.
-     */
-    @JvmStatic
-    var threadPool: AbstractExecutorService = ThreadPoolExecutor(
-        Runtime.getRuntime().availableProcessors(), // Initial pool size
-        Runtime.getRuntime().availableProcessors(), // Max pool size
-        5.toLong(), // Keep Alive Time
-        TimeUnit.SECONDS,
-        LinkedBlockingQueue<Runnable>()
-    )
-
-    val TAG: String = UploadManager::class.java.simpleName
-
-    private const val UPLOAD_NOTIFICATION_BASE_ID = 1234 // Something unique
-
-    private var notificationIncrementalId = 0
-    private val uploadTasksMap = ConcurrentHashMap<String, UploadTask>()
-
-    /**
-     * Stops the upload task with the given uploadId.
-     * @param uploadId The unique upload id
-     */
-    @Synchronized
-    @JvmStatic
-    fun stopUpload(uploadId: String) {
-      uploadTasksMap[uploadId]?.cancel()
-    }
-
-    /**
-     * Gets the list of the currently active upload tasks.
-     * @return list of uploadIDs or an empty list if no tasks are currently running
-     */
-    @JvmStatic
-    val taskList: List<String>
-      @Synchronized get() = if (uploadTasksMap.isEmpty()) {
-        emptyList()
-      } else {
-        uploadTasksMap.keys().toList()
-      }
-
-    /**
-     * Stop all the active uploads.
-     */
-    @Synchronized
-    @JvmStatic
-    fun stopAllUploads() {
-      val iterator = uploadTasksMap.keys.iterator()
-
-      while (iterator.hasNext()) {
-        uploadTasksMap[iterator.next()]?.cancel()
-      }
-    }
-
-    fun startUpload(context: Context, params: UploadTaskParameters, notificationConfig: UploadNotificationConfig) {
-      val taskCreationParameters = UploadTaskCreationParameters(params, notificationConfig)
-
-      if (uploadTasksMap.containsKey(taskCreationParameters.params.id)) {
-        UploadServiceLogger.error(TAG, taskCreationParameters.params.id) {
-          "Preventing upload! An upload with the same ID is already in progress. " +
-              "Every upload must have unique ID. Please check your code and fix it!"
-        }
-        return
-      }
-
-      val currentTask = context.getUploadTask(
-          creationParameters = taskCreationParameters,
-          notificationId = UPLOAD_NOTIFICATION_BASE_ID + notificationIncrementalId,
-      ) ?: return
-
-      uploadTasksMap[currentTask.params.id] = currentTask
-      threadPool.execute(currentTask)
-    }
-
-    /**
-     * Called by each task when it errors out.
-     * @param uploadId the uploadID of the task with error
-     */
-    @Synchronized
-    fun taskFailed(uploadId: String) {
-      uploadTasksMap.remove(uploadId)
-    }
-
-    /**
-     * Called by each task when it is completed (either successfully, with an error or due to
-     * user cancellation).
-     * @param uploadId the uploadID of the finished task
-     */
-    @Synchronized
-    fun taskCompleted(uploadId: String) {
-      uploadTasksMap.remove(uploadId)
-    }
-  }
-}

package/android/src/main/java/com/appfolio/work/UploadWorker.kt

@@ -1,20 +0,0 @@
-package com.appfolio.work
-
-import android.content.Context
-import androidx.work.Worker
-import androidx.work.WorkerParameters
-import com.appfolio.extensions.PARAM_KEY_NOTIF_CONFIG
-import com.appfolio.extensions.PARAM_KEY_TASK_PARAMS
-import com.appfolio.extensions.toUploadNotificationConfig
-import com.appfolio.extensions.toUploadTaskParameters
-
-class UploadWorker(val context: Context, params: WorkerParameters): Worker(context, params) {
-
-  override fun doWork(): Result {
-    val taskParamsStr = inputData.getString(PARAM_KEY_TASK_PARAMS) ?: return Result.failure()
-    val notifConfigStr = inputData.getString(PARAM_KEY_NOTIF_CONFIG) ?: return Result.failure()
-
-    UploadManager.startUpload(context, taskParamsStr.toUploadTaskParameters(), notifConfigStr.toUploadNotificationConfig())
-    return Result.success()
-  }
-}