Merge pull request #18 from proyecto26/release/v2.1.1

Release v2.1.1

Author: jdnichollsc

CHANGELOG.md

@@ -22,6 +22,10 @@ in case of vulnerabilities.
 
 ## [Unreleased]
 
+## [2.1.1] - 2019-11-14
+### Fixed
+- Fixed issue about `headers` option not working from **Android** [#16](https://github.com/proyecto26/nativescript-inappbrowser/issues/16).
+
 ## [2.1.0] - 2019-11-13
 ### Added
 - Added support for `automatic` modal presentation style from **iOS**.
@@ -52,7 +56,8 @@ in case of vulnerabilities.
 - Methods to open and close external urls to authenticate the user **(openAuth, closeAuth)** using deep linking.
 - `isAvailable` method to detect if the device supports the plugin.
 
-[Unreleased]: https://github.com/proyecto26/nativescript-inappbrowser/compare/v2.1.0...HEAD
+[Unreleased]: https://github.com/proyecto26/nativescript-inappbrowser/compare/v2.1.1...HEAD
+[2.1.1]: https://github.com/proyecto26/nativescript-inappbrowser/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/proyecto26/nativescript-inappbrowser/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/proyecto26/nativescript-inappbrowser/compare/v1.0.0...v2.0.0
 [1.0.0]: https://github.com/proyecto26/nativescript-inappbrowser/releases/tag/v1.0.0

src/InAppBrowser.android.ts

@@ -95,7 +95,7 @@ class InAppBrowserModule extends java.lang.Object {
       return Promise.reject(new Error(InAppBrowserModule.ERROR_CODE));
     }
 
-    const options = getDefaultOptions(url, inAppBrowserOptions);
+    const options: InAppBrowserOptions = getDefaultOptions(url, inAppBrowserOptions);
 
     const builder = new CustomTabsIntent.Builder();
     if (options[InAppBrowserModule.KEY_TOOLBAR_COLOR]) {
@@ -131,7 +131,7 @@ class InAppBrowserModule extends java.lang.Object {
     const customTabsIntent = builder.build();
 
     const keyHeaders = options[InAppBrowserModule.KEY_HEADERS];
-    if (keyHeaders && keyHeaders.length) {
+    if (keyHeaders) {
       const headers = new Bundle();
       for (const key in keyHeaders) {
         if (keyHeaders.hasOwnProperty(key)) {

src/InAppBrowser.common.ts

@@ -24,14 +24,15 @@ export type RedirectResult = {
 
 export type AuthSessionResult = RedirectResult | BrowserResult;
 
-export function getDefaultOptions(url, options) {
+export function getDefaultOptions(url: string, options: any) {
   return {
     ...options,
     url,
     dismissButtonStyle: options.dismissButtonStyle || 'close',
-    readerMode: options.readerMode !== undefined ? options.readerMode : false,
+    readerMode: !!options.readerMode,
     animated: options.animated !== undefined ? options.animated : true,
-    modalEnabled: options.modalEnabled !== undefined ? options.modalEnabled : true
+    modalEnabled: options.modalEnabled !== undefined ? options.modalEnabled : true,
+    enableBarCollapsing: !!options.enableBarCollapsing
   };
 }
 

src/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "nativescript-inappbrowser",
-	"version": "2.1.0",
+	"version": "2.1.1",
 	"description": "InAppBrowser for NativeScript",
 	"main": "InAppBrowser",
 	"typings": "index.d.ts",