Skip to content

Commit 39e7837

Browse files
Fix binding errors with proper Additions and Metadata.xml transforms
- androidx.heifwriter: Remove setCallback method via Metadata.xml - com.google.crypto.tink: Remove interface implementation via Metadata.xml - com.squareup.okhttp3.okhttp-tls: Add Additions to implement trust manager methods by calling base Co-authored-by: jonathanpeppers <[email protected]>
1 parent 11949f6 commit 39e7837

File tree

5 files changed

+44
-15
lines changed

5 files changed

+44
-15
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<metadata>
2-
<!-- Remove problematic method that references EncoderBase.EncoderCallback which doesn't exist -->
3-
<remove-node path="/api/package[@name='androidx.heifwriter']/class[@name='AvifEncoder.Builder']/method[@name='setCallback' and count(parameter)=1 and parameter[1][@type='androidx.heifwriter.EncoderBase.EncoderCallback']]" />
2+
<!-- Remove method with non-existent callback type -->
3+
<remove-node path="/api/package[@name='androidx.heifwriter']/class[@name='AvifEncoder.Builder']/method[@name='setCallback']" />
44
</metadata>

source/com.google.crypto.tink/tink-android/Transforms/Metadata.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@
981981
Xamarin.Google.Crypto.Tink.Internal.IKeysetHandleInterfaceEntry
982982
</attr>
983983

984-
<!-- Remove problematic property that has wrong return type -->
985-
<remove-node path="/api/package[@name='com.google.crypto.tink.shaded.protobuf']/class[@name='DescriptorProtos.FeatureSet']/method[@name='getEnforceNamingStyle' and count(parameter)=0]" />
984+
<!-- Remove interface implementation that has incompatible return type -->
985+
<attr path="/api/package[@name='com.google.crypto.tink.shaded.protobuf']/class[@name='DescriptorProtos.FeatureSet']" name="implements"></attr>
986986

987987
</metadata>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
namespace Square.OkHttp3.TLS.Internal;
2+
3+
public partial class InsecureAndroidTrustManager
4+
{
5+
// Implement interface methods with void return type by calling base methods
6+
public unsafe void CheckClientTrusted(global::Java.Security.Cert.X509Certificate[]? chain, string? authType)
7+
{
8+
base.CheckClientTrusted(chain, authType);
9+
}
10+
11+
public unsafe void CheckServerTrusted(global::Java.Security.Cert.X509Certificate[]? chain, string? authType)
12+
{
13+
base.CheckServerTrusted(chain, authType);
14+
}
15+
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
namespace Square.OkHttp3.TLS.Internal;
2+
3+
public partial class InsecureExtendedTrustManager
4+
{
5+
// Implement abstract methods by calling base implementations
6+
public override unsafe void CheckClientTrusted(global::Java.Security.Cert.X509Certificate[]? chain, string? authType, global::Javax.Net.Ssl.SSLEngine? engine)
7+
{
8+
base.CheckClientTrusted(chain, authType, engine);
9+
}
10+
11+
public override unsafe void CheckClientTrusted(global::Java.Security.Cert.X509Certificate[]? chain, string? authType, global::Java.Net.Socket? socket)
12+
{
13+
base.CheckClientTrusted(chain, authType, socket);
14+
}
15+
16+
public override unsafe void CheckClientTrusted(global::Java.Security.Cert.X509Certificate[]? chain, string? authType)
17+
{
18+
base.CheckClientTrusted(chain, authType);
19+
}
20+
21+
public override unsafe void CheckServerTrusted(global::Java.Security.Cert.X509Certificate[]? chain, string? authType)
22+
{
23+
base.CheckServerTrusted(chain, authType);
24+
}
25+
}

source/com.squareup.okhttp3/okhttp-tls/Transforms/Metadata.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)