Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix reflection issues introduced by Unity 2019.1.0f2 (Issue #1286) #1295

Closed
wants to merge 1 commit into from
Closed

Fix reflection issues introduced by Unity 2019.1.0f2 (Issue #1286) #1295

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 22 additions & 9 deletions sdk/src/Core/Amazon.Util/Internal/_unity/AndroidInterop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
Expand Down Expand Up @@ -68,9 +68,11 @@ public static object GetJavaObjectStatically(string className, string methodName
if (androidJavaClassType != null)
{
var javaClass = Activator.CreateInstance(androidJavaClassType, className);
var callStaticMethod = androidJavaClassType.GetMethods()
.Where(x => x.Name == "CallStatic")
.First(x => x.ContainsGenericParameters);

var callStaticMethod = androidJavaClassType.GetMethods().Where(x => x.Name == "CallStatic").First(x =>
x.ContainsGenericParameters &&
x.GetParameters().Select(y => y.ParameterType).SequenceEqual(new Type[] { typeof(string), typeof(object[]) })
);

var genericStaticMethod = callStaticMethod.MakeGenericMethod(androidJavaObjectType);

Expand All @@ -89,7 +91,11 @@ public static object GetJavaObjectStatically(string className, string methodName
/// <returns></returns>
public static T CallMethod<T>(object androidJavaObject, string methodName, params object[] parameters)
{
var method = androidJavaObject.GetType().GetMethods().Where(x => x.Name == "Call").First(x => x.ContainsGenericParameters);
var method = androidJavaObject.GetType().GetMethods().Where(x => x.Name == "Call").First(x =>
x.ContainsGenericParameters &&
x.GetParameters().Select(y => y.ParameterType).SequenceEqual(new Type[] { typeof(string), typeof(object[]) })
);

var genericMethod = method.MakeGenericMethod(typeof(T));
return (T)genericMethod.Invoke(androidJavaObject, new object[] { methodName, parameters });
}
Expand All @@ -104,9 +110,12 @@ public static T CallMethod<T>(object androidJavaObject, string methodName, param
public static object CallMethod(object androidJavaObject, string methodName, params object[] parameters)
{
Type androidJavaObjectType = InternalSDKUtils.GetTypeFromUnityEngine("AndroidJavaObject");
var method = androidJavaObject.GetType().GetMethods()
.Where(x => x.Name == "Call")
.First(x => x.ContainsGenericParameters);

var method = androidJavaObject.GetType().GetMethods().Where(x => x.Name == "Call").First(x =>
x.ContainsGenericParameters &&
x.GetParameters().Select(y => y.ParameterType).SequenceEqual(new Type[] { typeof(string), typeof(object[]) })
);

var genericMethod = method.MakeGenericMethod(androidJavaObjectType);
return genericMethod.Invoke(androidJavaObject, new object[] { methodName, parameters });
}
Expand Down Expand Up @@ -169,7 +178,11 @@ public static object GetStaticJavaField(string className, string methodName)
/// <returns></returns>
public static T GetJavaField<T>(object androidJavaObject, string methodName)
{
var method = androidJavaObject.GetType().GetMethods().Where(x => x.Name == "Get").First(x => x.ContainsGenericParameters);
var method = androidJavaObject.GetType().GetMethods().Where(x => x.Name == "Get").First(x =>
x.ContainsGenericParameters &&
x.GetParameters().Select(y => y.ParameterType).SequenceEqual(new Type[] { typeof(string) })
);

var genericMethod = method.MakeGenericMethod(typeof(T));
return (T)genericMethod.Invoke(androidJavaObject, new object[] { methodName });
}
Expand Down