change mapboxConfig to use new unityEnum method as well

Author: brnkhy

Runtime/Mapbox/BaseModule/Telemetry/TelemetryAndroid.cs

@@ -58,8 +58,13 @@ public class TelemetryAndroid : ITelemetryLibrary
 		private string _sdkInfoRegistryFactoryClassName = "com.mapbox.common.SdkInfoRegistryFactory";
 		private string _sdkInfoRegistryFactoryGetMethodName = "getInstance"; 
 		private string _sdkInfoRegistryRegisterMethodName = "registerSdkInformation";
+
+		private string _unityMausEnumString = "UnityMAUS";
+		private string _valuesMethodNameForEnums = "values";
+		private string _toStringMethodName = "toString";
 
 		private AndroidJavaObject _sdkInformation;
+		private AndroidJavaObject _unityEnum;
 
 		public void Initialize(string accessToken)
 		{
@@ -82,6 +87,19 @@ public void Initialize(string accessToken)
 				return;
 			}
 
+			var skuidClass = new AndroidJavaClass(_mapboxUserSkuIdentifierClassName);
+			var skuValuesArray = skuidClass.CallStatic<AndroidJavaObject>(_valuesMethodNameForEnums);
+			var convertedArray = AndroidJNIHelper.ConvertFromJNIArray<AndroidJavaObject[]>(skuValuesArray.GetRawObject());
+			foreach (var javaEnumObject in convertedArray)
+			{
+				var enumString = javaEnumObject.Call<string>(_toStringMethodName);
+				if (enumString == _unityMausEnumString)
+				{
+					_unityEnum = javaEnumObject;
+					break;
+				}
+			}
+			
 			// SdkInformation testInformation = new SdkInformation(applicationName, packageVersion, packageName);
 			// SdkInfoRegistry registry = SdkInfoRegistryFactory.getInstance();
 			// registry.registerSdkInformation(testInformation);
@@ -113,13 +131,8 @@ public void SendTurnstile()
 					Debug.Log(_eventsServiceNullMessage);
 					return;
 				}
-
-				var skuid = new AndroidJavaClass(_mapboxUserSkuIdentifierClassName);
-				AndroidJavaObject valueArray = skuid.CallStatic<AndroidJavaObject>("values");
-				var array = AndroidJNIHelper.ConvertFromJNIArray<AndroidJavaObject[]>(valueArray.GetRawObject());
-				var unityEnum = array[7];
 
-				using (AndroidJavaObject turnstileEvent = new AndroidJavaObject(_mapboxTurnstileEventClassName, unityEnum))
+				using (AndroidJavaObject turnstileEvent = new AndroidJavaObject(_mapboxTurnstileEventClassName, _unityEnum))
 				{
 					_mapboxEventService.Call(_sendTurnstileEventMethodName, turnstileEvent, null);
 				}
@@ -130,14 +143,8 @@ public void SendSdkEvent()
 		{
 			var billingServiceFactory = new AndroidJavaClass(_mapboxBillingServiceFactoryClassName);
 			var billingService = billingServiceFactory.CallStatic<AndroidJavaObject>(_mapboxBillingFactoryGetMethodName);
-
-			var skuid = new AndroidJavaClass(_mapboxUserSkuIdentifierClassName);
-			AndroidJavaObject valueArray = skuid.CallStatic<AndroidJavaObject>("values");
-			var array = AndroidJNIHelper.ConvertFromJNIArray<AndroidJavaObject[]>(valueArray.GetRawObject());
-			var unityEnum = array[7];
-				
 
-			billingService.Call(_mapboxSdkEventMethodName, _sdkInformation, unityEnum, null);
+			billingService.Call(_mapboxSdkEventMethodName, _sdkInformation, _unityEnum, null);
 		}
 
 		public void SetLocationCollectionState(bool enable)

Runtime/Mapbox/BaseModule/Utilities/MapboxConfiguration.cs

@@ -54,10 +54,27 @@ public string GetMapsSkuToken()
 			private string _mapboxoptionsClassName = "com.mapbox.common.MapboxOptions";
 			private string _mapboxOptionsSetAccessTokenMethodName = "setAccessToken";
 			private string _couldNotGetMapboxOptionsMessage = "Couldn't get Mapbox Options";
+			private string _unityMausEnumString = "UnityMAUS";
+			private string _valuesMethodNameForEnums = "values";
+			private string _toStringMethodName = "toString";
+			private AndroidJavaObject _unityEnum;
 
 			public void Initialize()
 			{
 				SetAccessToken(AccessToken);
+
+				var skuidClass = new AndroidJavaClass(_mapboxUserSkuIdentifierClassName);
+				var skuValuesArray = skuidClass.CallStatic<AndroidJavaObject>(_valuesMethodNameForEnums);
+				var convertedArray = AndroidJNIHelper.ConvertFromJNIArray<AndroidJavaObject[]>(skuValuesArray.GetRawObject());
+				foreach (var javaEnumObject in convertedArray)
+				{
+					var enumString = javaEnumObject.Call<string>(_toStringMethodName);
+					if (enumString == _unityMausEnumString)
+					{
+						_unityEnum = javaEnumObject;
+						break;
+					}
+				}
 			}
 
 			private bool SetAccessToken(string accessToken)
@@ -77,9 +94,7 @@ public string GetMapsSkuToken()
 			{
 				var billingServiceFactory = new AndroidJavaClass(_mapboxBillingServiceFactoryClassName);
 				var billingService = billingServiceFactory.CallStatic<AndroidJavaObject>(_mapboxBillingFactoryGetMethodName);
-			
-				var skuid = new AndroidJavaObject(_mapboxUserSkuIdentifierClassName);
-				return billingService.Call<string>(_mapboxSkuTokenMethodName, skuid.GetStatic<AndroidJavaObject>(_unityMausEnumName));
+				return billingService.Call<string>(_mapboxSkuTokenMethodName, _unityEnum);
 			}
 		#endif