From 371aecfca0856499cd0b014b4afab71f0bcd4b9f Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 18 Oct 2020 20:07:42 +0200
Subject: [PATCH] Fetch OsuGameActivity through DI instead.

---
 osu.Android/GameplayScreenRotationLocker.cs |  7 +++++--
 osu.Android/OsuGameActivity.cs              |  6 +-----
 osu.Android/OsuGameAndroid.cs               | 10 ++++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/osu.Android/GameplayScreenRotationLocker.cs b/osu.Android/GameplayScreenRotationLocker.cs
index d25e22a0c2..fb471ceb78 100644
--- a/osu.Android/GameplayScreenRotationLocker.cs
+++ b/osu.Android/GameplayScreenRotationLocker.cs
@@ -13,6 +13,9 @@ namespace osu.Android
     {
         private Bindable<bool> localUserPlaying;
 
+        [Resolved]
+        private OsuGameActivity gameActivity { get; set; }
+
         [BackgroundDependencyLoader]
         private void load(OsuGame game)
         {
@@ -22,9 +25,9 @@ namespace osu.Android
 
         private void updateLock(ValueChangedEvent<bool> userPlaying)
         {
-            OsuGameActivity.Activity.RunOnUiThread(() =>
+            gameActivity.RunOnUiThread(() =>
             {
-                OsuGameActivity.Activity.RequestedOrientation = userPlaying.NewValue ? ScreenOrientation.Locked : ScreenOrientation.FullUser;
+                gameActivity.RequestedOrientation = userPlaying.NewValue ? ScreenOrientation.Locked : ScreenOrientation.FullUser;
             });
         }
     }
diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index d4d2b83502..7e250dce0e 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -12,14 +12,10 @@ namespace osu.Android
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
     public class OsuGameActivity : AndroidGameActivity
     {
-        internal static Activity Activity { get; private set; }
-
-        protected override Framework.Game CreateGame() => new OsuGameAndroid();
+        protected override Framework.Game CreateGame() => new OsuGameAndroid(this);
 
         protected override void OnCreate(Bundle savedInstanceState)
         {
-            Activity = this;
-
             // The default current directory on android is '/'.
             // On some devices '/' maps to the app data directory. On others it maps to the root of the internal storage.
             // In order to have a consistent current directory on all devices the full path of the app data directory is set as the current directory.
diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 887a8395e3..21d6336b2c 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -4,6 +4,7 @@
 using System;
 using Android.App;
 using Android.OS;
+using osu.Framework.Allocation;
 using osu.Game;
 using osu.Game.Updater;
 
@@ -11,6 +12,15 @@ namespace osu.Android
 {
     public class OsuGameAndroid : OsuGame
     {
+        [Cached]
+        private readonly OsuGameActivity gameActivity;
+
+        public OsuGameAndroid(OsuGameActivity activity)
+            : base(null)
+        {
+            gameActivity = activity;
+        }
+
         public override Version AssemblyVersion
         {
             get