RMET-4025 - Prepare to release version 2.6.8-OS23 (#39)

* RMET-4025 - Update hook to avoid duplicates in strings.xml (#38)

* feat: update hook to avoid adding duplicated entries in strings.xml

References: https://outsystemsrd.atlassian.net/browse/RMET-4025

* fix: fix comparison with true

References: https://outsystemsrd.atlassian.net/browse/RMET-4025

* feat: check if entry exist and replace if needed

References: https://outsystemsrd.atlassian.net/browse/RMET-4025

* fix: fixing variable name

References: https://outsystemsrd.atlassian.net/browse/RMET-4025

* chore: update changelog

References: https://outsystemsrd.atlassian.net/browse/RMET-4025

* chore(release): raise to version 2.6.8-OS23

References: https://outsystemsrd.atlassian.net/browse/RMET-4278

Author: alexgerardojacinto

CHANGELOG

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+2.6.8-OS23 - 2025-07-08
+------------------
+- Fix: [android] Updates hook to avoid duplicates in `strings.xml` (https://outsystemsrd.atlassian.net/browse/RMET-4025).
+
 2.6.8-OS22 - 2025-06-06
 ------------------
 - Fix: [Android] Capacitor Release builds failure.

hooks/android/androidCopyPreferences.js

@@ -18,33 +18,64 @@ module.exports = function (context) {
     const stringsXmlString = fs.readFileSync(stringsXmlPath, 'utf-8');
     const stringsXmlDoc = parser.parseFromString(stringsXmlString, 'text/xml')
 
-    if(authenticate == "true"){
-        // insert bool value in strings.xml
-        const booleanElements = stringsXmlDoc.getElementsByTagName('bool');
-
-        // set text for each <bool> element
-        for (let i = 0; i < booleanElements.length; i++) {
-            const name = booleanElements[i].getAttribute('name');
-            if (name == "migration_auth") {
-                booleanElements[i].textContent = authenticate;
+    // Keys to update and their values
+    const boolKey = "migration_auth";
+    const stringKeys = {
+        biometric_prompt_title: auth_prompt_title,
+        biometric_prompt_subtitle: auth_prompt_subtitle,
+        biometric_prompt_negative_button: auth_prompt_negative_button
+    };
+
+    // process <bool> entry
+    const boolElements = Array.from(stringsXmlDoc.getElementsByTagName('bool'));
+    const boolMatches = boolElements.filter(el => el.getAttribute('name') === boolKey);
+
+    if (authenticate == "true") {
+        if (boolMatches.length > 0) {
+            // remove any duplicates beyond the first
+            for (let i = 1; i < boolMatches.length; i++) {
+                boolMatches[i].parentNode.removeChild(boolMatches[i]);
+            }
+
+            // update first match if needed
+            const existingBool = boolMatches[0];
+            if (existingBool.textContent !== authenticate) {
+                existingBool.textContent = authenticate;
             }
+        } else {
+            // add new <bool> if it doesn't exist
+            const newBool = stringsXmlDoc.createElement('bool');
+            newBool.setAttribute('name', boolKey);
+            newBool.textContent = authenticate;
+            stringsXmlDoc.documentElement.appendChild(newBool);
         }
     }
 
-    // insert string values in strings.xml
-    const stringElements = stringsXmlDoc.getElementsByTagName('string');
+    // process <string> entries
+    const allStrings = Array.from(stringsXmlDoc.getElementsByTagName('string'));
 
-    // set text for each <string> element
-    for (let i = 0; i < stringElements.length; i++) {
-        const name = stringElements[i].getAttribute('name');
-        if (name == "biometric_prompt_title" && auth_prompt_title != "") {
-            stringElements[i].textContent = auth_prompt_title;
-        }
-        else if (name == "biometric_prompt_subtitle" && auth_prompt_subtitle != "") {
-            stringElements[i].textContent = auth_prompt_subtitle;
-        }
-        else if (name == "biometric_prompt_negative_button" && auth_prompt_negative_button != "") {
-            stringElements[i].textContent = auth_prompt_negative_button;
+    for (const [key, value] of Object.entries(stringKeys)) {
+        if (!value || value.trim() === "") continue;
+
+        const matchingStrings = allStrings.filter(el => el.getAttribute('name') === key);
+
+        if (matchingStrings.length > 0) {
+            // remove duplicates beyond the first
+            for (let i = 1; i < matchingStrings.length; i++) {
+                matchingStrings[i].parentNode.removeChild(matchingStrings[i]);
+            }
+
+            // update first if needed
+            const existingString = matchingStrings[0];
+            if (existingString.textContent !== value) {
+                existingString.textContent = value;
+            }
+        } else {
+            // add new <string> if it doesn't exist
+            const newString = stringsXmlDoc.createElement('string');
+            newString.setAttribute('name', key);
+            newString.textContent = value;
+            stringsXmlDoc.documentElement.appendChild(newString);
         }
     }
 
@@ -54,5 +85,4 @@ module.exports = function (context) {
 
     // write the updated XML string back to the same file
     fs.writeFileSync(stringsXmlPath, updatedXmlString, 'utf-8');
-
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-secure-storage",
-  "version": "2.6.8-OS22",
+  "version": "2.6.8-OS23",
   "description": "Secure storage plugin for iOS & Android",
   "author": "Yiorgis Gozadinos <ggozad@crypho.com>",
   "contributors": [

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-plugin-secure-storage"
-    version="2.6.8-OS22">
+    version="2.6.8-OS23">
 
     <name>SecureStorage</name>
     <author>Crypho AS</author>