Merge pull request #29 from OutSystems/fix/empty-close-button

RMET-331: Set close button text to an empty string if no closeButtonCaption is provided
OutSystems · May 14, 2021 · d34f8b6 · d34f8b6
2 parents 1f8477b + 73407d9
commit d34f8b6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git 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-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)
+
 ## [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
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-inappbrowser",
-  "version": "4.0.0-OS1",
+  "version": "4.0.0-OS5",
   "description": "Cordova InAppBrowser Plugin",
   "types": "./types/index.d.ts",
   "cordova": {

diff --git a/plugin.xml b/plugin.xml
@@ -20,7 +20,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="cordova-plugin-inappbrowser"
-      version="4.0.0-OS1">
+      version="4.0.0-OS5">
 
     <name>InAppBrowser</name>
     <description>Cordova InAppBrowser Plugin</description>

diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser.java
@@ -690,6 +690,8 @@ public String showWebPage(final String url, HashMap<String, String> 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) {