diff --git a/tns-core-modules/declarations.android.d.ts b/tns-core-modules/declarations.android.d.ts index ea3432518..d17a07c74 100644 --- a/tns-core-modules/declarations.android.d.ts +++ b/tns-core-modules/declarations.android.d.ts @@ -49,45 +49,49 @@ declare module android { } } -declare module com { - export module tns { - export module Async { - export class CompleteCallback { - constructor(implementation: ICompleteCallback); - onComplete(result: Object, context: Object): void; - } - - export interface ICompleteCallback { - onComplete(result: Object, context: Object): void; - } - - export module Http { - export class KeyValuePair { - public key: string; - public value: string; - constructor(key: string, value: string); +declare module org { + export module nativescript { + export module widgets { + export module Async { + export class CompleteCallback { + constructor(implementation: ICompleteCallback); + onComplete(result: Object, context: Object): void; } - export class RequestOptions { - public url: string; - public method: string; - public headers: java.util.ArrayList; - public content: string; - public timeout: number; - public screenWidth: number; - public screenHeight: number; + export interface ICompleteCallback { + onComplete(result: Object, context: Object): void; } - export class RequestResult { - public raw: java.io.ByteArrayOutputStream; - public headers: java.util.ArrayList; - public statusCode: number; - public responseAsString: string; - public responseAsImage: android.graphics.Bitmap; - public error: java.lang.Exception; - } + export function DownloadImage(url: string, callback: CompleteCallback, context: any); - export function MakeRequest(options: RequestOptions, callback: CompleteCallback, context: any); + export module Http { + export class KeyValuePair { + public key: string; + public value: string; + constructor(key: string, value: string); + } + + export class RequestOptions { + public url: string; + public method: string; + public headers: java.util.ArrayList; + public content: string; + public timeout: number; + public screenWidth: number; + public screenHeight: number; + } + + export class RequestResult { + public raw: java.io.ByteArrayOutputStream; + public headers: java.util.ArrayList; + public statusCode: number; + public responseAsString: string; + public responseAsImage: android.graphics.Bitmap; + public error: java.lang.Exception; + } + + export function MakeRequest(options: RequestOptions, callback: CompleteCallback, context: any); + } } } } diff --git a/tns-core-modules/http/http-request.android.ts b/tns-core-modules/http/http-request.android.ts index bc3b9bd8e..66e74f289 100644 --- a/tns-core-modules/http/http-request.android.ts +++ b/tns-core-modules/http/http-request.android.ts @@ -34,13 +34,13 @@ function ensurePlatform() { } } -var completeCallback: com.tns.Async.CompleteCallback; +var completeCallback: org.nativescript.widgets.Async.CompleteCallback; function ensureCompleteCallback() { if (completeCallback) { return; } - completeCallback = new com.tns.Async.CompleteCallback({ + completeCallback = new org.nativescript.widgets.Async.CompleteCallback({ onComplete: function (result: any, context: any) { // as a context we will receive the id of the request onRequestComplete(context, result); @@ -48,7 +48,7 @@ function ensureCompleteCallback() { }); } -function onRequestComplete(requestId: number, result: com.tns.Async.Http.RequestResult) { +function onRequestComplete(requestId: number, result: org.nativescript.widgets.Async.Http.RequestResult) { var callbacks = pendingRequests[requestId]; delete pendingRequests[requestId]; @@ -63,7 +63,7 @@ function onRequestComplete(requestId: number, result: com.tns.Async.Http.Request var jHeaders = result.headers; var length = jHeaders.size(); var i; - var pair: com.tns.Async.Http.KeyValuePair; + var pair: org.nativescript.widgets.Async.Http.KeyValuePair; for (i = 0; i < length; i++) { pair = jHeaders.get(i); @@ -130,7 +130,7 @@ function buildJavaOptions(options: http.HttpRequestOptions) { throw new Error("Http request must provide a valid url."); } - var javaOptions = new com.tns.Async.Http.RequestOptions(); + var javaOptions = new org.nativescript.widgets.Async.Http.RequestOptions(); javaOptions.url = options.url; @@ -145,8 +145,8 @@ function buildJavaOptions(options: http.HttpRequestOptions) { } if (options.headers) { - var arrayList = new java.util.ArrayList(); - var pair = com.tns.Async.Http.KeyValuePair; + var arrayList = new java.util.ArrayList(); + var pair = org.nativescript.widgets.Async.Http.KeyValuePair; for (var key in options.headers) { arrayList.add(new pair(key, options.headers[key] + "")); @@ -186,7 +186,7 @@ export function request(options: http.HttpRequestOptions): Promisecom).tns.NativeScriptActivity.class); + // TODO: Implicitly, we will open the same activity type as the current one + var intent = new android.content.Intent(activity, activity.getClass()); intent.setAction(android.content.Intent.ACTION_DEFAULT); intent.putExtra(INTENT_EXTRA, frameId); diff --git a/tns-core-modules/ui/image-cache/image-cache.android.ts b/tns-core-modules/ui/image-cache/image-cache.android.ts index 5c1e06af8..5e46a2cfc 100644 --- a/tns-core-modules/ui/image-cache/image-cache.android.ts +++ b/tns-core-modules/ui/image-cache/image-cache.android.ts @@ -41,7 +41,7 @@ export class Cache extends common.Cache { this._cache = new LruBitmapCacheClass(cacheSize); var that = new WeakRef(this); - this._callback = new (com).tns.Async.CompleteCallback({ + this._callback = new org.nativescript.widgets.Async.CompleteCallback({ onComplete: function (result: any, context: any) { var instance = that.get(); if (instance) { @@ -52,7 +52,7 @@ export class Cache extends common.Cache { } public _downloadCore(request: common.DownloadRequest) { - (com).tns.Async.DownloadImage(request.url, this._callback, request.key); + org.nativescript.widgets.Async.DownloadImage(request.url, this._callback, request.key); } public get(key: string): any {