chore: cleanup

Author: NathanWalker

demo-angular/package.json

@@ -22,7 +22,7 @@
     "@angular/platform-browser-dynamic": "~8.0.0",
     "@angular/router": "~8.0.0",
     "nativescript-angular": "~8.0.0",
-    "nativescript-async": "file:../src",
+    "nativescript-http-async": "file:../src",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.12",
     "rxjs": "~6.5.0",

demo-angular/src/app/app.module.ts

@@ -1,6 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
 import { NativeScriptModule } from 'nativescript-angular/nativescript.module';
-import { NativeScriptAsyncModule } from 'nativescript-async/angular';
+import { NativeScriptHttpAsyncModule } from 'nativescript-http-async/angular';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { NativeScriptHttpClientModule } from 'nativescript-angular/http-client';
@@ -12,7 +12,7 @@ import { NativeScriptHttpClientModule } from 'nativescript-angular/http-client';
     imports: [
         NativeScriptModule,
         NativeScriptHttpClientModule,
-        NativeScriptAsyncModule,
+        NativeScriptHttpAsyncModule,
         AppRoutingModule
     ],
     declarations: [

demo-angular/src/app/services/data.service.ts

@@ -5,7 +5,7 @@ import { ObservableArray } from 'tns-core-modules/data/observable-array';
 import { from } from 'rxjs';
 import { map, mergeMap , concatMap,switchMap} from 'rxjs/internal/operators';
 import * as imageSrc from 'tns-core-modules/image-source';
-import { TNSXMLHttpRequest, FileManager } from 'nativescript-async';
+import { TNSXMLHttpRequest, FileManager } from 'nativescript-http-async';
 import * as fs from 'tns-core-modules/file-system';
 import { releaseNativeObject } from 'tns-core-modules/utils/utils';
 declare var UIImageJPEGRepresentation, NSDataBase64EncodingOptions, android, java;

demo/app/home/home-page.ts

@@ -1,4 +1,4 @@
-import { Async } from 'nativescript-async';
+import { Async } from 'nativescript-http-async';
 console.log(new Async().message);
 /*
 In NativeScript, a file with the same name as an XML file is known as

demo/package.json

@@ -12,7 +12,7 @@
   "license": "SEE LICENSE IN <your-license-filename>",
   "repository": "<fill-your-repository-here>",
   "dependencies": {
-    "nativescript-async": "file:../src",
+    "nativescript-http-async": "file:../src",
     "nativescript-theme-core": "~1.0.4",
     "tns-core-modules": "~5.4.0"
   },

src/angular/index.ts

@@ -11,13 +11,13 @@ const BASE_PROVIDERS = [
 @NgModule({
     providers: BASE_PROVIDERS
 })
-export class NativeScriptAsyncModule {
+export class NativeScriptHttpAsyncModule {
   static forRoot(options: { configuredProviders?: Array<any>; debug?: boolean; }): ModuleWithProviders {
     if (options.debug) {
       TNSHttpDebugging.enabled = true;
     }
     return {
-      ngModule: NativeScriptAsyncModule,
+      ngModule: NativeScriptHttpAsyncModule,
       // Allow others to override if they need more control
       providers: [...BASE_PROVIDERS, ...(options.configuredProviders || [])]
     };
@@ -26,10 +26,10 @@ export class NativeScriptAsyncModule {
   constructor(
     @Optional()
     @SkipSelf()
-    parentModule: NativeScriptAsyncModule
+    parentModule: NativeScriptHttpAsyncModule
   ) {
     if (parentModule) {
-      throw new Error(`NativeScriptAsyncModule has already been loaded. Import NativeScriptAsyncModule in the AppModule only.`);
+      throw new Error(`NativeScriptHttpAsyncModule has already been loaded. Import NativeScriptHttpAsyncModule in the AppModule only.`);
     }
   }
 }

src/http/http.ios.ts

@@ -98,25 +98,21 @@ class NSURLSessionTaskDelegateImpl extends NSObject
         data: NSData
     ) {
         // const method = this._request.HTTPMethod.toLowerCase();
-        if (this._onLoading && !this._loadingSent) {
-            const lengthComputable = this._lastProgress.lengthComputable;
-            this._onLoading({
-                lengthComputable,
-                loaded: this._data.length,
-                total: this._lastProgress.total
-            });
-            this._loadingSent = true;
-        }
-        if (this._onProgress) {
-            const lengthComputable = this._lastProgress.lengthComputable;
-            this._onProgress({
-                lengthComputable,
-                loaded: this._data.length,
-                total: this._lastProgress.total
-            });
-        }
-        if (this._data) {
-            this._data.appendData(data);
+        if (data) {
+          this._data.appendData(data);
+
+          const lastProgress: any = this._lastProgress || {
+            lengthComputable: false,
+            total: 0
+          };
+          lastProgress.loaded = this._data.length;
+          if (this._onLoading && !this._loadingSent) {
+              this._onLoading(lastProgress);
+              this._loadingSent = true;
+          }
+          if (this._onProgress) {
+              this._onProgress(lastProgress);
+          }
         }
     }
 
@@ -128,11 +124,10 @@ class NSURLSessionTaskDelegateImpl extends NSObject
         totalBytesExpectedToSend
     ) {
       if (this._onLoading || this._onProgress) {
-        const lengthComputable = totalBytesExpectedToSend > -1;
         this._lastProgress = {
-          lengthComputable,
+          lengthComputable: totalBytesExpectedToSend > -1,
           loaded: totalBytesSent,
-          total: lengthComputable ? totalBytesExpectedToSend : 0
+          total: totalBytesExpectedToSend > -1 ? totalBytesExpectedToSend : 0
         };
         if (this._onLoading && !this._loadingSent) {
           this._onLoading(this._lastProgress);