Bangle.js: Fix wrapString when wrapping a non-UTF8 string containing UTF8 characters (fix #2633)

Author: gfwilliams

ChangeLog

@@ -1,5 +1,6 @@
             nRF5x: Ensure Bluetooth notifications work correctly when two separate connections use the same handle for their characteristics
             nRF5x: Remove handlers from our handlers array when a device is disconnected
+            Bangle.js: Fix wrapString when wrapping a non-UTF8 string containing UTF8 characters (fix #2633) 
 
      2v26 : nRF5x: ensure TIMER1_IRQHandler doesn't always wake idle loop up (fix #1900)
             Puck.js: On v2.1 ensure Puck.mag behaves like other variants - just returning the last reading (avoids glitches when used with Puck.magOn)

libs/graphics/jswrap_graphics.c

@@ -2526,10 +2526,10 @@ JsVar *jswrap_graphics_wrapString(JsVar *parent, JsVar *str, int maxWidth) {
               width += w;
               wordStartIdx = (int)jsvStringIteratorGetIndex(&wordIt);
 #ifdef ESPR_UNICODE_SUPPORT
-              jsvAppendUTF8Character(currentLine, wordCh);
-#else
-              jsvAppendCharacter(currentLine, wordCh);
+              if (jsvIsUTF8String(str)) jsvAppendUTF8Character(currentLine, wordCh);
+              else
 #endif
+              jsvAppendCharacter(currentLine, wordCh);
             } else
               break;
           }