mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-18 03:48:52 +01:00
Remove obsolete checks for API 23
This commit is contained in:
@@ -22,7 +22,6 @@ import android.annotation.TargetApi
|
||||
import android.os.Build
|
||||
import android.telephony.SubscriptionInfo
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1)
|
||||
data class SubscriptionInfoCompat(private val subscriptionInfo: SubscriptionInfo) {
|
||||
|
||||
val subscriptionId get() = subscriptionInfo.subscriptionId
|
||||
|
||||
@@ -31,36 +31,29 @@ class SubscriptionManagerCompat @Inject constructor(context: Context, private va
|
||||
|
||||
val activeSubscriptionInfoList: List<SubscriptionInfoCompat>
|
||||
get() {
|
||||
return if (Build.VERSION.SDK_INT >= 22) {
|
||||
subscriptionManager?.activeSubscriptionInfoList?.map { SubscriptionInfoCompat(it) } ?: listOf()
|
||||
} else listOf()
|
||||
return subscriptionManager?.activeSubscriptionInfoList?.map { SubscriptionInfoCompat(it) } ?: listOf()
|
||||
}
|
||||
|
||||
init {
|
||||
subscriptionManager = if (Build.VERSION.SDK_INT >= 22) SubscriptionManager.from(context) else null
|
||||
subscriptionManager = SubscriptionManager.from(context)
|
||||
}
|
||||
|
||||
fun addOnSubscriptionsChangedListener(listener: OnSubscriptionsChangedListener) {
|
||||
if (Build.VERSION.SDK_INT >= 22) {
|
||||
subscriptionManager?.addOnSubscriptionsChangedListener(listener.listener)
|
||||
}
|
||||
subscriptionManager?.addOnSubscriptionsChangedListener(listener.listener)
|
||||
}
|
||||
|
||||
fun removeOnSubscriptionsChangedListener(listener: OnSubscriptionsChangedListener) {
|
||||
if (Build.VERSION.SDK_INT >= 22) {
|
||||
subscriptionManager?.removeOnSubscriptionsChangedListener(listener.listener)
|
||||
}
|
||||
subscriptionManager?.removeOnSubscriptionsChangedListener(listener.listener)
|
||||
}
|
||||
|
||||
abstract class OnSubscriptionsChangedListener {
|
||||
|
||||
val listener: SubscriptionManager.OnSubscriptionsChangedListener? = if (Build.VERSION.SDK_INT >= 22) {
|
||||
val listener: SubscriptionManager.OnSubscriptionsChangedListener? =
|
||||
object : SubscriptionManager.OnSubscriptionsChangedListener() {
|
||||
override fun onSubscriptionsChanged() {
|
||||
this@OnSubscriptionsChangedListener.onSubscriptionsChanged()
|
||||
}
|
||||
}
|
||||
} else null
|
||||
|
||||
abstract fun onSubscriptionsChanged()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user