Code review

Author: jdnichollsc

src/ChromeTabsManagerActivity.ts

@@ -3,7 +3,8 @@ import Intent = android.content.Intent;
 import Bundle = android.os.Bundle;
 
 import { Observable } from '@nativescript/core';
-import { BROWSER_TYPES } from './InAppBrowser.common'; 
+import { BROWSER_TYPES } from './InAppBrowser.common';
+import { DISMISSED_EVENT } from './utils.android';
 
 
 export class ChromeTabsEvent extends Observable {
@@ -15,7 +16,7 @@ export const BROWSER_ACTIVITY_EVENTS = new ChromeTabsEvent();
 
 const KEY_BROWSER_INTENT = 'browserIntent';
 const BROWSER_RESULT_TYPE = 'browserResultType';
-const DEFAULT_RESULT_TYPE = 'dismiss';
+const DEFAULT_RESULT_TYPE = BROWSER_TYPES.DISMISS;
 
 /**
  * Manages the custom chrome tabs intent by detecting when it is dismissed by the user and allowing
@@ -78,7 +79,7 @@ export class ChromeTabsManagerActivity extends android.app.Activity {
           break;
       }
       BROWSER_ACTIVITY_EVENTS.notify({
-        eventName: 'DismissedEvent',
+        eventName: DISMISSED_EVENT,
         object: BROWSER_ACTIVITY_EVENTS
       });
       this.resultType = null;

src/InAppBrowser.android.ts

@@ -21,13 +21,17 @@ import {
   BrowserResult,
   getDefaultOptions,
   InAppBrowserOptions,
-  InAppBrowserClassMethods
+  InAppBrowserClassMethods,
+  RedirectResolve,
+  RedirectReject,
+  BROWSER_TYPES,
 } from './InAppBrowser.common';
 import {
   Builder,
   getDrawableId,
   toolbarIsLight,
   CustomTabsIntent,
+  DISMISSED_EVENT,
   ARROW_BACK_WHITE,
   ARROW_BACK_BLACK,
   getPreferredPackages,
@@ -59,9 +63,9 @@ function setup() {
     private static KEY_BROWSER_PACKAGE = "browserPackage";
     private static KEY_SHOW_IN_RECENTS = "showInRecents";
 
-    private static redirectResolve: any;
-    private static redirectReject: any;
-    private isLightTheme: Boolean;
+    private static redirectResolve: RedirectResolve;
+    private static redirectReject: RedirectReject;
+    private isLightTheme: boolean;
     private currentActivity: any;
     private animationIdentifierPattern = Pattern.compile("^.+:.+/");
 
@@ -84,7 +88,7 @@ function setup() {
       if (mOpenBrowserPromise) {
         this.flowDidFinish();
         const result: BrowserResult = {
-          type: 'cancel'
+          type: BROWSER_TYPES.CANCEL
         };
         return Promise.resolve(result);
       }
@@ -207,7 +211,7 @@ function setup() {
         return;
       }
 
-      BROWSER_ACTIVITY_EVENTS.off('DismissedEvent');
+      BROWSER_ACTIVITY_EVENTS.off(DISMISSED_EVENT);
 
       const result: BrowserResult = {
         type: 'dismiss'
@@ -243,7 +247,7 @@ function setup() {
     }
 
     public onEvent(event: EventData): void {
-      BROWSER_ACTIVITY_EVENTS.off('DismissedEvent');
+      BROWSER_ACTIVITY_EVENTS.off(DISMISSED_EVENT);
 
       if (!InAppBrowserModule.redirectResolve) {
         throw new AssertionError();
@@ -252,12 +256,12 @@ function setup() {
       InAppBrowserModule.redirectResolve({
         type: browserEvent.resultType,
         message: browserEvent.message
-      });
+      } as BrowserResult);
       this.flowDidFinish();
     }
 
     private registerEvent(): void {
-      BROWSER_ACTIVITY_EVENTS.once('DismissedEvent', (e) => this.onEvent(e));
+      BROWSER_ACTIVITY_EVENTS.once(DISMISSED_EVENT, (e) => this.onEvent(e));
     }
 
     private resolveAnimationIdentifierIfNeeded(context: Context, identifier: string): number {

src/utils.android.ts

@@ -37,6 +37,7 @@ export const LOCAL_PACKAGE = "com.google.android.apps.chrome";
 export const ACTION_CUSTOM_TABS_CONNECTION = "android.support.customtabs.action.CustomTabsService";
 export const ARROW_BACK_BLACK = 'ic_arrow_back_black';
 export const ARROW_BACK_WHITE = 'ic_arrow_back_white';
+export const DISMISSED_EVENT = 'DismissedEvent';
 
 /**
  * Save the handler of the redirection event in order to removes listener later.