karol/quik
0
0
Fork 0
forked from upstream-mirrors/quik
Code Pull Requests Actions Releases 10 Activity

Remove obsolete checks for API 23

Browse Source
This commit is contained in:
Moez Bhatti
2022-12-12 20:30:04 -05:00
parent ce9ba1b9f9
commit 4f2d4954ed
27 changed files with 88 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt
-1
View File
@@ -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
data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt
+5 -12
View File
@@ -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()
data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt
+1 -5
View File
@@ -34,11 +34,7 @@ class AlarmManagerImpl @Inject constructor(private val context: Context) : Alarm
override fun setAlarm(date: Long, intent: PendingIntent) {
val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as android.app.AlarmManager
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
alarmManager.setExactAndAllowWhileIdle(android.app.AlarmManager.RTC_WAKEUP, date, intent)
} else {
alarmManager.setExact(android.app.AlarmManager.RTC_WAKEUP, date, intent)
}
alarmManager.setExactAndAllowWhileIdle(android.app.AlarmManager.RTC_WAKEUP, date, intent)
}
}
data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
+1 -5
View File
@@ -328,11 +328,7 @@ class MessageRepositoryImpl @Inject constructor(
val intent = getIntentForDelayedSms(message.id)
val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, sendTime, intent)
} else {
alarmManager.setExact(AlarmManager.RTC_WAKEUP, sendTime, intent)
}
alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, sendTime, intent)
} else { // No delay
val message = insertSentSms(subId, threadId, addresses.first(), strippedBody, now())
sendSms(message)