Merge branch 'master' into android-utf8

Author: radeva

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "github.io"]
-	path = github.io
-	url = [email protected]:NativeScript/nativescript-background-http.git
 [submodule "deps/android-upload-service"]
 	path = deps/android-upload-service
 	url = [email protected]:NativeScript/android-upload-service.git

examples/SimpleBackgroundHttp/app/main-page.ts

@@ -58,7 +58,8 @@ function start_upload(should_fail, isMulti) {
 			"Content-Type": "application/octet-stream",
 			"File-Name": name
 		},
-		description: description
+		description: description,
+		androidDisplayNotificationProgress: false
 	};
 
 	if (should_fail) {

examples/SimpleBackgroundHttp/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "org.nativescript.SimpleBackgroundHttp",
+  "name": "org.nativescript.simplebackgroundhttp",
   "nativescript": {
     "id": "org.nativescript.SimpleBackgroundHttp",
     "tns-android": {
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "nativescript-background-http": "file:../../nativescript-background-http/",
-    "tns-core-modules": "^3.0.0 || ^3.0.0-rc.1"
+    "tns-core-modules": "^3.2.0"
   },
   "devDependencies": {
     "babel-traverse": "6.24.1",

github.io

@@ -90,8 +90,8 @@ class Session {
         this._id = id;
     }
 
-    public uploadFile(file: string, options: common.Request): Task {
-        return Task.create(this, file, options);
+    public uploadFile(fileUri: string, options: common.Request): Task {
+        return Task.create(this, fileUri, options);
     }
 
     public multipartUpload(params: Array<any>, options: common.Request): Task {
@@ -127,7 +127,10 @@ class Task extends ObservableBase {
 
         request.setFileToUpload(file);
 
-        request.setNotificationConfig(new (<any>net).gotev.uploadservice.UploadNotificationConfig());
+        var displayNotificationProgress = typeof options.androidDisplayNotificationProgress === "boolean" ? options.androidDisplayNotificationProgress : true;
+        if (displayNotificationProgress) {
+            request.setNotificationConfig(new (<any>net).gotev.uploadservice.UploadNotificationConfig());
+        }
 
         var headers = options.headers;
         if (headers) {
@@ -189,7 +192,10 @@ class Task extends ObservableBase {
             request.setUtf8Charset();
         }
 
-        request.setNotificationConfig(new (<any>net).gotev.uploadservice.UploadNotificationConfig());
+        var displayNotificationProgress = typeof options.androidDisplayNotificationProgress === "boolean" ? options.androidDisplayNotificationProgress : true;
+        if (displayNotificationProgress) {
+          request.setNotificationConfig(new (<any>net).gotev.uploadservice.UploadNotificationConfig());
+        }
 
         var headers = options.headers;
         if (headers) {

nativescript-background-http/background-http.android.ts

@@ -317,7 +317,7 @@ class MultiMultiPartForm {
 			if (!this.fields[i].filename) {
 				results += CRLF + CRLF + this.fields[i].value + CRLF;
 			} else {
-				results += '; filename="' + this.fields[i].filename + '"';
+				results += '; filename="' + this.fields[i].destFilename + '"';
 				if (this.fields[i].mimeType) {
 					results += CRLF + "Content-Type: " + this.fields[i].mimeType;
 				}
@@ -338,7 +338,7 @@ class MultiMultiPartForm {
 
 		}
 		// Add final part of it...
-		results += CRLF + "--" + this.boundary + "--" + CRLF;
+		results += "--" + this.boundary + "--" + CRLF;
 		tempString = NSString.stringWithString(results);
 		newData = tempString.dataUsingEncoding(NSUTF8StringEncoding);
 		combinedData.appendData(newData);

nativescript-background-http/background-http.ios.ts

@@ -115,9 +115,9 @@ export interface Session {
     /**
      * Initiate a new background file upload task.
      * @param fileUri A file path to upload.
-     * @param request Options for the upload, sets uri, headers, task description etc.
+     * @param options Options for the upload, sets uri, headers, task description etc.
      */
-    uploadFile(fileUri: string, request: Request): Task;
+    uploadFile(fileUri: string, options: Request): Task;
     multipartUpload(params: Array<any>, options: any): Task;
 
 }
@@ -153,4 +153,9 @@ export interface Request {
      * Use utf8 encode in requests
      */
     utf8?: boolean;
+
+    /*
+     * Use this to set if progress notification should be displayed or not
+     */
+    androidDisplayNotificationProgress?: boolean;
 }

nativescript-background-http/index.d.ts

@@ -4,7 +4,7 @@
     "url": "https://github.com/NativeScript/nativescript-background-http"
   },
   "name": "nativescript-background-http",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "nativescript": {
     "platforms": {
       "android": "3.0.0",
@@ -26,12 +26,12 @@
     "NativeScript"
   ],
   "peerDependencies": {
-    "tns-core-modules": "^3.0.0 || ^3.0.0-rc.1"
+    "tns-core-modules": "^3.2.0"
   },
   "devDependencies": {
-    "tns-core-modules": "^3.0.0 || ^3.0.0-rc.1",
-    "tns-platform-declarations": "^3.0.0 || ^3.0.0-rc.1",
-    "typescript": "^2.2.2"
+    "tns-core-modules": "^3.2.0",
+    "tns-platform-declarations": "^3.2.0",
+    "typescript": "~2.3.0"
   },
   "scripts": {
     "tsc": "tsc",