fix(image): uncaught error in promise with image handling

NathanWalker · NathanWalker · commit f7ee2bdbde9b · 2018-11-12T19:39:04.000-08:00
diff --git a/tns-core-modules/http/http-request/http-request.ios.ts b/tns-core-modules/http/http-request/http-request.ios.ts
@@ -69,6 +69,11 @@ function ensureImageSource() {
 export function request(options: http.HttpRequestOptions): Promise<http.HttpResponse> {
     return new Promise<http.HttpResponse>((resolve, reject) => {
 
+        if (!options.url) {
+          reject('Request url was empty.');
+          return;
+        }
+
         try {
             var network = domainDebugger.getNetwork();
             var debugRequest = network && network.create();
diff --git a/tns-core-modules/http/http.ts b/tns-core-modules/http/http.ts
@@ -31,9 +31,18 @@ export function getJSON<T>(arg: any): Promise<T> {
 }
 
 export function getImage(arg: any): Promise<ImageSource> {
-    return httpRequest
-        .request(typeof arg === "string" ? { url: arg, method: "GET" } : arg)
-        .then(response => response.content.toImage());
+  return new Promise<any>((resolve, reject) => {
+    httpRequest.request(typeof arg === "string" ? { url: arg, method: "GET" } : arg)
+        .then(r => {
+          try {
+            resolve(r.content.toImage());
+          } catch (err) {
+            reject(err);
+          }
+        }, err => {
+          reject(err);
+        });
+  });
 }
 
 export function getFile(arg: any, destinationFilePath?: string): Promise<any> {
