@ammarahmed/react-native-upload 6.28.0 → 6.30.0

package/android/build.gradle

@@ -36,7 +36,7 @@ android {
     buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion safeExtGet('minSdkVersion', 21)
         targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
         versionCode 1
         versionName "1.0"

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

@@ -7,6 +7,8 @@ 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.exceptions.UploadError
+import net.gotev.uploadservice.exceptions.UserCancelledUploadException
 import net.gotev.uploadservice.network.ServerResponse
 import net.gotev.uploadservice.observer.request.RequestObserverDelegate
 
@@ -22,20 +24,29 @@ class GlobalRequestObserverDelegate(reactContext: ReactApplicationContext) : Req
   }
 
   override fun onError(context: Context, uploadInfo: UploadInfo, exception: Throwable) {
-
     val params = Arguments.createMap()
     params.putString("id", uploadInfo.uploadId)
+    when (exception) {
+      is UserCancelledUploadException -> {
+        params.putString("error", "User cancelled upload")
+      }
+
+      is UploadError -> {
+        Log.e("RECEIVER", "Error, upload error: ${exception.serverResponse}")
+        params.putString("error", exception.message)
+        params.putInt("responseCode", exception.serverResponse.code)
+        params.putString("responseBody", exception.serverResponse.bodyString)
+      }
 
-    // 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")
+      else -> {
+        params.putString("error", exception.message)
+      }
     }
 
     sendEvent("error", params, context)
   }
 
+
   override fun onProgress(context: Context, uploadInfo: UploadInfo) {
     val params = Arguments.createMap()
     params.putString("id", uploadInfo.uploadId)

package/package.json

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