Merge pull request #95 from Grait-Interaction/android-notification-features

Android notification features and Crash fixes

Author: StevePotter

README.md

@@ -153,7 +153,23 @@ Returns a promise with the string ID of the upload.  Will reject if there is a c
 |`headers`|object|Optional||HTTP headers|`{ 'Accept': 'application/json' }`|
 |`field`|string|Required if `type: 'multipart'`||The form field name for the file.  Only used when `type: 'multipart`|`uploaded-file`|
 |`parameters`|object|Optional||Additional form fields to include in the HTTP request. Only used when `type: 'multipart`||
-|`notification`|object with single `enabled` field|Optional||Android only.  |`{ enabled: false }`|
+|`notification`|Notification object (see below)|Optional||Android only.  |`{ enabled: true, onProgressTitle: "Uploading...", autoClear: true }`|
+
+### Notification Object
+|Name|Type|Required|Description|Example|
+|---|---|---|---|---|
+|`enabled`|boolean|Optional|Enable or diasable notifications|`{ enabled: true }`|
+|`autoClear`|boolean|Optional|Autoclear notification on complete|`{ autoclear: true }`|
+|`notificationChannel`|string|Optional|Sets android notificaion channel|`{ notificationChannel: "My-Upload-Service" }`|
+|`onProgressTitle`|string|Optional|Sets notification progress title|`{ onProgressTitle: "Uploading" }`|
+|`onProgressMessage`|string|Optional|Sets notification progress message|`{ onProgressMessage: "Uploading new video" }`|
+|`onCompleteTitle`|string|Optional|Sets notification complete title|`{ onCompleteTitle: "Upload finished" }`|
+|`onCompleteMessage`|string|Optional|Sets notification complete message|`{ onCompleteMessage: "Your video has been uploaded" }`|
+|`onErrorTitle`|string|Optional|Sets notification error title|`{ onErrorTitle: "Upload error" }`|
+|`onErrorMessage`|string|Optional|Sets notification error message|`{ onErrorMessage: "An error occured while uploading a video" }`|
+|`onCancelledTitle`|string|Optional|Sets notification cancelled title|`{ onCancelledTitle: "Upload cancelled" }`|
+|`onCancelledMessage`|string|Optional|Sets notification cancelled message|`{ onCancelledMessage: "Video upload was cancelled" }`|
+
 
 ### getFileInfo(path)
 
@@ -289,19 +305,6 @@ Ensure `compileSdkVersion` and `targetSdkVersion` are 25.
 
 Done!
 
-## Known issues
-
-Android APK 27 and above require notifications to provide their own `NotificationChannel`. `react-native-background-upload` does not yet meet this requirement and thus [will cause crashes in Android 8.1 and above](https://github.com/Vydia/react-native-background-upload/issues/59#issuecomment-362476703). This issue can be avoided by electing not to use native notifications.
-
-```js
-const options = {
-  // ...
-  notification: {
-    enabled: false,
-  },
-};
-```
-
 
 ## Gratitude
 

android/build.gradle

@@ -3,15 +3,15 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
 apply plugin: 'com.android.library'
 
-def DEFAULT_COMPILE_SDK_VERSION = 25
-def DEFAULT_BUILD_TOOLS_VERSION = "25.0.2"
-def DEFAULT_TARGET_SDK_VERSION = 25
+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
@@ -25,7 +25,7 @@ android {
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
-    }    
+    }
     lintOptions {
         abortOnError false
     }
@@ -35,14 +35,6 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    /**
-     * Using okhttp is better because it fixes a possible outofmemory exception.
-     * However the okhttp library can have a funky version resolution and cause compilation errors with RN
-     * There is a PR to fix that
-     * https://github.com/facebook/react-native/pull/11835
-     * Until that is merged and RN is upgraded, you need to add this line to your android/app/build.gradle, inside 'android' block:
-     * configurations.all { resolutionStrategy.force 'com.squareup.okhttp3:okhttp:3.4.1' }
-    */
     compile 'com.facebook.react:react-native:+'
-    compile 'net.gotev:uploadservice-okhttp:3.2.3'
+    compile 'net.gotev:uploadservice-okhttp:3.4.2'
 }

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

@@ -150,10 +150,21 @@ public void onProgress(Context context, UploadInfo uploadInfo) {
         }
 
         @Override
-        public void onError(Context context, UploadInfo uploadInfo, Exception exception) {
+        public void onError(Context context, UploadInfo uploadInfo, ServerResponse serverResponse, Exception exception) {
           WritableMap params = Arguments.createMap();
           params.putString("id", customUploadId != null ? customUploadId : uploadInfo.getUploadId());
-          params.putString("error", exception.getMessage());
+          if (serverResponse != null) {
+            params.putInt("responseCode", serverResponse.getHttpCode());
+            params.putString("responseBody", serverResponse.getBodyAsString());
+          }
+
+          // Make sure we do not try to call getMessage() on a null object
+          if (exception != null){
+            params.putString("error", exception.getMessage());
+          } else {
+            params.putString("error", "Unknown exception");
+          }
+
           sendEvent("error", params);
         }
 
@@ -200,7 +211,51 @@ public void onCancelled(Context context, UploadInfo uploadInfo) {
         .setDelegate(statusDelegate);
 
       if (notification.getBoolean("enabled")) {
-        request.setNotificationConfig(new UploadNotificationConfig());
+
+        UploadNotificationConfig notificationConfig = new UploadNotificationConfig();
+
+        if (notification.hasKey("notificationChannel")){
+          notificationConfig.setNotificationChannelId(notification.getString("notificationChannel"));
+        }
+
+        if (notification.hasKey("autoClear") && notification.getBoolean("autoClear")){
+          notificationConfig.getCompleted().autoClear = true;
+        }
+
+        if (notification.hasKey("onCompleteTitle")) {
+          notificationConfig.getCompleted().title = notification.getString("onCompleteTitle");
+        }
+
+        if (notification.hasKey("onCompleteMessage")) {
+          notificationConfig.getCompleted().message = notification.getString("onCompleteMessage");
+        }
+
+        if (notification.hasKey("onErrorTitle")) {
+          notificationConfig.getError().title = notification.getString("onErrorTitle");
+        }
+
+        if (notification.hasKey("onErrorMessage")) {
+          notificationConfig.getError().message = notification.getString("onErrorMessage");
+        }
+
+        if (notification.hasKey("onProgressTitle")) {
+          notificationConfig.getProgress().title = notification.getString("onProgressTitle");
+        }
+
+        if (notification.hasKey("onProgressMessage")) {
+          notificationConfig.getProgress().message = notification.getString("onProgressMessage");
+        }
+
+        if (notification.hasKey("onCancelledTitle")) {
+          notificationConfig.getCancelled().title = notification.getString("onCancelledTitle");
+        }
+
+        if (notification.hasKey("onCancelledMessage")) {
+          notificationConfig.getCancelled().message = notification.getString("onCancelledMessage");
+        }
+
+        request.setNotificationConfig(notificationConfig);
+
       }
 
       if (options.hasKey("parameters")) {