From 469782292c096400eaba89ac34fca9d28dc5d5e7 Mon Sep 17 00:00:00 2001 From: Simonx22 Date: Sun, 9 Nov 2025 19:44:03 -0500 Subject: [PATCH] Android: Convert DolphinApplication to Kotlin --- .../dolphinemu/DolphinApplication.java | 45 ------------------- .../dolphinemu/DolphinApplication.kt | 43 ++++++++++++++++++ 2 files changed, 43 insertions(+), 45 deletions(-) delete mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.java create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.kt diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.java deleted file mode 100644 index 7978a1165e8..00000000000 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.java +++ /dev/null @@ -1,45 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later - -package org.dolphinemu.dolphinemu; - -import android.app.Activity; -import android.app.Application; -import android.content.Context; -import android.hardware.usb.UsbManager; - -import org.dolphinemu.dolphinemu.utils.ActivityTracker; -import org.dolphinemu.dolphinemu.utils.DirectoryInitialization; -import org.dolphinemu.dolphinemu.utils.GCAdapter; -import org.dolphinemu.dolphinemu.utils.WiimoteAdapter; - -public class DolphinApplication extends Application -{ - private static DolphinApplication application; - private static ActivityTracker sActivityTracker; - - @Override - public void onCreate() - { - super.onCreate(); - application = this; - sActivityTracker = new ActivityTracker(); - registerActivityLifecycleCallbacks(sActivityTracker); - System.loadLibrary("main"); - - GCAdapter.manager = (UsbManager) getSystemService(Context.USB_SERVICE); - WiimoteAdapter.manager = (UsbManager) getSystemService(Context.USB_SERVICE); - - if (DirectoryInitialization.shouldStart(getApplicationContext())) - DirectoryInitialization.start(getApplicationContext()); - } - - public static Context getAppContext() - { - return application.getApplicationContext(); - } - - public static Activity getAppActivity() - { - return sActivityTracker.getCurrentActivity(); - } -} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.kt new file mode 100644 index 00000000000..6b7596fa214 --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.kt @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +package org.dolphinemu.dolphinemu + +import android.app.Activity +import android.app.Application +import android.content.Context +import android.hardware.usb.UsbManager +import org.dolphinemu.dolphinemu.utils.ActivityTracker +import org.dolphinemu.dolphinemu.utils.DirectoryInitialization +import org.dolphinemu.dolphinemu.utils.GCAdapter +import org.dolphinemu.dolphinemu.utils.WiimoteAdapter + +class DolphinApplication : Application() { + private val activityTracker = ActivityTracker() + + override fun onCreate() { + super.onCreate() + instance = this + registerActivityLifecycleCallbacks(activityTracker) + System.loadLibrary("main") + + val usbManager = getSystemService(USB_SERVICE) as UsbManager + GCAdapter.manager = usbManager + WiimoteAdapter.manager = usbManager + + if (DirectoryInitialization.shouldStart(applicationContext)) { + DirectoryInitialization.start(applicationContext) + } + } + + companion object { + @JvmStatic + lateinit var instance: DolphinApplication + private set + + @JvmStatic + fun getAppContext(): Context = instance.applicationContext + + @JvmStatic + fun getAppActivity(): Activity? = instance.activityTracker.currentActivity + } +}