PR alignment with mobile libraries

Author: crokita

lib/js/src/manager/screen/choiceset/ChoiceCell.js

@@ -29,6 +29,7 @@
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */
+import { SdlArtwork } from '../../file/filetypes/SdlArtwork.js';
 
 class ChoiceCell {
     /**
@@ -276,6 +277,27 @@ class ChoiceCell {
         }
         return true;
     }
+
+    /**
+     * Creates a deep copy of the object
+     * @returns {ChoiceCell} - A deep copy of the object
+     */
+    clone () {
+        const clonedParams = Object.assign({}, this); // shallow copy. copy all objects afterwards
+
+        if (clonedParams._artwork !== null) {
+            clonedParams._artwork = Object.assign(new SdlArtwork(), clonedParams._artwork);
+        }
+        if (clonedParams._secondaryArtwork !== null) {
+            clonedParams._secondaryArtwork = Object.assign(new SdlArtwork(), clonedParams._secondaryArtwork);
+        }
+
+        if (Array.isArray(this.getVoiceCommands())) {
+            clonedParams._voiceCommands = this.getVoiceCommands().map(vc => vc);
+        }
+
+        return Object.assign(new ChoiceCell(this.getText()), clonedParams);
+    }
 }
 
 // MAX ID for cells - Reasoning is from Java library: cannot use Integer.MAX_INT as the value is too high.

lib/js/src/manager/screen/choiceset/_ChoiceSetManagerBase.js

@@ -136,14 +136,7 @@ class _ChoiceSetManagerBase extends _SubManagerBase {
             return false;
         }
 
-        // If we're running on a connection < RPC 7.1, we need to de-duplicate cells because presenting them will fail if we have the same cell primary text.
-        if (choices !== null && this._lifecycleManager.getSdlMsgVersion() !== null
-                && (this._lifecycleManager.getSdlMsgVersion().getMajorVersion() < 7
-                || (this._lifecycleManager.getSdlMsgVersion().getMajorVersion() === 7 && this._lifecycleManager.getSdlMsgVersion().getMinorVersion() === 0))) {
-            // version if 7.0.0 or lower
-            this._addUniqueNamesToCells(choices);
-        }
-        const choicesToUpload = choices.map(choice => choice); // shallow copy
+        const choicesToUpload = this._getChoicesToBeUploadedWithArray(choices);
 
         this._removeChoicesFromChoices(this._preloadedChoices, choicesToUpload);
         this._removeChoicesFromChoices(this._pendingPreloadChoices, choicesToUpload);
@@ -553,6 +546,22 @@ class _ChoiceSetManagerBase extends _SubManagerBase {
             .setKeypressMode(KeypressMode.RESEND_CURRENT_ENTRY);
     }
 
+    /**
+     * Modifies the choices names depending on SDL version
+     * @param {ChoiceCell[]} choices - The first list of choices
+     * @returns {ChoiceCell[]} - A deep copy of the name modified choices
+     */
+    _getChoicesToBeUploadedWithArray (choices) {
+        // If we're running on a connection < RPC 7.1, we need to de-duplicate cells because presenting them will fail if we have the same cell primary text.
+        if (choices !== null && this._lifecycleManager.getSdlMsgVersion() !== null
+                && (this._lifecycleManager.getSdlMsgVersion().getMajorVersion() < 7
+                || (this._lifecycleManager.getSdlMsgVersion().getMajorVersion() === 7 && this._lifecycleManager.getSdlMsgVersion().getMinorVersion() === 0))) {
+            // version if 7.0.0 or lower
+            this._addUniqueNamesToCells(choices);
+        }
+        return choices.map(choice => choice.clone()); // deep copy
+    }
+
     /**
      * Listen for DISPLAYS capability updates
      * @private

tests/managers/screen/choiceset/ChoiceCellTests.js

@@ -17,6 +17,7 @@ module.exports = function (appClient) {
             Validator.assertNull(choiceCell.getTertiaryText());
             Validator.assertNull(choiceCell.getArtwork());
             Validator.assertNull(choiceCell.getSecondaryArtwork());
+            Validator.assertNull(choiceCell._getUniqueText());
         });
 
         it('testSettersAndGetters', function () {