Merge pull request langerhans#22 from langerhans/bugfix/rp4crash

Fix crash on devices without vibration setting
t895 · Feb 11, 2024 · adafc16 · adafc16
2 parents 761978d + 0e0ddd0
commit adafc16
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # OdinTools
 Collection of utilities for the AYN Odin 2.
 
-Latest release: **[1.2.0](https://github.com/langerhans/OdinTools/releases/latest)**
+Latest release: **[1.2.1](https://github.com/langerhans/OdinTools/releases/latest)**
 
 ### Features
 #### App overrides

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -14,8 +14,8 @@ android {
         applicationId = "de.langerhans.odintools"
         minSdk = 33
         targetSdk = 34
-        versionCode = 8
-        versionName = "1.2.0"
+        versionCode = 9
+        versionName = "1.2.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/de/langerhans/odintools/main/MainActivity.kt b/app/src/main/java/de/langerhans/odintools/main/MainActivity.kt
@@ -24,6 +24,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import de.langerhans.odintools.R
 import de.langerhans.odintools.appsettings.AppOverrideListScreen
 import de.langerhans.odintools.appsettings.AppOverridesScreen
+import de.langerhans.odintools.tools.DeviceType.ODIN2
 import de.langerhans.odintools.ui.composables.*
 import de.langerhans.odintools.ui.theme.OdinToolsTheme
 
@@ -160,19 +161,21 @@ fun SettingsScreen(
             ) {
                 viewModel.updateSingleHomePreference(it)
             }
-            TriggerPreference(
-                icon = R.drawable.ic_gamepad,
-                title = R.string.m1Button,
-                description = R.string.remapButtonDescription
-            ) {
-                viewModel.remapButtonClicked("remap_custom_to_m1_value")
-            }
-            TriggerPreference(
-                icon = R.drawable.ic_gamepad,
-                title = R.string.m2Button,
-                description = R.string.remapButtonDescription
-            ) {
-                viewModel.remapButtonClicked("remap_custom_to_m2_value")
+            if (uiState.deviceType == ODIN2) {
+                TriggerPreference(
+                    icon = R.drawable.ic_gamepad,
+                    title = R.string.m1Button,
+                    description = R.string.remapButtonDescription
+                ) {
+                    viewModel.remapButtonClicked("remap_custom_to_m1_value")
+                }
+                TriggerPreference(
+                    icon = R.drawable.ic_gamepad,
+                    title = R.string.m2Button,
+                    description = R.string.remapButtonDescription
+                ) {
+                    viewModel.remapButtonClicked("remap_custom_to_m2_value")
+                }
             }
             SettingsHeader(name = R.string.display)
             TriggerPreference(
@@ -182,15 +185,17 @@ fun SettingsScreen(
             ) {
                 viewModel.saturationClicked()
             }
-            SettingsHeader(name = R.string.haptics)
-            SwitchableTriggerPreference(
-                icon = R.drawable.ic_vibration,
-                title = R.string.vibrationStrength,
-                description = R.string.vibrationStrengthDescription,
-                state = uiState.vibrationEnabled,
-                onClick = { viewModel.vibrationClicked() }
-            ) {
-                viewModel.updateVibrationPreference(it)
+            if (uiState.deviceType == ODIN2) {
+                SettingsHeader(name = R.string.haptics)
+                SwitchableTriggerPreference(
+                    icon = R.drawable.ic_vibration,
+                    title = R.string.vibrationStrength,
+                    description = R.string.vibrationStrengthDescription,
+                    state = uiState.vibrationEnabled,
+                    onClick = { viewModel.vibrationClicked() }
+                ) {
+                    viewModel.updateVibrationPreference(it)
+                }
             }
         }
     }

diff --git a/app/src/main/java/de/langerhans/odintools/main/MainUiModel.kt b/app/src/main/java/de/langerhans/odintools/main/MainUiModel.kt
@@ -4,8 +4,11 @@ import androidx.annotation.StringRes
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import de.langerhans.odintools.tools.DeviceType
+import de.langerhans.odintools.tools.DeviceType.ODIN2
 
 data class MainUiModel(
+    val deviceType: DeviceType = ODIN2,
     val deviceVersion: String = "",
     val showNotAnOdinDialog: Boolean = false,
     val showPServerNotAvailableDialog: Boolean = false,

diff --git a/app/src/main/java/de/langerhans/odintools/main/MainViewModel.kt b/app/src/main/java/de/langerhans/odintools/main/MainViewModel.kt
@@ -1,13 +1,14 @@
 package de.langerhans.odintools.main
 
+import android.view.KeyEvent
 import androidx.compose.runtime.toMutableStateList
 import androidx.lifecycle.ViewModel
-import android.view.KeyEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
 import de.langerhans.odintools.R
 import de.langerhans.odintools.data.SharedPrefsRepo
 import de.langerhans.odintools.models.ControllerStyle.*
 import de.langerhans.odintools.models.L2R2Style.*
+import de.langerhans.odintools.tools.DeviceType.ODIN2
 import de.langerhans.odintools.tools.DeviceUtils
 import de.langerhans.odintools.tools.ShellExecutor
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -38,15 +39,16 @@ class MainViewModel @Inject constructor(
         executor.enableA11yService()
         executor.grantAllAppsPermission()
 
-        val isOdin2 = deviceUtils.isOdin2()
+        val deviceType = deviceUtils.getDeviceType()
         val preventHomePressSetting = executor.getBooleanSystemSetting("prevent_press_home_accidentally", true)
         val vibrationOnSetting = executor.getBooleanSystemSetting("vibrate_on", true)
         val vibrationStrength = executor.getVibrationStrength()
 
         _uiState.update { _ ->
             MainUiModel(
+                deviceType = deviceType,
                 deviceVersion = deviceUtils.getDeviceVersion(),
-                showNotAnOdinDialog = !isOdin2,
+                showNotAnOdinDialog = deviceType != ODIN2,
                 singleHomeEnabled = !preventHomePressSetting,
                 showPServerNotAvailableDialog = !deviceUtils.isPServerAvailable(),
                 overrideDelayEnabled = prefs.overrideDelay,

diff --git a/app/src/main/java/de/langerhans/odintools/tools/DeviceUtils.kt b/app/src/main/java/de/langerhans/odintools/tools/DeviceUtils.kt
@@ -1,15 +1,29 @@
 package de.langerhans.odintools.tools
 
+import de.langerhans.odintools.tools.DeviceType.*
 import javax.inject.Inject
 
 class DeviceUtils @Inject constructor(
     private val shellExecutor: ShellExecutor
 ) {
-    fun isOdin2() = shellExecutor.executeAsRoot("getprop ro.vendor.retro.name").map { it == "Q9" }
-        .getOrDefault(false)
+
+    fun getDeviceType(): DeviceType {
+        val deviceName = shellExecutor.executeAsRoot("getprop ro.vendor.retro.name").getOrNull()
+        return when (deviceName) {
+            "Q9" -> ODIN2
+            "4.0", "4.0P" -> RP4
+            else -> OTHER
+        }
+    }
 
     fun isPServerAvailable() = shellExecutor.pServerAvailable
 
     fun getDeviceVersion() = shellExecutor.executeAsRoot("getprop ro.build.odin2.ota.version").map { it ?: "" }
         .getOrDefault("")
+}
+
+enum class DeviceType {
+    ODIN2,
+    RP4,
+    OTHER
 }
diff --git a/app/src/main/java/de/langerhans/odintools/tools/ShellExecutor.kt b/app/src/main/java/de/langerhans/odintools/tools/ShellExecutor.kt
@@ -87,7 +87,7 @@ class ShellExecutor @Inject constructor() {
         val defaultValue = 0
 
         return executeAsRoot("cat /d/haptics/user_vmax_mv")
-            .map { it?.toInt() ?: defaultValue }
+            .mapCatching { it?.toInt() ?: defaultValue } // This throws on RP4 because it has no rumble
             .getOrDefault(defaultValue)
     }