diff --git a/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs b/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs index 90de0552..f636b9cd 100644 --- a/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs +++ b/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs @@ -306,7 +306,7 @@ namespace CalculationManager internal static IntPtr StringToHGlobal(string resourceValue) { -#if __WASM__ || __IOS__ +#if __WASM__ || __IOS__ || __ANDROID__ // wchar_t is 32bits return StringToHGlobalUTF32(resourceValue); #else @@ -316,7 +316,7 @@ namespace CalculationManager internal static string PtrToString(IntPtr pResourceId) { -#if __WASM__ || __IOS__ +#if __WASM__ || __IOS__ || __ANDROID__ return PtrToStringUTF32(pResourceId); #else return Marshal.PtrToStringUni(pResourceId); diff --git a/src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs b/src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs index 18d93169..abe58f16 100644 --- a/src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs +++ b/src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs @@ -574,7 +574,7 @@ namespace CalculatorApp.ViewModel m_decimalSeparator = LocalizationSettings.GetInstance().GetDecimalSeparator(); -#if !__WASM__ && !__IOS__ +#if !__WASM__ && !__IOS__ && !__ANDROID__ if (CoreWindow.GetForCurrentThread() != null) { // Must have a CoreWindow to access the resource context.