From 1be632d82363b2da0d41fb041e3bb64826517843 Mon Sep 17 00:00:00 2001 From: HeCodes2Much Date: Tue, 11 Jun 2024 16:10:30 +0100 Subject: [PATCH] Refactor: Removed the need for forcing API version Signed-off-by: HeCodes2Much --- .../launcher/ui/widgets/WidgetFragment.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt index 0e0282b..c3e57e9 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt @@ -18,7 +18,6 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.annotation.RequiresApi import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.fragment.app.Fragment @@ -260,7 +259,6 @@ class WidgetFragment : Fragment(), } private val batteryReceiver = object : BroadcastReceiver() { - @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE) override fun onReceive(context: Context?, intent: Intent?) { val batteryManager = requireContext().getSystemService(Context.BATTERY_SERVICE) as BatteryManager if (intent?.action == Intent.ACTION_BATTERY_CHANGED) { @@ -268,7 +266,11 @@ class WidgetFragment : Fragment(), val scale = intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1) val isCharging = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) val health = intent.getIntExtra(BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_UNKNOWN) - val count = intent.getIntExtra(BatteryManager.EXTRA_CYCLE_COUNT, 0) + val count = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + intent.getIntExtra(BatteryManager.EXTRA_CYCLE_COUNT, 0) + } else { + 0 + } val currentMicroAmps = batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW) val current = (currentMicroAmps / 1000.0) val voltage = intent.getIntExtra(BatteryManager.EXTRA_VOLTAGE, 0)