Merge pull request #72 from farfromrefug/master

update demo and fix packaging

Author: farfromrefug

demo/app/app.ts

@@ -1,3 +1,3 @@
-import * as application from 'tns-core-modules/application';
+import * as application from '@nativescript/core/application';
 
 application.run({moduleName: "main-page"});

demo/app/main-page.ts

@@ -1,8 +1,8 @@
 import * as Https from "nativescript-https";
-import * as Observable from "tns-core-modules/data/observable";
-import * as fs from "tns-core-modules/file-system";
-import * as dialogs from "tns-core-modules/ui/dialogs";
-import * as Page from "tns-core-modules/ui/page";
+import * as Observable from "@nativescript/core/data/observable";
+import * as fs from "@nativescript/core/file-system";
+import * as dialogs from "@nativescript/core/ui/dialogs";
+import * as Page from "@nativescript/core/ui/page";
 
 let page;
 let viewModel;

demo/package.json

@@ -12,7 +12,7 @@
     "nativescript-https": "file:../src",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "0.7.0",
-    "tns-core-modules": "~6.4.0"
+    "@nativescript/core": "~6.4.0"
   },
   "devDependencies": {
     "nativescript-css-loader": "~0.26.1",

src/https.ios.ts

@@ -392,6 +392,9 @@ function AFFailure(
     let parsedData = getData(data);
     const failingURL = error.userInfo.objectForKey("NSErrorFailingURLKey");
     if (useLegacy) {
+        if (!sendi.statusCode) {
+           return reject(error.localizedDescription);
+        }
         let failure: any = {
             description: error.description,
             reason: error.localizedDescription,
@@ -404,7 +407,6 @@ function AFFailure(
         }
         sendi.failure = failure;
         sendi.content = new HttpsResponse(data, url);
-
         resolve(sendi);
     } else {
         let content: any = {
@@ -529,7 +531,7 @@ export function createRequest(
         run(resolve, reject) {
             const success = function (task: NSURLSessionDataTask, data?: any) {
                 // TODO: refactor this code with failure one.
-                let content = useLegacy
+            let content = useLegacy
                     ? new HttpsResponse(data, opts.url)
                     : getData(data);
                 let getHeaders = () => ({});