feat: Upgrade android-upload-service to 4.3.0

BREAKING CHANGE: The android-upload-service has been upgraded to version 4.3.0. This solves some problems with the event listener 'completed' not being called (randomly). It also requires a minSdkVersion of 21. Written in Kotlin.

Closes #162 #181 #129

Co-authored-by: Alline Haiduski <[email protected]>

Author: allinelara

android/build.gradle

@@ -1,25 +1,37 @@
 buildscript {
+    ext {
+        kotlinVersion = '1.3.10'
+        buildToolsVersion = '29.0.0'
+        compileSdkVersion = 29
+        targetSdkVersion = 29
+        minSdkVersion = 18
+    }
+    ext.detoxKotlinVersion = ext.kotlinVersion
+
     repositories {
-        google()
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
-def DEFAULT_COMPILE_SDK_VERSION = 28
-def DEFAULT_BUILD_TOOLS_VERSION = "28.0.3"
-def DEFAULT_TARGET_SDK_VERSION = 28
+def DEFAULT_COMPILE_SDK_VERSION = 27
+def DEFAULT_BUILD_TOOLS_VERSION = "27.0.3"
+def DEFAULT_TARGET_SDK_VERSION = 27
 
 android {
     compileSdkVersion project.hasProperty('compileSdkVersion') ? project.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
     buildToolsVersion project.hasProperty('buildToolsVersion') ? project.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion 18
+        minSdkVersion 21
         targetSdkVersion project.hasProperty('targetSdkVersion') ? project.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
         versionCode 1
         versionName "1.0"
@@ -35,7 +47,18 @@ android {
 repositories {
     mavenCentral()
 }
+
+def _ext = ext
+
+def _kotlinVersion = _ext.has('detoxKotlinVersion') ? _ext.detoxKotlinVersion : '1.3.10'
+def _kotlinStdlib = _ext.has('detoxKotlinStdlib') ? _ext.detoxKotlinStdlib : 'kotlin-stdlib-jdk8'
+
 dependencies {
-    compile 'com.facebook.react:react-native:+'
-    compile 'net.gotev:uploadservice-okhttp:3.4.2'
+    implementation 'com.facebook.react:react-native:+'
+
+    implementation "org.jetbrains.kotlin:$_kotlinStdlib:$_kotlinVersion"
+
+    implementation 'net.gotev:uploadservice-okhttp:4.3.0'
+
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
 }

android/src/main/java/com/vydia/NotificationActions.java

@@ -0,0 +1,62 @@
+package com.vydia.RNUploader
+
+import android.content.Context
+import android.util.Log
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
+import net.gotev.uploadservice.data.UploadInfo
+import net.gotev.uploadservice.network.ServerResponse
+import net.gotev.uploadservice.observer.request.RequestObserverDelegate
+
+class GlobalRequestObserverDelegate(reactContext: ReactApplicationContext) : RequestObserverDelegate {
+  private val TAG = "UploadReceiver"
+
+  private var reactContext: ReactApplicationContext = reactContext
+
+  override fun onCompleted(context: Context, uploadInfo: UploadInfo) {
+  }
+
+  override fun onCompletedWhileNotObserving() {
+  }
+
+  override fun onError(context: Context, uploadInfo: UploadInfo, exception: Throwable) {
+
+    val params = Arguments.createMap()
+    params.putString("id", uploadInfo.uploadId)
+
+    // Make sure we do not try to call getMessage() on a null object
+    if (exception != null) {
+      params.putString("error", exception.message)
+    } else {
+      params.putString("error", "Unknown exception")
+    }
+
+    sendEvent("error", params, context)
+  }
+
+  override fun onProgress(context: Context, uploadInfo: UploadInfo) {
+    val params = Arguments.createMap()
+    params.putString("id", uploadInfo.uploadId)
+    params.putInt("progress", uploadInfo.progressPercent) //0-100
+
+    sendEvent("progress", params, context)
+  }
+
+  override fun onSuccess(context: Context, uploadInfo: UploadInfo, serverResponse: ServerResponse) {
+    val params = Arguments.createMap()
+    params.putString("id", uploadInfo.uploadId)
+    params.putInt("responseCode", serverResponse.code)
+    params.putString("responseBody", serverResponse.bodyString)
+    sendEvent("completed", params, context)
+  }
+
+  /**
+   * Sends an event to the JS module.
+   */
+  private fun sendEvent(eventName: String, params: WritableMap?, context: Context) {
+    reactContext?.getJSModule(RCTDeviceEventEmitter::class.java)?.emit("RNFileUploader-$eventName", params)
+            ?: Log.e(TAG, "sendEvent() failed due reactContext == null!")
+  }
+}

android/src/main/java/com/vydia/NotificationActionsReceiver.java

@@ -0,0 +1,24 @@
+package com.vydia.RNUploader
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+
+class NotificationActions {
+  var INTENT_ACTION = "com.vydia.RNUploader.notification.action"
+
+  val PARAM_ACTION = "action"
+  val PARAM_UPLOAD_ID = "uploadId"
+
+  val ACTION_CANCEL_UPLOAD = "cancelUpload"
+
+
+  fun getCancelUploadAction(context: Context?,
+                            requestCode: Int,
+                            uploadID: String?): PendingIntent? {
+    val intent = Intent(INTENT_ACTION)
+    intent.putExtra(PARAM_ACTION, ACTION_CANCEL_UPLOAD)
+    intent.putExtra(PARAM_UPLOAD_ID, uploadID)
+    return PendingIntent.getBroadcast(context, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+  }
+}

android/src/main/java/com/vydia/RNUploader/GlobalRequestObserverDelegate.kt

@@ -0,0 +1,44 @@
+package com.vydia.RNUploader
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
+import net.gotev.uploadservice.UploadService
+
+class NotificationActionsReceiver : BroadcastReceiver() {
+
+  private val TAG = "NotificationActReceiver"
+
+  private val reactContext: ReactApplicationContext? = null
+  override fun onReceive(context: Context?, intent: Intent?) {
+    if (intent == null || NotificationActions().INTENT_ACTION == intent.action) {
+      return
+    }
+
+    if (NotificationActions().ACTION_CANCEL_UPLOAD == intent.getStringExtra(NotificationActions().PARAM_ACTION)) {
+      onUserRequestedUploadCancellation(context!!, intent.getStringExtra(NotificationActions().PARAM_UPLOAD_ID))
+    }
+  }
+
+  private fun onUserRequestedUploadCancellation(context: Context, uploadId: String) {
+    Log.e("CANCEL_UPLOAD", "User requested cancellation of upload with ID: $uploadId")
+    UploadService.stopUpload(uploadId)
+    val params = Arguments.createMap()
+    params.putString("id", uploadId)
+    sendEvent("cancelled", params, context)
+  }
+
+  /**
+   * Sends an event to the JS module.
+   */
+  private fun sendEvent(eventName: String, params: WritableMap?, context: Context) {
+    reactContext?.getJSModule(RCTDeviceEventEmitter::class.java)?.emit("RNFileUploader-$eventName", params)
+            ?: Log.e(TAG, "sendEvent() failed due reactContext == null!")
+  }
+
+}