fix: fix rebase conflicts and issues

Author: Dimitar Tachev

.gitignore

@@ -25,6 +25,7 @@ demo/node_modules
 demo-angular/node_modules
 
 demo-angular/*.d.ts
+!demo-angular/references.d.ts
 demo-angular/platforms/
 demo-angular/hooks
 

.travis.yml

@@ -4,7 +4,7 @@ matrix:
       language: node_js
       os: linux
       node_js: "6"
-      script: cd src && npm run ci.tslint && cd ../demo && npm run ci.tslint
+      script: cd src && npm run ci.tslint && cd ../demo && npm run ci.tslint && cd ../demo-angular && npm run ci.tslint
     - stage: "WebPack, Build and Test"
       os: osx
       env:
@@ -13,22 +13,22 @@ matrix:
       language: node_js 
       node_js: "6"
       jdk: oraclejdk8
-      script: cd demo && npm run build.plugin && npm i && tns build ios --bundle --env.uglify
+      script: cd demo && npm run build.plugin && npm i && tns build ios --bundle --env.uglify && cd ../demo-angular && npm i && tns build ios --bundle --env.uglify
     - language: android
       os: linux
       env:
         - WebPack="Android"
       jdk: oraclejdk8
       before_install: nvm install 6.10.3
-      script: cd demo && npm run build.plugin && npm i && tns build android --bundle --env.uglify --env.snapshot
+      script: cd demo && npm run build.plugin && npm i && tns build android --bundle --env.uglify --env.snapshot && cd ../demo-angular && tns build android --bundle --env.uglify --env.snapshot
     - language: android
       env: 
         - BuildAndroid="26"
       os: linux
       jdk: oraclejdk8
       before_install: nvm install stable
       script:
-        - cd src && npm i && npm run tsc && cd ../demo && tns build android
+        - cd src && npm i && npm run tsc && cd ../demo && tns build android && cd ../demo-angular && tns build android
     - os: osx
       env: 
         - BuildiOS="11"
@@ -38,25 +38,7 @@ matrix:
       node_js: "6"
       jdk: oraclejdk8
       script: 
-        - cd src && npm i && npm run tsc && cd ../demo && tns build ios
-    - os: linux
-      language: android
-      dist: precise
-      sudo: required
-      jdk: oraclejdk8
-      before_script:
-        - echo no | android create avd --force -n test -t android-21 -b armeabi-v7a
-        - emulator -avd test -no-audio -no-window &
-        - android-wait-for-emulator
-      before_install:
-        - nvm install 6
-      script: cd src && npm run test.android
-    - os: osx
-      language: node_js
-      node_js: "6"
-      jdk: oraclejdk8
-      osx_image: xcode9.2
-      script: cd src && npm run test.ios
+        - cd src && npm i && npm run tsc && cd ../demo && tns build ios && cd ../demo-angular && tns build ios
 
 android:
   components:

demo-angular/app/home/home.component.ts

@@ -65,7 +65,7 @@ export class HomeComponent {
         let task: bgHttp.Task;
         let lastEvent = "";
         if (isMulti) {
-            var params = [
+            const params = [
                 { name: "test", value: "value" },
                 { name: "fileToUpload", filename: this.file, mimeType: 'image/jpeg' }
             ];

demo-angular/package.json

@@ -12,6 +12,10 @@
       "version": "4.0.1"
     }
   },
+  "scripts": {
+    "build.plugin": "cd ../src && npm run build",
+    "ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**'"
+  },
   "dependencies": {
     "@angular/animations": "~5.2.0",
     "@angular/common": "~5.2.0",
@@ -28,6 +32,7 @@
     "reflect-metadata": "~0.1.10",
     "rxjs": "~5.5.5",
     "tns-core-modules": "4.0.0",
+    "tns-platform-declarations": "^4.0.0",
     "zone.js": "~0.8.18"
   },
   "devDependencies": {
@@ -50,6 +55,7 @@
     "uglifyjs-webpack-plugin": "~1.1.6",
     "webpack": "~3.10.0",
     "webpack-bundle-analyzer": "^2.9.1",
+    "tslint": "^5.0.0",
     "webpack-sources": "~1.1.0"
   }
 }

demo-angular/references.d.ts

@@ -0,0 +1,3 @@
+/// <reference path="../src/node_modules/tns-platform-declarations/ios.d.ts" />
+/// <reference path="../src/node_modules/tns-platform-declarations/android.d.ts" />
+/// <reference path="../src/typings/java!uploadservice-3.4.2.ts" />

demo/app/home/home-view-model.ts

@@ -19,7 +19,7 @@ export class HomeViewModel extends Observable {
         this.tasks = new ObservableArray<bghttp.Task>();
         this.events = new ObservableArray();
         this.counter = 0;
-        this.file = fs.path.normalize(fs.knownFolders.currentApp().path + "/home/bigpic.jpg");;
+        this.file = fs.path.normalize(fs.knownFolders.currentApp().path + "/home/bigpic.jpg");
         if (isIOS) {
             // NOTE: This works for emulator. Real device will need other address.
             this.url = "http://localhost:8080";
@@ -65,7 +65,7 @@ export class HomeViewModel extends Observable {
         let task: bghttp.Task;
         let lastEvent = "";
         if (isMulti) {
-            var params = [
+            const params = [
                 { name: "test", value: "value" },
                 { name: "fileToUpload", filename: this.file, mimeType: 'image/jpeg' }
             ];

demo/package.json

@@ -12,10 +12,15 @@
       "version": "4.0.1"
     }
   },
+  "scripts": {
+    "build.plugin": "cd ../src && npm run build",
+    "ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**'"
+  },
   "dependencies": {
     "nativescript-background-http": "../src",
     "nativescript-theme-core": "~1.0.4",
-    "tns-core-modules": "4.0.0"
+    "tns-core-modules": "4.0.0",
+    "tns-platform-declarations": "^4.0.0"
   },
   "devDependencies": {
     "awesome-typescript-loader": "~3.1.3",
@@ -36,6 +41,7 @@
     "uglifyjs-webpack-plugin": "~1.1.6",
     "webpack": "~3.10.0",
     "webpack-bundle-analyzer": "^2.9.1",
+    "tslint": "^5.0.0",
     "webpack-sources": "~1.1.0"
   }
 }

demo/references.d.ts

@@ -0,0 +1,3 @@
+/// <reference path="./node_modules/tns-platform-declarations/ios.d.ts" />
+/// <reference path="./node_modules/tns-platform-declarations/android.d.ts" />
+/// <reference path="../src/typings/java!uploadservice-3.4.2.ts" />

src/background-http.ios.ts

@@ -11,7 +11,12 @@ function onProgress(nsSession, nsTask, sent, expectedTotal) {
     const task = Task.getTask(nsSession, nsTask);
     task.notifyPropertyChange("upload", task.upload);
     task.notifyPropertyChange("totalUpload", task.totalUpload);
-    task.notify({ eventName: "progress", object: task, currentBytes: sent, totalBytes: expectedTotal });
+    task.notify(<common.ProgressEventData>{
+        eventName: "progress",
+        object: task,
+        currentBytes: sent,
+        totalBytes: expectedTotal
+    });
 }
 
 function onError(session, nsTask, error) {
@@ -22,12 +27,27 @@ function onError(session, nsTask, error) {
     }
     if (error) {
         task.notifyPropertyChange("status", task.status);
-        task.notify({ eventName: "error", object: task, error: error });
+        task.notify(<common.ErrorEventData>{
+            eventName: "error",
+            object: task,
+            error,
+            responseCode: nsTask && nsTask.response ? (<NSHTTPURLResponse>nsTask.response).statusCode : -1
+        });
     } else {
         task.notifyPropertyChange("upload", task.upload);
         task.notifyPropertyChange("totalUpload", task.totalUpload);
-        task.notify({ eventName: "progress", object: task, currentBytes: nsTask.countOfBytesSent, totalBytes: nsTask.countOfBytesExpectedToSend });
-        task.notify({ eventName: "complete", object: task });
+        task.notify(<common.ProgressEventData>{
+            eventName: "progress",
+            object: task,
+            currentBytes: nsTask.countOfBytesSent,
+            totalBytes: nsTask.countOfBytesExpectedToSend
+        });
+        task.notify(<common.CompleteEventData>{
+            eventName: "complete",
+            object: task,
+            responseCode: nsTask && nsTask.response ? (<NSHTTPURLResponse>nsTask.response).statusCode : -1
+        });
+
         Task._tasks.delete(nsTask);
     }
 }
@@ -55,26 +75,9 @@ class BackgroundUploadDelegate extends NSObject implements NSURLSessionDelegate,
     }
 
     // NSURLSessionTaskDelegate
-    URLSessionTaskDidCompleteWithError(session, nsTask, error) {
+    URLSessionTaskDidCompleteWithError(session: NSURLSession, nsTask: NSURLSessionTask, error: NSError) {
         dispatch_async(main_queue, () => {
             zonedOnError(session, nsTask, error);
-                task.notify(<common.ErrorEventData>{
-                    eventName: "error",
-                    object: task,
-                    error,
-                    responseCode: nsTask && nsTask.response ? (<NSHTTPURLResponse>nsTask.response).statusCode : -1
-                });
-                task.notify(<common.ProgressEventData>{
-                  eventName: "progress",
-                  object: task,
-                  currentBytes: nsTask.countOfBytesSent,
-                  totalBytes: nsTask.countOfBytesExpectedToSend
-                });
-                task.notify(<common.CompleteEventData>{
-                  eventName: "complete",
-                  object: task,
-                  responseCode: nsTask && nsTask.response ? (<NSHTTPURLResponse>nsTask.response).statusCode : -1
-                });
         });
     }
 
@@ -88,12 +91,6 @@ class BackgroundUploadDelegate extends NSObject implements NSURLSessionDelegate,
     URLSessionTaskDidSendBodyDataTotalBytesSentTotalBytesExpectedToSend(nsSession: NSURLSession, nsTask: NSURLSessionTask, data, sent: number, expectedTotal: number) {
         dispatch_async(main_queue, () => {
             zonedOnProgress(nsSession, nsTask, sent, expectedTotal);
-            task.notify(<common.ProgressEventData>{
-              eventName: "progress",
-              object: task,
-              currentBytes: sent,
-              totalBytes: expectedTotal
-            });
         });
     }
 
@@ -125,10 +122,10 @@ class BackgroundUploadDelegate extends NSObject implements NSURLSessionDelegate,
             const jsonString = NSString.alloc().initWithDataEncoding(data, NSUTF8StringEncoding);
 
             jsTask.notify(<common.ResultEventData>{
-              eventName: "responded",
-              object: jsTask,
-              data: jsonString.toString(),
-              responseCode: dataTask && dataTask.response ? (<NSHTTPURLResponse>dataTask.response).statusCode : -1
+                eventName: "responded",
+                object: jsTask,
+                data: jsonString.toString(),
+                responseCode: dataTask && dataTask.response ? (<NSHTTPURLResponse>dataTask.response).statusCode : -1
             });
         });
     }
@@ -253,7 +250,7 @@ class Task extends Observable {
     public _fileToCleanup: string;
     private _task: NSURLSessionTask;
     private _session: NSURLSession;
-    public testProp = 0;
+
     constructor(nsSession: NSURLSession, nsTask: NSURLSessionTask) {
         super();
         this._task = nsTask;

src/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nativescript-background-http",
-  "version": "3.2.5",
+    "version": "3.2.5",
     "main": "background-http",
     "typings": "index.d.ts",
     "nativescript": {