Fix APK signing: narrow FixRuntimePackAssetTypes to .so files only, add apksigner safety net, fix DiscardScreen merge conflict

Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/4f02e4a3-e88b-422b-9009-a7eb331ff567

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>

Author: Copilot

.github/workflows/release.yml

@@ -148,6 +148,55 @@ jobs:
           echo "Found APK: $APK ($APK_SIZE_MB MB)"
           echo "apk_path=$APK" >> "$GITHUB_OUTPUT"
 
+      # .NET 10 Android SDK may skip debug-signing for Release publish builds.
+      # Verify the APK is signed; if not, sign it with apksigner using the debug
+      # keystore so the APK can be sideloaded without INSTALL_PARSE_FAILED_NO_CERTIFICATES.
+      - name: Verify and sign APK if needed
+        run: |
+          APK="${{ steps.find_apk.outputs.apk_path }}"
+          APKSIGNER="$ANDROID_HOME/build-tools/$(ls "$ANDROID_HOME/build-tools" | sort -V | tail -1)/apksigner"
+          ZIPALIGN="$ANDROID_HOME/build-tools/$(ls "$ANDROID_HOME/build-tools" | sort -V | tail -1)/zipalign"
+
+          if "$APKSIGNER" verify "$APK" 2>/dev/null; then
+            echo "APK is already signed ✓"
+          else
+            echo "::warning::APK is not signed. Signing with debug keystore..."
+
+            # Generate debug keystore if it doesn't exist
+            DEBUG_KS="$HOME/.android/debug.keystore"
+            if [ ! -f "$DEBUG_KS" ]; then
+              mkdir -p "$HOME/.android"
+              keytool -genkeypair -v \
+                -keystore "$DEBUG_KS" \
+                -storepass android \
+                -keypass android \
+                -alias androiddebugkey \
+                -keyalg RSA -keysize 2048 -validity 10000 \
+                -dname "CN=Android Debug,O=Android,C=US"
+            fi
+
+            # Zipalign first (required before apksigner v2 signing)
+            ALIGNED_APK="${APK%.apk}-aligned.apk"
+            "$ZIPALIGN" -f -p 4 "$APK" "$ALIGNED_APK"
+            mv "$ALIGNED_APK" "$APK"
+
+            # Sign with debug keystore (v1 + v2 + v3 schemes)
+            "$APKSIGNER" sign \
+              --ks "$DEBUG_KS" \
+              --ks-pass pass:android \
+              --key-pass pass:android \
+              --ks-key-alias androiddebugkey \
+              "$APK"
+
+            # Verify signature
+            if "$APKSIGNER" verify --print-certs "$APK"; then
+              echo "APK signed successfully ✓"
+            else
+              echo "::error::APK signing failed"
+              exit 1
+            fi
+          fi
+
       - name: Upload APK artifact
         uses: actions/upload-artifact@v7
         with:

osu.Android.props

@@ -77,19 +77,18 @@
     <DisableFody>true</DisableFody>
   </PropertyGroup>
 
-  <!-- Fix for .NET 10 Android AOT misclassifying non-managed assets in runtime pack.
-       This is critical for Android 16 (API 36) Release/AOT builds where the linker expects
-       all non-managed assets to be marked as native before the optimization/signing phases.
-       Scoped to Release only — running this during Debug builds can interfere with how the
-       Android SDK classifies signing-related items, leading to APKs with null certificate
-       arrays (INSTALL_PARSE_FAILED_NO_CERTIFICATES). -->
+  <!-- Fix for .NET 10 Android AOT misclassifying native .so assets in runtime pack.
+       Only .so files need the AssetType override — the previous broader filter
+       (all non-DLL, non-PDB) incorrectly reclassified signing metadata and config
+       files, which corrupted the APK signature (INSTALL_PARSE_FAILED_NO_CERTIFICATES).
+       Scoped to Release only to avoid interfering with Debug builds. -->
   <Target Name="FixRuntimePackAssetTypes" AfterTargets="ResolveRuntimePackAssets;ComputeFilesToPublish;ComputeResolvedFilesToPublishList"
           Condition="'$(Configuration)' == 'Release'">
     <ItemGroup>
-      <RuntimePackAsset Update="@(RuntimePackAsset)" Condition="'%(Extension)' != '.dll' AND '%(Extension)' != '.pdb'">
+      <RuntimePackAsset Update="@(RuntimePackAsset)" Condition="'%(Extension)' == '.so'">
         <AssetType>native</AssetType>
       </RuntimePackAsset>
-      <ResolvedFileToPublish Update="@(ResolvedFileToPublish)" Condition="'%(Extension)' != '.dll' AND '%(Extension)' != '.pdb'">
+      <ResolvedFileToPublish Update="@(ResolvedFileToPublish)" Condition="'%(Extension)' == '.so'">
         <AssetType>native</AssetType>
       </ResolvedFileToPublish>
     </ItemGroup>

osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/DiscardScreen.cs

@@ -49,6 +49,12 @@ public partial class DiscardScreen : RankedPlaySubScreen
 
         private const int card_play_samples = 2;
         private Sample?[]? cardPlaySamples;
+
+        /// <summary>
+        /// Whether the local user has discarded cards.
+        /// </summary>
+        private bool hasDiscardedCards;
+
         private Sample? timeRunningOutSample;
         private SampleChannel? timeRunningOutSampleChannel;
 
@@ -147,13 +153,10 @@ protected override void LoadComplete()
         }
 
         private bool shouldPlayWarningSample
-        {
-            get => matchInfo.Stage.Value == RankedPlayStage.CardDiscard
-                   && stageDuration > TimeSpan.FromSeconds(warning_time_threshold)
-                   && stageEndTime - DateTimeOffset.Now < TimeSpan.FromSeconds(warning_time_threshold)
-                   && !field;
-            set;
-        }
+            => matchInfo.Stage.Value == RankedPlayStage.CardDiscard
+               && stageDuration > TimeSpan.FromSeconds(warning_time_threshold)
+               && stageEndTime - DateTimeOffset.Now < TimeSpan.FromSeconds(warning_time_threshold)
+               && !hasDiscardedCards;
 
         protected override void Update()
         {