diff options
Diffstat (limited to 'src/android/app/src/main/java')
4 files changed, 0 insertions, 108 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt index d114bd53d..76778c10a 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt @@ -17,17 +17,6 @@ fun Context.getPublicFilesDir(): File = getExternalFilesDir(null) ?: filesDir class YuzuApplication : Application() { private fun createNotificationChannels() { - val emulationChannel = NotificationChannel( - getString(R.string.emulation_notification_channel_id), - getString(R.string.emulation_notification_channel_name), - NotificationManager.IMPORTANCE_LOW - ) - emulationChannel.description = getString( - R.string.emulation_notification_channel_description - ) - emulationChannel.setSound(null, null) - emulationChannel.vibrationPattern = null - val noticeChannel = NotificationChannel( getString(R.string.notice_notification_channel_id), getString(R.string.notice_notification_channel_name), @@ -39,7 +28,6 @@ class YuzuApplication : Application() { // Register the channel with the system; you can't change the importance // or other notification behaviors after this val notificationManager = getSystemService(NotificationManager::class.java) - notificationManager.createNotificationChannel(emulationChannel) notificationManager.createNotificationChannel(noticeChannel) } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt index 564aaf305..7a8d03610 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt @@ -4,7 +4,6 @@ package org.yuzu.yuzu_emu.activities import android.annotation.SuppressLint -import android.app.Activity import android.app.PendingIntent import android.app.PictureInPictureParams import android.app.RemoteAction @@ -45,7 +44,6 @@ import org.yuzu.yuzu_emu.features.settings.model.IntSetting import org.yuzu.yuzu_emu.features.settings.model.Settings import org.yuzu.yuzu_emu.model.EmulationViewModel import org.yuzu.yuzu_emu.model.Game -import org.yuzu.yuzu_emu.utils.ForegroundService import org.yuzu.yuzu_emu.utils.InputHandler import org.yuzu.yuzu_emu.utils.Log import org.yuzu.yuzu_emu.utils.MemoryUtil @@ -74,11 +72,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener { private val emulationViewModel: EmulationViewModel by viewModels() - override fun onDestroy() { - stopForegroundService(this) - super.onDestroy() - } - override fun onCreate(savedInstanceState: Bundle?) { Log.gameLaunched = true ThemeHelper.setTheme(this) @@ -125,10 +118,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener { .apply() } } - - // Start a foreground service to prevent the app from getting killed in the background - val startIntent = Intent(this, ForegroundService::class.java) - startForegroundService(startIntent) } override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean { @@ -481,12 +470,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener { activity.startActivity(launcher) } - fun stopForegroundService(activity: Activity) { - val startIntent = Intent(activity, ForegroundService::class.java) - startIntent.action = ForegroundService.ACTION_STOP - activity.startForegroundService(startIntent) - } - private fun areCoordinatesOutside(view: View?, x: Float, y: Float): Boolean { if (view == null) { return true diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt index b3967d294..4df4ac4c6 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt @@ -34,7 +34,6 @@ import kotlinx.coroutines.launch import org.yuzu.yuzu_emu.HomeNavigationDirections import org.yuzu.yuzu_emu.NativeLibrary import org.yuzu.yuzu_emu.R -import org.yuzu.yuzu_emu.activities.EmulationActivity import org.yuzu.yuzu_emu.databinding.ActivityMainBinding import org.yuzu.yuzu_emu.features.settings.model.Settings import org.yuzu.yuzu_emu.fragments.AddGameFolderDialogFragment @@ -177,9 +176,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider { } } - // Dismiss previous notifications (should not happen unless a crash occurred) - EmulationActivity.stopForegroundService(this) - setInsets() } @@ -298,11 +294,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider { super.onResume() } - override fun onDestroy() { - EmulationActivity.stopForegroundService(this) - super.onDestroy() - } - private fun setInsets() = ViewCompat.setOnApplyWindowInsetsListener( binding.root diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ForegroundService.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ForegroundService.kt deleted file mode 100644 index 086d17606..000000000 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ForegroundService.kt +++ /dev/null @@ -1,70 +0,0 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -package org.yuzu.yuzu_emu.utils - -import android.app.PendingIntent -import android.app.Service -import android.content.Intent -import android.os.IBinder -import androidx.core.app.NotificationCompat -import androidx.core.app.NotificationManagerCompat -import org.yuzu.yuzu_emu.R -import org.yuzu.yuzu_emu.activities.EmulationActivity - -/** - * A service that shows a permanent notification in the background to avoid the app getting - * cleared from memory by the system. - */ -class ForegroundService : Service() { - companion object { - const val EMULATION_RUNNING_NOTIFICATION = 0x1000 - - const val ACTION_STOP = "stop" - } - - private fun showRunningNotification() { - // Intent is used to resume emulation if the notification is clicked - val contentIntent = PendingIntent.getActivity( - this, - 0, - Intent(this, EmulationActivity::class.java), - PendingIntent.FLAG_IMMUTABLE - ) - val builder = - NotificationCompat.Builder(this, getString(R.string.emulation_notification_channel_id)) - .setSmallIcon(R.drawable.ic_stat_notification_logo) - .setContentTitle(getString(R.string.app_name)) - .setContentText(getString(R.string.emulation_notification_running)) - .setPriority(NotificationCompat.PRIORITY_LOW) - .setOngoing(true) - .setVibrate(null) - .setSound(null) - .setContentIntent(contentIntent) - startForeground(EMULATION_RUNNING_NOTIFICATION, builder.build()) - } - - override fun onBind(intent: Intent): IBinder? { - return null - } - - override fun onCreate() { - showRunningNotification() - } - - override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { - if (intent == null) { - return START_NOT_STICKY - } - if (intent.action == ACTION_STOP) { - NotificationManagerCompat.from(this).cancel(EMULATION_RUNNING_NOTIFICATION) - stopForeground(STOP_FOREGROUND_REMOVE) - stopSelfResult(startId) - } - return START_STICKY - } - - override fun onDestroy() { - NotificationManagerCompat.from(this).cancel(EMULATION_RUNNING_NOTIFICATION) - } -} |