Merge pull request #100 from winnerspiros/copilot/fix-android-startup-crash

Fix Android startup crash: null safety, API level guards, safe defaults

Author: winnerspiros

osu.Android/Native/OboeAudioBridge.cs

@@ -23,7 +23,15 @@ public sealed class OboeAudioBridge : IDisposable
 
         static OboeAudioBridge()
         {
-            native_loaded = NativeLibrary.TryLoad(lib_name, typeof(OboeAudioBridge).Assembly, null, out _);
+            try
+            {
+                native_loaded = NativeLibrary.TryLoad(lib_name, typeof(OboeAudioBridge).Assembly, null, out _);
+            }
+            catch (Exception e)
+            {
+                Debug.WriteLine($"[osu!] Failed to probe native library for Oboe: {e.Message}");
+                native_loaded = false;
+            }
 
             if (!native_loaded)
                 Debug.WriteLine("[osu!] Native library not found, Oboe unavailable");

osu.Android/Native/VulkanProbe.cs

@@ -23,7 +23,15 @@ public sealed class VulkanProbe : IDisposable
 
         static VulkanProbe()
         {
-            native_loaded = NativeLibrary.TryLoad(lib_name, typeof(VulkanProbe).Assembly, null, out _);
+            try
+            {
+                native_loaded = NativeLibrary.TryLoad(lib_name, typeof(VulkanProbe).Assembly, null, out _);
+            }
+            catch (Exception e)
+            {
+                Debug.WriteLine($"[osu!] Failed to probe native library for Vulkan: {e.Message}");
+                native_loaded = false;
+            }
 
             if (!native_loaded)
                 Debug.WriteLine("[osu!] Native library not found, Vulkan probe unavailable");

osu.Android/OsuGameActivity.cs

@@ -75,8 +75,9 @@ protected override void OnStart()
 
             try
             {
-                // Request unbuffered touch dispatch for lower input latency during gameplay.
-                Window?.DecorView?.RequestUnbufferedDispatch((int)InputSourceType.Touchscreen);
+                // RequestUnbufferedDispatch(int sourceClass) requires API 31+.
+                if (OperatingSystem.IsAndroidVersionAtLeast(31))
+                    Window?.DecorView?.RequestUnbufferedDispatch((int)InputSourceType.Touchscreen);
             }
             catch (Exception e)
             {

osu.Android/OsuGameAndroid.cs

@@ -10,7 +10,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Development;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Platform;
 using osu.Game;
 using osu.Game.Configuration;
@@ -27,7 +26,7 @@ public partial class OsuGameAndroid : OsuGame
         [Cached]
         private readonly OsuGameActivity gameActivity;
 
-        private readonly PackageInfo packageInfo;
+        private readonly PackageInfo? packageInfo;
 
         public override Vector2 ScalingContainerTargetDrawSize => new Vector2(1024, 1024 * DrawHeight / DrawWidth);
 
@@ -43,7 +42,16 @@ public OsuGameAndroid(OsuGameActivity activity)
             : base(null)
         {
             gameActivity = activity;
-            packageInfo = Application.Context.ApplicationContext!.PackageManager!.GetPackageInfo(Application.Context.ApplicationContext.PackageName!, 0).AsNonNull();
+
+            try
+            {
+                packageInfo = Application.Context.ApplicationContext!.PackageManager!.GetPackageInfo(Application.Context.ApplicationContext.PackageName!, 0);
+            }
+            catch (Exception e)
+            {
+                Debug.WriteLine($"[osu!] Failed to retrieve package info: {e.Message}");
+                packageInfo = null;
+            }
         }
 
         public override string Version
@@ -53,11 +61,29 @@ public override string Version
                 if (!IsDeployedBuild)
                     return @"local " + (DebugUtils.IsDebugBuild ? @"debug" : @"release");
 
-                return packageInfo.VersionName.AsNonNull();
+                return packageInfo?.VersionName ?? @"unknown";
             }
         }
 
-        public override Version AssemblyVersion => new Version(packageInfo.VersionName.AsNonNull().Split('-').First());
+        public override Version AssemblyVersion
+        {
+            get
+            {
+                try
+                {
+                    string? versionName = packageInfo?.VersionName;
+
+                    if (!string.IsNullOrEmpty(versionName))
+                        return new Version(versionName.Split('-').First());
+                }
+                catch (Exception e)
+                {
+                    Debug.WriteLine($"[osu!] Failed to parse assembly version: {e.Message}");
+                }
+
+                return new Version(@"0.0.0");
+            }
+        }
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
@@ -247,24 +273,31 @@ private void updateOrientation()
         {
             gameActivity.RunOnUiThread(() =>
             {
-                if (ScreenStack.CurrentScreen is not IOsuScreen currentScreen)
-                    return;
+                try
+                {
+                    if (ScreenStack.CurrentScreen is not IOsuScreen currentScreen)
+                        return;
 
-                var orientation = MobileUtils.GetOrientation(this, currentScreen, gameActivity.IsTablet);
+                    var orientation = MobileUtils.GetOrientation(this, currentScreen, gameActivity.IsTablet);
 
-                switch (orientation)
-                {
-                    case MobileUtils.Orientation.Locked:
-                        gameActivity.RequestedOrientation = ScreenOrientation.Locked;
-                        break;
+                    switch (orientation)
+                    {
+                        case MobileUtils.Orientation.Locked:
+                            gameActivity.RequestedOrientation = ScreenOrientation.Locked;
+                            break;
 
-                    case MobileUtils.Orientation.Portrait:
-                        gameActivity.RequestedOrientation = ScreenOrientation.Portrait;
-                        break;
+                        case MobileUtils.Orientation.Portrait:
+                            gameActivity.RequestedOrientation = ScreenOrientation.Portrait;
+                            break;
 
-                    case MobileUtils.Orientation.Default:
-                        gameActivity.RequestedOrientation = gameActivity.DefaultOrientation;
-                        break;
+                        case MobileUtils.Orientation.Default:
+                            gameActivity.RequestedOrientation = gameActivity.DefaultOrientation;
+                            break;
+                    }
+                }
+                catch (Exception e)
+                {
+                    Debug.WriteLine($"[osu!] Failed to update orientation: {e.Message}");
                 }
             });
         }

osu.Game/Configuration/OsuConfigManager.cs

@@ -238,7 +238,7 @@ protected override void InitialiseDefaults()
 
             SetDefault(OsuSetting.DashboardSortMode, UserSortCriteria.LastVisit);
             SetDefault(OsuSetting.DashboardDisplayStyle, OverlayPanelDisplayStyle.Card);
-            SetDefault(OsuSetting.AndroidPerformanceMode, true);
+            SetDefault(OsuSetting.AndroidPerformanceMode, false);
             SetDefault(OsuSetting.AndroidLowLatencyAudio, false);
             SetDefault(OsuSetting.AndroidVulkanProbe, false);
         }