diff --git a/android/build.gradle b/android/build.gradle index 027e351f..916cd9ab 100755 --- a/android/build.gradle +++ b/android/build.gradle @@ -3,19 +3,19 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.3' + classpath 'com.android.tools.build:gradle:2.3.0' } } apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 25 + buildToolsVersion "25.0.2" defaultConfig { minSdkVersion 16 - targetSdkVersion 22 + targetSdkVersion 25 versionCode 1 versionName "1.0" ndk { @@ -31,6 +31,6 @@ repositories { mavenCentral() } dependencies { - compile 'net.gotev:uploadservice:3.0.3' + compile 'net.gotev:uploadservice:3.2.3' compile 'com.facebook.react:react-native:+' -} \ No newline at end of file +} diff --git a/android/src/main/java/com/vydia/UploaderModule.java b/android/src/main/java/com/vydia/UploaderModule.java index 2f9ba70e..07becce8 100644 --- a/android/src/main/java/com/vydia/UploaderModule.java +++ b/android/src/main/java/com/vydia/UploaderModule.java @@ -1,5 +1,6 @@ package com.vydia.RNUploader; +import android.content.Context; import android.support.annotation.Nullable; import android.util.Log; import android.webkit.MimeTypeMap; @@ -131,7 +132,7 @@ public void startUpload(ReadableMap options, final Promise promise) { .setMaxRetries(2) .setDelegate(new UploadStatusDelegate() { @Override - public void onProgress(UploadInfo uploadInfo) { + public void onProgress(Context context, UploadInfo uploadInfo) { WritableMap params = Arguments.createMap(); params.putString("id", customUploadId != null ? customUploadId : uploadInfo.getUploadId()); params.putInt("progress", uploadInfo.getProgressPercent()); //0-100 @@ -139,7 +140,7 @@ public void onProgress(UploadInfo uploadInfo) { } @Override - public void onError(UploadInfo uploadInfo, Exception exception) { + public void onError(Context context, UploadInfo uploadInfo, Exception exception) { WritableMap params = Arguments.createMap(); params.putString("id", customUploadId != null ? customUploadId : uploadInfo.getUploadId()); params.putString("error", exception.getMessage()); @@ -147,7 +148,7 @@ public void onError(UploadInfo uploadInfo, Exception exception) { } @Override - public void onCompleted(UploadInfo uploadInfo, ServerResponse serverResponse) { + public void onCompleted(Context context, UploadInfo uploadInfo, ServerResponse serverResponse) { WritableMap params = Arguments.createMap(); params.putString("id", customUploadId != null ? customUploadId : uploadInfo.getUploadId()); params.putInt("responseCode", serverResponse.getHttpCode()); @@ -156,7 +157,7 @@ public void onCompleted(UploadInfo uploadInfo, ServerResponse serverResponse) { } @Override - public void onCancelled(UploadInfo uploadInfo) { + public void onCancelled(Context context, UploadInfo uploadInfo) { WritableMap params = Arguments.createMap(); params.putString("id", customUploadId != null ? customUploadId : uploadInfo.getUploadId()); sendEvent("cancelled", params);