Simplify support fallbacks

app/src/main/java/se/ajpanton/navbuttons/ForegroundAppSupport.kt

@@ -66,14 +66,7 @@ private fun packageNameFromComponent(component: Any?): String? {
 }
 
 private fun packageNameFromActivityInfo(info: Any?): String? {
-    if (info == null) {
+    return getFieldValue(info, "packageName")?.toString()
-        return null
-    }
-    return try {
-        findField(info.javaClass, "packageName").get(info)?.toString()
-    } catch (_: Throwable) {
-        null
-    }
 }
 
 internal fun shouldSkipForegroundPackage(packageName: String?, defaultLauncher: String?): Boolean {

app/src/main/java/se/ajpanton/navbuttons/InputInjectionSupport.kt

@@ -21,15 +21,8 @@ internal fun sendInjectedKeyPress(context: Context?, keyCode: Int, log: (String)
 
 internal fun inputManagerForInjection(context: Context?): Any? {
     context?.getSystemService(Context.INPUT_SERVICE)?.let { return it }
-
+    return listOf(INPUT_MANAGER_CLASS, INPUT_MANAGER_GLOBAL_CLASS).firstNotNullOfOrNull { className ->
-    return try {
+        runCatching { callStaticMethod(findClass(className, null), "getInstance") }.getOrNull()
-        callStaticMethod(findClass(INPUT_MANAGER_CLASS, null), "getInstance")
-    } catch (_: Throwable) {
-        try {
-            callStaticMethod(findClass(INPUT_MANAGER_GLOBAL_CLASS, null), "getInstance")
-        } catch (_: Throwable) {
-            null
-        }
     }
 }