From ff692f2989c231ba91a9e3c9462a68fe9e2e5af2 Mon Sep 17 00:00:00 2001
From: YGOMod <admir_zuzic@hotmail.com>
Date: Mon, 30 Dec 2024 01:44:06 +0100
Subject: [PATCH] small code cleanups

---
 .../org/ryujinx/android/PerformanceManager.kt    |  7 ++++---
 .../org/ryujinx/android/PerformanceMonitor.kt    | 16 +++++++---------
 .../ryujinx/android/PhysicalControllerManager.kt |  8 ++++----
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/PerformanceManager.kt b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/PerformanceManager.kt
index daa2acc749b2..153c0d84ab8a 100644
--- a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/PerformanceManager.kt
+++ b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/PerformanceManager.kt
@@ -8,9 +8,10 @@ class PerformanceManager(private val activity: MainActivity) {
         fun force60HzRefreshRate(enable: Boolean, activity: MainActivity) {
             // Hack for MIUI devices since they don't support the standard Android APIs
             try {
-                val setFpsIntent = Intent("com.miui.powerkeeper.SET_ACTIVITY_FPS")
-                setFpsIntent.putExtra("package_name", "org.ryujinx.android")
-                setFpsIntent.putExtra("isEnter", enable)
+                val setFpsIntent = Intent("com.miui.powerkeeper.SET_ACTIVITY_FPS").apply {
+                    putExtra("package_name", "org.ryujinx.android")
+                    putExtra("isEnter", enable)
+                }
                 activity.sendBroadcast(setFpsIntent)
             } catch (_: Exception) {
             }
diff --git a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/PerformanceMonitor.kt b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/PerformanceMonitor.kt
index c0aaf05ee6d7..1b83e3479369 100644
--- a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/PerformanceMonitor.kt
+++ b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/PerformanceMonitor.kt
@@ -2,6 +2,7 @@ package org.ryujinx.android
 
 import android.app.ActivityManager
 import android.content.Context.ACTIVITY_SERVICE
+import android.util.Log
 import androidx.compose.runtime.MutableState
 import java.io.RandomAccessFile
 
@@ -10,18 +11,15 @@ class PerformanceMonitor {
 
     fun getFrequencies(frequencies: MutableList<Double>){
         frequencies.clear()
-        for (i in 0..<numberOfCores) {
+        for (i in 0 until numberOfCores) {
             var freq = 0.0
             try {
-                val reader = RandomAccessFile(
-                    "/sys/devices/system/cpu/cpu${i}/cpufreq/scaling_cur_freq",
-                    "r"
-                )
-                val f = reader.readLine()
-                reader.close()
-                freq = f.toDouble() / 1000.0
+                RandomAccessFile("/sys/devices/system/cpu/cpu${i}/cpufreq/scaling_cur_freq", "r").use { reader->
+                    val f = reader.readLine()
+                    freq = f.toDouble() / 1000.0
+                }
             } catch (e: Exception) {
-
+                Log.e("Performance Monitor", "Failed to read CPU freq", e);
             }
 
             frequencies.add(freq)
diff --git a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/PhysicalControllerManager.kt b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/PhysicalControllerManager.kt
index 3680c254d62f..e671551916ed 100644
--- a/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/PhysicalControllerManager.kt
+++ b/src/RyujinxAndroid/app/src/main/java/org/ryujinx/android/PhysicalControllerManager.kt
@@ -23,16 +23,16 @@ class PhysicalControllerManager(val activity: MainActivity) {
                     }
                 }
                 return true
-            } else if (!isNotFallback) {
+            } //else if (!isNotFallback) {
                 return true
-            }
+//            }
         }
 
         return false
     }
 
     fun onMotionEvent(ev: MotionEvent) {
-        if (true) {
+//        if (true) {
             if (ev.action == MotionEvent.ACTION_MOVE) {
                 val leftStickX = ev.getAxisValue(MotionEvent.AXIS_X)
                 val leftStickY = ev.getAxisValue(MotionEvent.AXIS_Y)
@@ -121,7 +121,7 @@ class PhysicalControllerManager(val activity: MainActivity) {
                     }
                 }
             }
-        }
+//        }
     }
 
     fun connect(): Int {