Code review

Author: jdnichollsc

src/ChromeTabsManagerActivity.ts

@@ -23,10 +23,10 @@ const DEFAULT_RESULT_TYPE = BROWSER_TYPES.DISMISS;
 const notifyMessage = (message: string, resultType: BROWSER_TYPES, isError = false) => {
   BROWSER_ACTIVITY_EVENTS.set('message', message);
   BROWSER_ACTIVITY_EVENTS.set('resultType', resultType);
+  BROWSER_ACTIVITY_EVENTS.set('isError', isError);
   BROWSER_ACTIVITY_EVENTS.notify({
     eventName: DISMISSED_EVENT,
-    object: BROWSER_ACTIVITY_EVENTS,
-    isError
+    object: BROWSER_ACTIVITY_EVENTS
   });
 };
 
@@ -39,6 +39,7 @@ const notifyMessage = (message: string, resultType: BROWSER_TYPES, isError = fal
 export class ChromeTabsManagerActivity extends android.app.Activity {
   private mOpened = false;
   private resultType = null;
+  private isError = false;
 
   constructor() {
     super();
@@ -64,7 +65,8 @@ export class ChromeTabsManagerActivity extends android.app.Activity {
         this.finish();
       }
     } catch (error) {
-      notifyMessage('Unable to open url.', BROWSER_TYPES.CANCEL, true);
+      this.isError = true;
+      notifyMessage('Unable to open url.', this.resultType, this.isError);
       this.finish();
       log(`InAppBrowser: ${error}`);
     }
@@ -88,10 +90,10 @@ export class ChromeTabsManagerActivity extends android.app.Activity {
     if (this.resultType) {
       switch (this.resultType) {
         case BROWSER_TYPES.CANCEL:
-          notifyMessage('chrome tabs activity closed', this.resultType);
+          notifyMessage('chrome tabs activity closed', this.resultType, this.isError);
           break;
         default:
-          notifyMessage('chrome tabs activity destroyed', DEFAULT_RESULT_TYPE);
+          notifyMessage('chrome tabs activity destroyed', DEFAULT_RESULT_TYPE, this.isError);
           break;
       }
       this.resultType = null;

src/InAppBrowser.android.ts

@@ -46,30 +46,30 @@ let InAppBrowserModuleInstance: InAppBrowserClassMethods;
 function setup() {
   @NativeClass()
   class InAppBrowserModule extends java.lang.Object implements InAppBrowserClassMethods {
-    private static ERROR_CODE = "InAppBrowser";
-    private static KEY_TOOLBAR_COLOR = "toolbarColor";
-    private static KEY_SECONDARY_TOOLBAR_COLOR = "secondaryToolbarColor";
-    private static KEY_NAVIGATION_BAR_COLOR = "navigationBarColor";
-    private static KEY_NAVIGATION_BAR_DIVIDER_COLOR = "navigationBarDividerColor";
-    private static KEY_ENABLE_URL_BAR_HIDING = "enableUrlBarHiding";
-    private static KEY_SHOW_PAGE_TITLE = "showTitle";
-    private static KEY_DEFAULT_SHARE_MENU_ITEM = "enableDefaultShare";
-    private static KEY_FORCE_CLOSE_ON_REDIRECTION = "forceCloseOnRedirection";
-    private static KEY_ANIMATIONS = "animations";
-    private static KEY_HEADERS = "headers";
-    private static KEY_ANIMATION_START_ENTER = "startEnter";
-    private static KEY_ANIMATION_START_EXIT = "startExit";
-    private static KEY_ANIMATION_END_ENTER = "endEnter";
-    private static KEY_ANIMATION_END_EXIT = "endExit";
-    private static KEY_HAS_BACK_BUTTON = "hasBackButton";
-    private static KEY_BROWSER_PACKAGE = "browserPackage";
-    private static KEY_SHOW_IN_RECENTS = "showInRecents";
+    private static ERROR_CODE = 'InAppBrowser';
+    private static KEY_TOOLBAR_COLOR = 'toolbarColor';
+    private static KEY_SECONDARY_TOOLBAR_COLOR = 'secondaryToolbarColor';
+    private static KEY_NAVIGATION_BAR_COLOR = 'navigationBarColor';
+    private static KEY_NAVIGATION_BAR_DIVIDER_COLOR = 'navigationBarDividerColor';
+    private static KEY_ENABLE_URL_BAR_HIDING = 'enableUrlBarHiding';
+    private static KEY_SHOW_PAGE_TITLE = 'showTitle';
+    private static KEY_DEFAULT_SHARE_MENU_ITEM = 'enableDefaultShare';
+    private static KEY_FORCE_CLOSE_ON_REDIRECTION = 'forceCloseOnRedirection';
+    private static KEY_ANIMATIONS = 'animations';
+    private static KEY_HEADERS = 'headers';
+    private static KEY_ANIMATION_START_ENTER = 'startEnter';
+    private static KEY_ANIMATION_START_EXIT = 'startExit';
+    private static KEY_ANIMATION_END_ENTER = 'endEnter';
+    private static KEY_ANIMATION_END_EXIT = 'endExit';
+    private static KEY_HAS_BACK_BUTTON = 'hasBackButton';
+    private static KEY_BROWSER_PACKAGE = 'browserPackage';
+    private static KEY_SHOW_IN_RECENTS = 'showInRecents';
 
     private static redirectResolve: RedirectResolve;
     private static redirectReject: RedirectReject;
     private isLightTheme: boolean;
     private currentActivity: any;
-    private animationIdentifierPattern = Pattern.compile("^.+:.+/");
+    private animationIdentifierPattern = Pattern.compile('^.+:.+/');
 
     constructor() {
       super();
@@ -99,6 +99,10 @@ function setup() {
       if (!this.currentActivity) {
         return Promise.reject(new Error(InAppBrowserModule.ERROR_CODE));
       }
+      const result = new Promise<BrowserResult>(function (resolve, reject) {
+        InAppBrowserModule.redirectResolve = resolve;
+        InAppBrowserModule.redirectReject = reject;
+      });
 
       const inAppBrowserOptions = getDefaultOptions(url, options);
 
@@ -201,18 +205,15 @@ function setup() {
       else {
         intent.putExtra(CustomTabsIntent.EXTRA_TITLE_VISIBILITY_STATE, CustomTabsIntent.NO_TITLE);
       }
-  
+
       this.registerEvent();
 
       this.currentActivity.startActivity(
         createStartIntent(this.currentActivity, intent),
         customTabsIntent.startAnimationBundle
       );
 
-      return new Promise(function (resolve, reject) {
-        InAppBrowserModule.redirectResolve = resolve;
-        InAppBrowserModule.redirectReject = reject;
-      });
+      return result;
     }
 
     public close() {
@@ -287,7 +288,7 @@ function setup() {
       if (this.animationIdentifierPattern.matcher(identifier).find()) {
         return context.getResources().getIdentifier(identifier, null, null);
       } else {
-        return context.getResources().getIdentifier(identifier, "anim", context.getPackageName());
+        return context.getResources().getIdentifier(identifier, 'anim', context.getPackageName());
       }
     }