fix: crash when IL2CCP option is enabled (#28)

willpassidomo · web-flow · commit d6772b63b74b · 2022-06-30T13:38:38.000-04:00
* fix: crash when IL2CCP option is enabled
diff --git a/Assets/Plugins/iOS/mParticleUnity.m b/Assets/Plugins/iOS/mParticleUnity.m
diff --git a/Assets/mParticle/MParticleAndroid.cs b/Assets/mParticle/MParticleAndroid.cs
@@ -8,6 +8,7 @@
 
 namespace mParticleAndroid
 {
+	#if UNITY_ANDROID || UNITY_EDITOR
 	public sealed class MParticleAndroid : IMParticleSDK
 	{
 		private AndroidJavaObject mp;
@@ -454,4 +455,5 @@ public IMParticleTask<IdentityApiResult> AddFailureListener(OnFailure listener)
 		}
 
 	}
+	#endif
 }
diff --git a/Assets/mParticle/MParticleiOS.cs b/Assets/mParticle/MParticleiOS.cs
@@ -9,6 +9,7 @@
 
 namespace mParticleiOs
 {
+	#if UNITY_IOS || UNITY_EDITOR
 	public class MParticleiOS : IMParticleSDK
 	{
 		/*
@@ -637,6 +638,6 @@ internal void setFailed(IdentityHttpResponse onFailure)
 				listener.Invoke(_failure);
 			}
 		}
-
 	}
+	#endif
 }
diff --git a/Assets/mParticle/android/ToAndroidUtils.cs b/Assets/mParticle/android/ToAndroidUtils.cs
@@ -6,6 +6,7 @@
 
 namespace mParticle.android
 {
+	#if UNITY_ANDROID || UNITY_EDITOR
 	internal class ToAndroidUtils
 	{
 		internal AndroidJavaClass identityTypeClass;
@@ -257,4 +258,5 @@ internal AndroidJavaObject ConvertToMpOptions(MParticleOptions options, object c
 			return nativeMpOptions.Call<AndroidJavaObject>("build");
 		}
 	}
+	#endif
 }
diff --git a/Assets/mParticle/android/ToCSUtils.cs b/Assets/mParticle/android/ToCSUtils.cs
@@ -3,6 +3,7 @@
 
 namespace mParticle.android
 {
+	#if UNITY_ANDROID || UNITY_EDITOR
 	internal class ToCSUtils
 	{
 		public ToCSUtils()
@@ -19,4 +20,5 @@ internal static mParticle.Environment ConvertToCSharpEnvironment(AndroidJavaObje
 			return (mParticle.Environment)Enum.Parse(typeof(Environment), value.Call<string>("name"));
 		}
 	}
+	#endif
 }
diff --git a/Assets/mParticle/android/nativeproxies/AndroidOnFailureListener.cs b/Assets/mParticle/android/nativeproxies/AndroidOnFailureListener.cs
@@ -5,6 +5,7 @@
 
 namespace mParticle.android
 {
+    #if UNITY_ANDROID || UNITY_EDITOR
     internal class AndroidOnFailureListener : AndroidJavaProxy
     {
         OnFailure listener;
@@ -45,4 +46,5 @@ void onFailure(AndroidJavaObject response)
         }
 
     }
+    #endif
 }
diff --git a/Assets/mParticle/android/nativeproxies/AndroidOnSuccessListener.cs b/Assets/mParticle/android/nativeproxies/AndroidOnSuccessListener.cs
@@ -5,6 +5,7 @@
 
 namespace mParticle.android
 {
+	#if UNITY_ANDROID || UNITY_EDITOR
 	public class AndroidOnSuccessListener : AndroidJavaProxy
 	{
 		OnSuccess listener;
@@ -30,6 +31,6 @@ void onSuccess(AndroidJavaObject result)
 					});
 			}
 		}
-
 	}
+	#endif
 }
diff --git a/Assets/mParticle/android/nativeproxies/AndroidOnUserIdentified.cs b/Assets/mParticle/android/nativeproxies/AndroidOnUserIdentified.cs
@@ -5,6 +5,7 @@
 
 namespace mParticle.android
 {
+	#if UNITY_ANDROID || UNITY_EDITOR
 	class AndroidOnUserIdentified : AndroidJavaProxy
 	{
 		OnUserIdentified onUserIdentifiedHandler;
@@ -20,4 +21,5 @@ void onUserIdentified(AndroidJavaObject user)
 			onUserIdentifiedHandler.Invoke(new MParticleUserImpl(user));
 		}
 	}
+	#endif
 }
diff --git a/Assets/mParticle/android/nativeproxies/AndroidUserAliasHandler.cs b/Assets/mParticle/android/nativeproxies/AndroidUserAliasHandler.cs
@@ -5,6 +5,7 @@
 
 namespace mParticle.android
 {
+	#if UNITY_ANDROID || UNITY_EDITOR
 	class AndroidUserAliasHandler : AndroidJavaProxy
 	{
 		OnUserAlias userAliasHandler;
@@ -20,7 +21,5 @@ public void onUserAlias(AndroidJavaObject previousUser, AndroidJavaObject newUse
 			userAliasHandler.Invoke(new MParticleUserImpl(previousUser), new MParticleUserImpl(newUser));
 		}
 	}
-
-
-
+	#endif
 }
diff --git a/Assets/mParticle/ios/ToCSUtils.cs b/Assets/mParticle/ios/ToCSUtils.cs
@@ -7,6 +7,7 @@
 
 namespace mParticle.ios
 {
+	#if UNITY_IOS || UNITY_EDITOR
 	public class ToCSUtils
 	{
 		public ToCSUtils()
@@ -172,6 +173,7 @@ private static string[] popDictionaryStringFromString(string valueRaw)
 			return new string[]{ valueRaw, "" };
 		}
 	}
+	#endif
 }
 
 //   Sample = "AssertAttribute1":"value101","AssertAttribute3":"value303","AssertAttribute2":"value202"
diff --git a/Assets/mParticle/ios/ToiOSUtils.cs b/Assets/mParticle/ios/ToiOSUtils.cs
@@ -5,6 +5,7 @@
 
 namespace mParticle.ios
 {
+	#if UNITY_IOS || UNITY_EDITOR
 	internal class ToiOSUtils
 	{
 		public ToiOSUtils()
@@ -68,5 +69,6 @@ internal bool ParseBoolean(string result, bool fallback)
 			}
 		}
 	}
+	#endif
 }
 

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace mParticleAndroid`
`10`	`10`	`{`
	`11`	`+ #if UNITY_ANDROID \|\| UNITY_EDITOR`
`11`	`12`	`public sealed class MParticleAndroid : IMParticleSDK`
`12`	`13`	`{`
`13`	`14`	`private AndroidJavaObject mp;`
`@@ -454,4 +455,5 @@ public IMParticleTask<IdentityApiResult> AddFailureListener(OnFailure listener)`
`454`	`455`	`}`
`455`	`456`
`456`	`457`	`}`
	`458`	`+ #endif`
`457`	`459`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace mParticleiOs`
`11`	`11`	`{`
	`12`	`+ #if UNITY_IOS \|\| UNITY_EDITOR`
`12`	`13`	`public class MParticleiOS : IMParticleSDK`
`13`	`14`	`{`
`14`	`15`	`/*`
`@@ -637,6 +638,6 @@ internal void setFailed(IdentityHttpResponse onFailure)`
`637`	`638`	`listener.Invoke(_failure);`
`638`	`639`	`}`
`639`	`640`	`}`
`640`		`-`
`641`	`641`	`}`
	`642`	`+ #endif`
`642`	`643`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace mParticle.android`
`8`	`8`	`{`
	`9`	`+ #if UNITY_ANDROID \|\| UNITY_EDITOR`
`9`	`10`	`internal class ToAndroidUtils`
`10`	`11`	`{`
`11`	`12`	`internal AndroidJavaClass identityTypeClass;`
`@@ -257,4 +258,5 @@ internal AndroidJavaObject ConvertToMpOptions(MParticleOptions options, object c`
`257`	`258`	`return nativeMpOptions.Call<AndroidJavaObject>("build");`
`258`	`259`	`}`
`259`	`260`	`}`
	`261`	`+ #endif`
`260`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace mParticle.android`
`5`	`5`	`{`
	`6`	`+ #if UNITY_ANDROID \|\| UNITY_EDITOR`
`6`	`7`	`internal class ToCSUtils`
`7`	`8`	`{`
`8`	`9`	`public ToCSUtils()`
`@@ -19,4 +20,5 @@ internal static mParticle.Environment ConvertToCSharpEnvironment(AndroidJavaObje`
`19`	`20`	`return (mParticle.Environment)Enum.Parse(typeof(Environment), value.Call<string>("name"));`
`20`	`21`	`}`
`21`	`22`	`}`
	`23`	`+ #endif`
`22`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace mParticle.android`
`7`	`7`	`{`
	`8`	`+ #if UNITY_ANDROID \|\| UNITY_EDITOR`
`8`	`9`	`internal class AndroidOnFailureListener : AndroidJavaProxy`
`9`	`10`	`{`
`10`	`11`	`OnFailure listener;`
`@@ -45,4 +46,5 @@ void onFailure(AndroidJavaObject response)`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`}`
	`49`	`+ #endif`
`48`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace mParticle.ios`
`9`	`9`	`{`
	`10`	`+ #if UNITY_IOS \|\| UNITY_EDITOR`
`10`	`11`	`public class ToCSUtils`
`11`	`12`	`{`
`12`	`13`	`public ToCSUtils()`
`@@ -172,6 +173,7 @@ private static string[] popDictionaryStringFromString(string valueRaw)`
`172`	`173`	`return new string[]{ valueRaw, "" };`
`173`	`174`	`}`
`174`	`175`	`}`
	`176`	`+ #endif`
`175`	`177`	`}`
`176`	`178`
`177`	`179`	`// Sample = "AssertAttribute1":"value101","AssertAttribute3":"value303","AssertAttribute2":"value202"`