Remove Android M checks

since android M is already the minimum
This commit is contained in:
Jays2Kings 2021-09-17 18:10:12 -04:00
parent 03ce33e434
commit 3aa06c708f
2 changed files with 14 additions and 19 deletions

View file

@ -4,7 +4,6 @@ import android.annotation.SuppressLint
import android.app.Dialog import android.app.Dialog
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.PowerManager import android.os.PowerManager
import android.provider.Settings import android.provider.Settings
@ -76,24 +75,22 @@ class SettingsAdvancedController : SettingsController() {
} }
} }
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { val pm = context.getSystemService(Context.POWER_SERVICE) as? PowerManager?
val pm = context.getSystemService(Context.POWER_SERVICE) as? PowerManager? if (pm != null) preference {
if (pm != null) preference { key = "disable_batt_opt"
key = "disable_batt_opt" titleRes = R.string.disable_battery_optimization
titleRes = R.string.disable_battery_optimization summaryRes = R.string.disable_if_issues_with_updating
summaryRes = R.string.disable_if_issues_with_updating
onClick { onClick {
val packageName: String = context.packageName val packageName: String = context.packageName
if (!pm.isIgnoringBatteryOptimizations(packageName)) { if (!pm.isIgnoringBatteryOptimizations(packageName)) {
val intent = Intent().apply { val intent = Intent().apply {
action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
data = "package:$packageName".toUri() data = "package:$packageName".toUri()
}
startActivity(intent)
} else {
context.toast(R.string.battery_optimization_disabled)
} }
startActivity(intent)
} else {
context.toast(R.string.battery_optimization_disabled)
} }
} }
} }

View file

@ -54,7 +54,6 @@ abstract class WebViewClientCompat : WebViewClient() {
return shouldInterceptRequestCompat(view, url) return shouldInterceptRequestCompat(view, url)
} }
@TargetApi(Build.VERSION_CODES.M)
final override fun onReceivedError( final override fun onReceivedError(
view: WebView, view: WebView,
request: WebResourceRequest, request: WebResourceRequest,
@ -78,7 +77,6 @@ abstract class WebViewClientCompat : WebViewClient() {
onReceivedErrorCompat(view, errorCode, description, failingUrl, failingUrl == view.url) onReceivedErrorCompat(view, errorCode, description, failingUrl, failingUrl == view.url)
} }
@TargetApi(Build.VERSION_CODES.M)
final override fun onReceivedHttpError( final override fun onReceivedHttpError(
view: WebView, view: WebView,
request: WebResourceRequest, request: WebResourceRequest,