fix: root library detection & re-enable error screen

Author: timschneeb

app/src/main/java/me/timschneeberger/rootlessjamesdsp/MainApplication.kt

@@ -100,6 +100,8 @@ open class MainApplication : Application(), SharedPreferences.OnSharedPreference
     }
 
     override fun onCreate() {
+        instance = this
+
         Timber.plant(DebugTree())
 
         if(BuildConfig.DEBUG) {
@@ -280,7 +282,7 @@ open class MainApplication : Application(), SharedPreferences.OnSharedPreference
         Pluto.showNotch(true)
 
         PlutoExceptions.setANRHandler { thread, exception ->
-            Timber.e("unhandled ANR handled on thread: " + thread.name, exception)
+            Timber.e(exception, "unhandled ANR handled on thread: %s", thread.name)
         }
 
         PlutoRoomsDBWatcher.watch("blocked_apps.db", AppBlocklistDatabase::class.java)
@@ -305,4 +307,10 @@ open class MainApplication : Application(), SharedPreferences.OnSharedPreference
             t?.takeIf { priority >= Log.WARN }?.let(CrashlyticsImpl::recordException)
         }
     }
+
+
+    companion object {
+        lateinit var instance: MainApplication
+            private set
+    }
 }

app/src/main/java/me/timschneeberger/rootlessjamesdsp/interop/JamesDspRemoteEngine.kt

@@ -6,6 +6,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.media.audiofx.AudioEffect
 import android.media.audiofx.AudioEffectHidden
+import me.timschneeberger.rootlessjamesdsp.MainApplication
 import me.timschneeberger.rootlessjamesdsp.interop.structure.EelVmVariable
 import me.timschneeberger.rootlessjamesdsp.utils.Constants
 import me.timschneeberger.rootlessjamesdsp.utils.extensions.AudioEffectExtensions.getParameterInt
@@ -14,6 +15,7 @@ import me.timschneeberger.rootlessjamesdsp.utils.extensions.AudioEffectExtension
 import me.timschneeberger.rootlessjamesdsp.utils.extensions.AudioEffectExtensions.setParameterFloatArray
 import me.timschneeberger.rootlessjamesdsp.utils.extensions.AudioEffectExtensions.setParameterImpulseResponseBuffer
 import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.registerLocalReceiver
+import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.showAlert
 import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.toast
 import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.unregisterLocalReceiver
 import me.timschneeberger.rootlessjamesdsp.utils.extensions.crc
@@ -300,26 +302,22 @@ class JamesDspRemoteEngine(
         private val EFFECT_JAMESDSP = UUID.fromString("f27317f4-c984-4de6-9a90-545759495bf2")
 
         fun isPluginInstalled(): PluginState {
-            return PluginState.Available
-
-            // TODO This method doesn't seem to work with new AIDL jamesdsp lib patch; investigate using emulator
             return try {
                 AudioEffect
                     .queryEffects()
                     .orEmpty()
-                    .filter { it.uuid == EFFECT_JAMESDSP }
-                    .firstOrNull { it.name.contains("JamesDSP") }
-                    .let {
-                        if(it == null)
-                            PluginState.Unavailable
-                        else if(it.name.contains("v3"))
-                            PluginState.Unsupported
-                        else
-                            PluginState.Available
-                    }
+                    .firstOrNull { it.uuid == EFFECT_JAMESDSP }
+                    ?.run {
+                        if(name.contains("v3")) PluginState.Unsupported else PluginState.Available
+                    } ?: PluginState.Unavailable
             } catch (e: Exception) {
                 Timber.e("isPluginInstalled: exception raised")
                 Timber.e(e)
+                MainApplication.instance.showAlert(
+                    "Error while checking audio effect status",
+                    "Unexpected error while checking whether JamesDSP's audio effect library is installed. \n\n" +
+                            "Error: $e",
+                )
                 PluginState.Unavailable
             }
         }