Skip to content

Commit 87102ab

Browse files
authored
fix: replace type cast of null subscriptions with empty list
1 parent c712988 commit 87102ab

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

  • app/src/main/java/dev/bluehouse/enablevolte

app/src/main/java/dev/bluehouse/enablevolte/Moder.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class CarrierModer(
9999
get() {
100100
val sub = this.loadCachedInterface { sub }
101101
try {
102-
return sub.getActiveSubscriptionInfoList(null, null, true)
102+
return sub.getActiveSubscriptionInfoList(null, null, true) ?: emptyList()
103103
} catch (e: NoSuchMethodError) {}
104104
return try {
105105
val getActiveSubscriptionInfoListMethod =
@@ -108,14 +108,14 @@ class CarrierModer(
108108
String::class.java,
109109
String::class.java,
110110
)
111-
(getActiveSubscriptionInfoListMethod.invoke(sub, null, null) as List<SubscriptionInfo>)
111+
(getActiveSubscriptionInfoListMethod.invoke(sub, null, null) as? List<SubscriptionInfo>) ?: emptyList()
112112
} catch (e: NoSuchMethodException) {
113113
val getActiveSubscriptionInfoListMethod =
114114
sub.javaClass.getMethod(
115115
"getActiveSubscriptionInfoList",
116116
String::class.java,
117117
)
118-
(getActiveSubscriptionInfoListMethod.invoke(sub, null) as List<SubscriptionInfo>)
118+
(getActiveSubscriptionInfoListMethod.invoke(sub, null) as? List<SubscriptionInfo>) ?: emptyList()
119119
}
120120
}
121121

0 commit comments

Comments
 (0)