Skip to content

Commit 11949f6

Browse files
Fix binding errors using Metadata.xml transforms instead of Additions
- Revert AssemblyInfo.cs to preserve build placeholders - Remove problematic APIs via Metadata.xml transforms: - androidx.heifwriter: Remove setCallback method with invalid type reference - com.google.crypto.tink: Remove getEnforceNamingStyle method with wrong return type - com.squareup.okhttp3.okhttp-tls: Remove trust manager methods with signature mismatches Co-authored-by: jonathanpeppers <[email protected]>
1 parent 9e9d54e commit 11949f6

File tree

7 files changed

+17
-90
lines changed

7 files changed

+17
-90
lines changed

source/androidx.heifwriter/heifwriter/Additions/AvifEncoder.cs

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
<metadata></metadata>
1+
<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']]" />
4+
</metadata>

source/com.google.crypto.tink/tink-android/Additions/DescriptorProtos.FeatureSet.cs

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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -981,5 +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]" />
984986

985987
</metadata>

source/com.squareup.okhttp3/okhttp-tls/Additions/InsecureAndroidTrustManager.cs

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

source/com.squareup.okhttp3/okhttp-tls/Additions/InsecureExtendedTrustManager.cs

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<metadata>
2+
<!-- Remove problematic methods with wrong return types in InsecureAndroidTrustManager -->
3+
<remove-node path="/api/package[@name='okhttp3.tls.internal.der']/class[@name='InsecureAndroidTrustManager']/method[@name='checkClientTrusted' and count(parameter)=2 and parameter[1][@type='java.security.cert.X509Certificate[]'] and parameter[2][@type='java.lang.String']]" />
4+
<remove-node path="/api/package[@name='okhttp3.tls.internal.der']/class[@name='InsecureAndroidTrustManager']/method[@name='checkServerTrusted' and count(parameter)=2 and parameter[1][@type='java.security.cert.X509Certificate[]'] and parameter[2][@type='java.lang.String']]" />
5+
6+
<!-- Remove problematic methods in InsecureExtendedTrustManager -->
7+
<remove-node path="/api/package[@name='okhttp3.tls.internal.der']/class[@name='InsecureExtendedTrustManager']/method[@name='checkClientTrusted' and count(parameter)=2 and parameter[1][@type='java.security.cert.X509Certificate[]'] and parameter[2][@type='java.lang.String']]" />
8+
<remove-node path="/api/package[@name='okhttp3.tls.internal.der']/class[@name='InsecureExtendedTrustManager']/method[@name='checkClientTrusted' and count(parameter)=3 and parameter[1][@type='java.security.cert.X509Certificate[]'] and parameter[2][@type='java.lang.String'] and parameter[3][@type='java.net.Socket']]" />
9+
<remove-node path="/api/package[@name='okhttp3.tls.internal.der']/class[@name='InsecureExtendedTrustManager']/method[@name='checkClientTrusted' and count(parameter)=3 and parameter[1][@type='java.security.cert.X509Certificate[]'] and parameter[2][@type='java.lang.String'] and parameter[3][@type='javax.net.ssl.SSLEngine']]" />
10+
<remove-node path="/api/package[@name='okhttp3.tls.internal.der']/class[@name='InsecureExtendedTrustManager']/method[@name='checkServerTrusted' and count(parameter)=2 and parameter[1][@type='java.security.cert.X509Certificate[]'] and parameter[2][@type='java.lang.String']]" />
11+
</metadata>

0 commit comments

Comments
 (0)