catch correct exception

kyujin-cho · Jan 20, 2024 · 0f8fd2c · 0f8fd2c
1 parent fd6feee
commit 0f8fd2c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/dev/bluehouse/enablevolte/Moder.kt b/app/src/main/java/dev/bluehouse/enablevolte/Moder.kt
@@ -81,17 +81,17 @@ class CarrierModer(private val context: Context) : Moder() {
     val subscriptions: List<SubscriptionInfo>
         get() {
             val sub = this.loadCachedInterface { sub }
-            try {
-                return sub.getActiveSubscriptionInfoList(null, null)
-            } catch (e: IllegalArgumentException) {
+            return try {
+                sub.getActiveSubscriptionInfoList(null, null)
+            } catch (e: NoSuchMethodError) {
+                // FIXME: lift up reflect as soon as official source code releases
                 val getActiveSubscriptionInfoListMethod = sub.javaClass.getMethod(
-                    "getActiveSubscriptionInfoListMethod",
-                    String.Companion::class.java,
-                    String.Companion::class.java,
-                    Boolean.Companion::class.java,
+                    "getActiveSubscriptionInfoList",
+                    String::class.java,
+                    String::class.java,
+                    Boolean::class.java,
                 )
-                // FIXME: lift up reflect as soon as official source code releases
-                return (getActiveSubscriptionInfoListMethod.invoke(sub, null, null, null) as List<SubscriptionInfo>)
+                (getActiveSubscriptionInfoListMethod.invoke(sub, null, null, false) as List<SubscriptionInfo>)
             }
         }