.

src/Sentry.Android.AssemblyReader/AndroidAssemblyReader.cs

@@ -28,9 +28,10 @@ internal static PEReader CreatePEReader(string assemblyName, MemoryStream inputS
 
     /// <summary>
     /// The DLL may be LZ4 compressed, see https://github.com/xamarin/xamarin-android/pull/4686
+    /// In particular: https://github.com/dotnet/android/blob/44c5c30d3da692c54ca27d4a41571ef20b73670f/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyCompression.cs#L96-L104
     /// The format is:
     ///    [ 4 byte magic header ] (XALZ)
-    ///    [ 4 byte header index ]
+    ///    [ 4 byte descriptor header index ]
     ///    [ 4 byte uncompressed payload length ]
     ///    [rest: lz4 compressed payload]
     /// </summary>

src/Sentry.Android.AssemblyReader/V1/AndroidAssemblyDirectoryReaderV1.cs

@@ -1,5 +1,3 @@
-using Sentry.Android.AssemblyReader.V2;
-
 namespace Sentry.Android.AssemblyReader.V1;
 
 // The "Old" app type - where each DLL is placed in the 'assemblies' directory as an individual file.

src/Sentry.Android.AssemblyReader/V2/Utils.cs

@@ -152,27 +152,18 @@ private static FileFormat DetectAndroidArchive(FileInfo info, FileFormat default
         }
 
         return defaultFormat;
-    }
 
-    private static bool HasAllEntries(ZipArchive zip, string[] entries)
-    {
-        foreach (var entry in entries)
+        static bool HasAllEntries(ZipArchive zip, string[] entries)
         {
-            if (zip.GetEntry(entry) is null)
+            foreach (var entry in entries)
             {
-                return false;
+                if (zip.GetEntry(entry) is null)
+                {
+                    return false;
+                }
             }
-        }
 
-        return true;
-    }
-
-    internal static MemoryStream Extract(this ZipArchiveEntry zipEntry)
-    {
-        var memStream = new MemoryStream((int)zipEntry.Length);
-        using var zipStream = zipEntry.Open();
-        zipStream.CopyTo(memStream);
-        memStream.Position = 0;
-        return memStream;
+            return true;
+        }
     }
 }

src/Sentry.Android.AssemblyReader/ZipUtils.cs

@@ -0,0 +1,13 @@
+namespace Sentry.Android.AssemblyReader;
+
+internal static class ZipUtils
+{
+    internal static MemoryStream Extract(this ZipArchiveEntry zipEntry)
+    {
+        var memStream = new MemoryStream((int)zipEntry.Length);
+        using var zipStream = zipEntry.Open();
+        zipStream.CopyTo(memStream);
+        memStream.Position = 0;
+        return memStream;
+    }
+}