Allow importing osz files / osk files from Downloads directory.

osu.Android/OsuGameActivity.cs

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
+using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
@@ -12,10 +14,12 @@ namespace osu.Android
 {
 
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
-    [IntentFilter(new[] { Intent.ActionDefault }, Categories = new[] { Intent.CategoryDefault, Intent.CategoryBrowsable, Intent.CategoryAppFiles }, DataSchemes = new[] { "content" }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
+    [IntentFilter(new[] { Intent.ActionDefault }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
     public class OsuGameActivity : AndroidGameActivity
     {
-        protected override Framework.Game CreateGame() => new OsuGameAndroid(this);
+        private OsuGameAndroid game;
+
+        protected override Framework.Game CreateGame() => game = new OsuGameAndroid(this);
 
         protected override void OnCreate(Bundle savedInstanceState)
         {
@@ -26,8 +30,23 @@ namespace osu.Android
 
             base.OnCreate(savedInstanceState);
 
+            OnNewIntent(Intent);
+
             Window.AddFlags(WindowManagerFlags.Fullscreen);
             Window.AddFlags(WindowManagerFlags.KeepScreenOn);
         }
+
+        protected override void OnNewIntent(Intent intent)
+        {
+            if (intent.Action == Intent.ActionView)
+            {
+                var filename = intent.Data.Path.Split('/').Last();
+                var stream = ContentResolver.OpenInputStream(intent.Data);
+                if (stream != null)
+                    // intent handler may run before the game has even loaded so we need to wait for the file importers to load before launching import
+                    game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, filename))); 
+            }
+            base.OnNewIntent(intent);
+        }
     }
 }

osu.Game/OsuGame.cs

@@ -267,7 +267,7 @@ namespace osu.Game
                 case LinkAction.OpenEditorTimestamp:
                 case LinkAction.JoinMultiplayerMatch:
                 case LinkAction.Spectate:
-                    waitForReady(() => notifications, _ => notifications.Post(new SimpleNotification
+                    WaitForReady(() => notifications, _ => notifications.Post(new SimpleNotification
                     {
                         Text = @"This link type is not yet supported!",
                         Icon = FontAwesome.Solid.LifeRing,
@@ -288,7 +288,7 @@ namespace osu.Game
             }
         });
 
-        public void OpenUrlExternally(string url) => waitForReady(() => externalLinkOpener, _ =>
+        public void OpenUrlExternally(string url) => WaitForReady(() => externalLinkOpener, _ =>
         {
             if (url.StartsWith('/'))
                 url = $"{API.Endpoint}{url}";
@@ -300,7 +300,7 @@ namespace osu.Game
         /// Open a specific channel in chat.
         /// </summary>
         /// <param name="channel">The channel to display.</param>
-        public void ShowChannel(string channel) => waitForReady(() => channelManager, _ =>
+        public void ShowChannel(string channel) => WaitForReady(() => channelManager, _ =>
         {
             try
             {
@@ -316,19 +316,19 @@ namespace osu.Game
         /// Show a beatmap set as an overlay.
         /// </summary>
         /// <param name="setId">The set to display.</param>
-        public void ShowBeatmapSet(int setId) => waitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmapSet(setId));
+        public void ShowBeatmapSet(int setId) => WaitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmapSet(setId));
 
         /// <summary>
         /// Show a user's profile as an overlay.
         /// </summary>
         /// <param name="userId">The user to display.</param>
-        public void ShowUser(int userId) => waitForReady(() => userProfile, _ => userProfile.ShowUser(userId));
+        public void ShowUser(int userId) => WaitForReady(() => userProfile, _ => userProfile.ShowUser(userId));
 
         /// <summary>
         /// Show a beatmap's set as an overlay, displaying the given beatmap.
         /// </summary>
         /// <param name="beatmapId">The beatmap to show.</param>
-        public void ShowBeatmap(int beatmapId) => waitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmap(beatmapId));
+        public void ShowBeatmap(int beatmapId) => WaitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmap(beatmapId));
 
         /// <summary>
         /// Present a beatmap at song select immediately.
@@ -483,13 +483,13 @@ namespace osu.Game
         /// <param name="retrieveInstance">A function to retrieve a (potentially not-yet-constructed) target instance.</param>
         /// <param name="action">The action to perform on the instance when load is confirmed.</param>
         /// <typeparam name="T">The type of the target instance.</typeparam>
-        private void waitForReady<T>(Func<T> retrieveInstance, Action<T> action)
+        public void WaitForReady<T>(Func<T> retrieveInstance, Action<T> action)
             where T : Drawable
         {
             var instance = retrieveInstance();
 
             if (ScreenStack == null || ScreenStack.CurrentScreen is StartupScreen || instance?.IsLoaded != true)
-                Schedule(() => waitForReady(retrieveInstance, action));
+                Schedule(() => WaitForReady(retrieveInstance, action));
             else
                 action(instance);
         }