Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix nullref when opening files or URIs on startup on Android #31492

Merged
merged 2 commits into from
Jan 14, 2025
Merged

Fix nullref when opening files or URIs on startup on Android #31492

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76e0958
Fix possible nullref in `handleIntent()`
Susko3 Jan 12, 2025
b0339a9
Create game as soon as possible
Susko3 Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 36 additions & 10 deletions osu.Android/OsuGameActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
using Android.OS;
using Android.Views;
using osu.Framework.Android;
using osu.Framework.Extensions.ObjectExtensions;
using osu.Game.Database;
using Debug = System.Diagnostics.Debug;
using Uri = Android.Net.Uri;
Expand Down Expand Up @@ -50,9 +49,23 @@ public class OsuGameActivity : AndroidGameActivity
/// <remarks>Adjusted on startup to match expected UX for the current device type (phone/tablet).</remarks>
public ScreenOrientation DefaultOrientation = ScreenOrientation.Unspecified;

private OsuGameAndroid game = null!;
private readonly OsuGameAndroid game;

protected override Framework.Game CreateGame() => game = new OsuGameAndroid(this);
private bool gameCreated;

protected override Framework.Game CreateGame()
{
if (gameCreated)
throw new InvalidOperationException("Framework tried to create a game twice.");

gameCreated = true;
return game;
}

public OsuGameActivity()
{
game = new OsuGameAndroid(this);
}

protected override void OnCreate(Bundle? savedInstanceState)
{
Expand Down Expand Up @@ -95,25 +108,38 @@ protected override void OnCreate(Bundle? savedInstanceState)

private void handleIntent(Intent? intent)
{
switch (intent?.Action)
if (intent == null)
return;

switch (intent.Action)
{
case Intent.ActionDefault:
if (intent.Scheme == ContentResolver.SchemeContent)
handleImportFromUris(intent.Data.AsNonNull());
{
if (intent.Data != null)
handleImportFromUris(intent.Data);
}
else if (osu_url_schemes.Contains(intent.Scheme))
game.HandleLink(intent.DataString);
{
if (intent.DataString != null)
game.HandleLink(intent.DataString);
}

break;

case Intent.ActionSend:
case Intent.ActionSendMultiple:
{
if (intent.ClipData == null)
break;

var uris = new List<Uri>();

for (int i = 0; i < intent.ClipData?.ItemCount; i++)
for (int i = 0; i < intent.ClipData.ItemCount; i++)
{
var content = intent.ClipData?.GetItemAt(i);
if (content != null)
uris.Add(content.Uri.AsNonNull());
var item = intent.ClipData.GetItemAt(i);
if (item?.Uri != null)
uris.Add(item.Uri);
}

handleImportFromUris(uris.ToArray());
Expand Down
Loading