Skip to content

[Xamarin.Android.Tools.Bytecode] Fix Nullability warnings #922

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

Merged
merged 1 commit into from
Nov 30, 2021
Merged

[Xamarin.Android.Tools.Bytecode] Fix Nullability warnings #922

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Xamarin.Android.Tools.Bytecode/ClassPath.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,9 @@ void FixupParametersFromDocs (XElement api, string path)
continue;

var parameterTypes = parameterElements
.Select (p => new JavaMethodParameterTypeInfo ((string) p.Attribute ("jni-type"), (string) p.Attribute ("type")))
.Select (p => new JavaMethodParameterTypeInfo (
jniType: (string?) p.Attribute ("jni-type") ?? "",
javaType: (string?) p.Attribute ("type") ?? ""))
.ToArray ();

if (!parameterTypes.Any ())
Expand All @@ -315,7 +317,7 @@ void FixupParametersFromDocs (XElement api, string path)
currentpackage,
className,
currentMethod,
(string) method.Attribute ("jni-signature"),
(string?) method.Attribute ("jni-signature"),
parameterTypes,
isVarArgs: false
);
Expand Down
15 changes: 9 additions & 6 deletions src/Xamarin.Android.Tools.Bytecode/JavaDocumentScraper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,23 +400,23 @@ public ApiXmlDocScraper (string apiXmlFile)
var xtype = xdoc
.Elements ("api")
.Elements ("package")
.Where (p => ((string) p.Attribute ("name")) == info.PackageName)
.Where (p => ((string?) p.Attribute ("name")) == info.PackageName)
.Elements ()
.Where (t => ((string) t.Attribute ("name")) == info.TypeName)
.Where (t => ((string?) t.Attribute ("name")) == info.TypeName)
.FirstOrDefault ();
if (xtype == null) {
return null;
}

var members = info.MethodName == "constructor"
? xtype.Elements ("constructor")
: xtype.Elements ("method").Where (m => ((string) m.Attribute ("name")) == info.MethodName);
: xtype.Elements ("method").Where (m => ((string?) m.Attribute ("name")) == info.MethodName);
var pcount = info.ParameterTypes.Length;
members = members
.Where (m => m.Elements ("parameter").Count () == pcount);

XElement? member =
members.FirstOrDefault (m => info.MethodSignature == (string) m.Attribute ("jni-signature"));
members.FirstOrDefault (m => info.MethodSignature == (string?) m.Attribute ("jni-signature"));
if (member == null) {
foreach (var m in members) {
var found = true;
Expand All @@ -436,12 +436,15 @@ public ApiXmlDocScraper (string apiXmlFile)
if (member == null)
return null;
return member.Elements ("parameter")
.Select (p => (string) p.Attribute ("name"))
.Select (p => ((string?) p.Attribute ("name")) ?? "")
.ToArray ();

bool ParameterTypesMatch (XElement parameter, string ptype)
{
var jtype = (string) parameter.Attribute ("type");
var jtype = (string?) parameter.Attribute ("type");
if (jtype == null) {
return false;
}
if (!jtype.StartsWith (".*", StringComparison.Ordinal)) {
return jtype == ptype;
}
Expand Down