From 4eb84939ca1987b3ce0ffb644bcdee60a6285400 Mon Sep 17 00:00:00 2001
From: Joel Wetzell <jwetzell@yahoo.com>
Date: Tue, 17 Dec 2019 09:11:06 -0600
Subject: [PATCH] Fix String Length for UTF8 Encoding

---
 Droid/Properties/AndroidManifest.xml                       | 2 +-
 iOS/Info.plist                                             | 2 +-
 iOS/qController.iOS.csproj                                 | 3 ++-
 .../Classes/Communication/SharpOSC/OscPacket.cs            | 7 +++----
 4 files changed, 7 insertions(+), 7 deletions(-)
 mode change 100755 => 100644 qController.Standard/Classes/Communication/SharpOSC/OscPacket.cs

diff --git a/Droid/Properties/AndroidManifest.xml b/Droid/Properties/AndroidManifest.xml
index 9eab380..fdd5f3b 100644
--- a/Droid/Properties/AndroidManifest.xml
+++ b/Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="28" android:versionName="1.1.1" package="com.jwetzell.qlabcontroller" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="29" android:versionName="1.1.2" package="com.jwetzell.qlabcontroller" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
diff --git a/iOS/Info.plist b/iOS/Info.plist
index d2bf6e2..ace49e0 100644
--- a/iOS/Info.plist
+++ b/iOS/Info.plist
@@ -36,7 +36,7 @@
 	<key>XSAppIconAssets</key>
 	<string>Assets.xcassets/AppIcon.appiconset</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.1.2</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
diff --git a/iOS/qController.iOS.csproj b/iOS/qController.iOS.csproj
index ecd80d3..fa259ad 100644
--- a/iOS/qController.iOS.csproj
+++ b/iOS/qController.iOS.csproj
@@ -37,13 +37,14 @@
     <OutputPath>bin\iPhone\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodesignKey>iPhone Developer</CodesignKey>
+    <CodesignKey>iPhone Developer: Joel Wetzell (5E8CU66YWB)</CodesignKey>
     <MtouchFloat32>true</MtouchFloat32>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>SdkOnly</MtouchLink>
     <MtouchArch>ARMv7, ARM64</MtouchArch>
     <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
     <PlatformTarget>x86</PlatformTarget>
+    <CodesignProvision>qController Dev</CodesignProvision>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>pdbonly</DebugType>
diff --git a/qController.Standard/Classes/Communication/SharpOSC/OscPacket.cs b/qController.Standard/Classes/Communication/SharpOSC/OscPacket.cs
old mode 100755
new mode 100644
index 8ee9798..0c29af0
--- a/qController.Standard/Classes/Communication/SharpOSC/OscPacket.cs
+++ b/qController.Standard/Classes/Communication/SharpOSC/OscPacket.cs
@@ -391,12 +391,11 @@ namespace SharpOSC
 
 		protected static byte[] setString(string value)
 		{
-			int len = value.Length + (4 - value.Length % 4);
-			if (len <= value.Length) len = len + 4;
+            var bytes = Encoding.UTF8.GetBytes(value);
+            int len = bytes.Length + (4 - bytes.Length % 4);
+			if (len <= bytes.Length) len = len + 4;
 
 			byte[] msg = new byte[len];
-
-			var bytes = Encoding.UTF8.GetBytes(value);
 			bytes.CopyTo(msg, 0);
 
 			return msg;