diff --git a/external/Java.Interop/build-tools/jnienv-gen/Generator.cs b/external/Java.Interop/build-tools/jnienv-gen/Generator.cs index 1ecb3d1df69..f859e1bfd8d 100644 --- a/external/Java.Interop/build-tools/jnienv-gen/Generator.cs +++ b/external/Java.Interop/build-tools/jnienv-gen/Generator.cs @@ -499,7 +499,7 @@ abstract class TypeInfo static readonly Dictionary types = new Dictionary () { { "jvalue*", new BuiltinTypeInfo ("jvalue*", "JniArgumentValue*") }, { "jbyte", new BuiltinTypeInfo ("jbyte", "sbyte") }, - { "jchar", new BuiltinTypeInfo ("jchar", "char") }, + { "jchar", new CharTypeInfo ("jchar") }, { "jchar*", new BuiltinTypeInfo ("jchar*", "char*") }, { "jshort", new BuiltinTypeInfo ("jshort", "short") }, { "jsize", new BuiltinTypeInfo ("jsize", "int") }, @@ -680,6 +680,34 @@ public override string GetManagedToMarshalExpression (string variable) } } + class CharTypeInfo : TypeInfo { + + public CharTypeInfo (string jni) + : base (jni) + { + } + + public override string GetMarshalType (bool isReturn, bool isPinvoke) + { + return isPinvoke ? "ushort" : "char"; + } + + public override string GetManagedType (bool isReturn, bool isPinvoke) + { + return "char"; + } + + public override string GetManagedToMarshalExpression (string variable) + { + return $"(ushort) {variable}"; + } + + public override string[] GetMarshalToManagedStatements (string variable, JniFunction entry) + { + return [$"return (char) {variable};"]; + } + } + class StringTypeInfo : TypeInfo { public StringTypeInfo (string jni) diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Runtime/CharSequenceTest.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Runtime/CharSequenceTest.cs index f1d7ac627df..1cd2a42ff7b 100644 --- a/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Runtime/CharSequenceTest.cs +++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Runtime/CharSequenceTest.cs @@ -1,6 +1,7 @@ using System; using Android.Runtime; +using Android.Text; using NUnit.Framework; @@ -17,5 +18,34 @@ public void ToLocalJniHandle () JNIEnv.DeleteLocalRef (p); } } + + // JNI jchar is an unsigned 16-bit value; the tests below verify both Java implementations preserve all bits + // through the generated managed char API. + [Test] + public void JavaLangStringCharAtPreservesNonAsciiCharacters () + { + const string value = "A\u00E4\u0100\u200B\u4E2D\uFFFF"; + + using (var javaString = new Java.Lang.String (value)) + AssertCharAt (javaString, value); + } + + [Test] + public void SpannableStringBuilderCharAtPreservesNonAsciiCharacters () + { + const string value = "A\u00E4\u0100\u200B\u4E2D\uFFFF"; + + using (var builder = new SpannableStringBuilder (value)) + AssertCharAt (builder, value); + } + + static void AssertCharAt (Java.Lang.ICharSequence actual, string expected) + { + for (int i = 0; i < expected.Length; i++) { + // The char local verifies the managed projection, while the value verifies the 16-bit JNI ABI. + char actualChar = actual.CharAt (i); + Assert.AreEqual (expected [i], actualChar, $"Character at index {i}: expected U+{(int) expected [i]:X4}, actual U+{(int) actualChar:X4}"); + } + } } } diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs index 71380047d2b..5a519fc0fea 100644 --- a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs +++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs @@ -32,6 +32,18 @@ public void TestMyPaintColor () } } + [Test] + public void CharFieldPreservesNonAsciiCharacters () + { + const char expected = '\uFFFF'; + + // Setting Value covers jchar input through SetCharField; reading it back covers GetCharField. + using (var value = new Android.Util.MutableChar ('\0')) { + value.Value = expected; + Assert.AreEqual (expected, value.Value); + } + } + [DllImport ("reuse-threads")] static extern int rt_register_type_on_new_thread (string java_type_namem, IntPtr class_loader);