From 580fb35ddc35dad8b5cca7e917a6424ef25ed83f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Grillo?= Date: Fri, 14 May 2021 12:47:53 +0100 Subject: [PATCH 1/2] Empty button caption fix Android --- CHANGELOG.md | 4 ++++ package.json | 2 +- plugin.xml | 2 +- src/android/InAppBrowser.java | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7de1a4094..dbf0beb08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [4.0.0-OS6] - 2021-05-14 +### Fix +- Close button has an incorrect name after setting button caption as "Empty" (Android) [RMET-331](https://outsystemsrd.atlassian.net/browse/RMET-331) + ## [3.1.0-OS3] - 2020-01-08 ### Changes - Add compile-time decision for disabling UIWebView [RNMT-3569](https://outsystemsrd.atlassian.net/browse/RNMT-3569) diff --git a/package.json b/package.json index c7a04223f..2bf1d3070 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-plugin-inappbrowser", - "version": "4.0.0-OS1", + "version": "4.0.0-OS6", "description": "Cordova InAppBrowser Plugin", "types": "./types/index.d.ts", "cordova": { diff --git a/plugin.xml b/plugin.xml index e3ac306ae..5fd0100ed 100644 --- a/plugin.xml +++ b/plugin.xml @@ -20,7 +20,7 @@ + version="4.0.0-OS6"> InAppBrowser Cordova InAppBrowser Plugin diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser.java index 15a13fe00..d141c0664 100644 --- a/src/android/InAppBrowser.java +++ b/src/android/InAppBrowser.java @@ -690,6 +690,8 @@ public String showWebPage(final String url, HashMap features) { String closeButtonCaptionSet = features.get(CLOSE_BUTTON_CAPTION); if (closeButtonCaptionSet != null) { closeButtonCaption = closeButtonCaptionSet; + } else { + closeButtonCaption = ""; } String closeButtonColorSet = features.get(CLOSE_BUTTON_COLOR); if (closeButtonColorSet != null) { From 73407d9bee37fb41161854ef19f75b996bc420ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Grillo?= Date: Fri, 14 May 2021 16:10:30 +0100 Subject: [PATCH 2/2] chore: Changed to version 4.0.0-OS5 --- CHANGELOG.md | 2 +- package.json | 2 +- plugin.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbf0beb08..f747d7a9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [4.0.0-OS6] - 2021-05-14 +## [4.0.0-OS5] - 2021-05-14 ### Fix - Close button has an incorrect name after setting button caption as "Empty" (Android) [RMET-331](https://outsystemsrd.atlassian.net/browse/RMET-331) diff --git a/package.json b/package.json index 2bf1d3070..864d87cdd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-plugin-inappbrowser", - "version": "4.0.0-OS6", + "version": "4.0.0-OS5", "description": "Cordova InAppBrowser Plugin", "types": "./types/index.d.ts", "cordova": { diff --git a/plugin.xml b/plugin.xml index 5fd0100ed..493d94210 100644 --- a/plugin.xml +++ b/plugin.xml @@ -20,7 +20,7 @@ + version="4.0.0-OS5"> InAppBrowser Cordova InAppBrowser Plugin