mirrors/revanced-manager
1
0
Fork 0
mirror of https://github.com/ReVanced/revanced-manager.git synced 2025-05-11 13:05:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Do not poll battery optimization status

Browse source
This commit is contained in:
kitadai31 2025-04-20 20:50:25 +09:00
parent d5c63ead26
commit 93985ce4f2
2 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
View file

@ -6,6 +6,7 @@ import android.net.Uri
import android.provider.Settings
import androidx.activity.compose.BackHandler
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@ -264,9 +265,6 @@ fun DashboardScreen(
}
}
val showBatteryOptimizationsWarning by vm.showBatteryOptimizationsWarningFlow.collectAsStateWithLifecycle(
false
)
Notifications(
if (!Aapt.supportsDevice()) {
{
@ -278,16 +276,23 @@ fun DashboardScreen(
)
}
} else null,
if (showBatteryOptimizationsWarning) {
if (vm.showBatteryOptimizationsWarning) {
{
val batteryOptimizationsLauncher =
rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {
vm.updateBatteryOptimizationsWarning()
}
NotificationCard(
isWarning = true,
icon = Icons.Default.BatteryAlert,
text = stringResource(R.string.battery_optimization_notification),
onClick = {
androidContext.startActivity(Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS).apply {
data = Uri.parse("package:${androidContext.packageName}")
})
batteryOptimizationsLauncher.launch(
Intent(
Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
Uri.fromParts("package", androidContext.packageName, null)
)
)
}
)
}

18
app/src/main/java/app/revanced/manager/ui/viewmodel/DashboardViewModel.kt
View file

@ -24,9 +24,7 @@ import app.revanced.manager.network.api.ReVancedAPI
import app.revanced.manager.util.PM
import app.revanced.manager.util.toast
import app.revanced.manager.util.uiSafe
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch
@ -58,19 +56,13 @@ class DashboardViewModel(
var updatedManagerVersion: String? by mutableStateOf(null)
private set
val showBatteryOptimizationsWarningFlow = flow {
while (true) {
// There is no callback for this, so we have to poll it.
val result = !powerManager.isIgnoringBatteryOptimizations(app.packageName)
emit(result)
if (!result) return@flow
delay(500L)
}
}
var showBatteryOptimizationsWarning by mutableStateOf(false)
private set
init {
viewModelScope.launch {
checkForManagerUpdates()
updateBatteryOptimizationsWarning()
}
}
@ -90,6 +82,10 @@ class DashboardViewModel(
}
}
fun updateBatteryOptimizationsWarning() {
showBatteryOptimizationsWarning = !powerManager.isIgnoringBatteryOptimizations(app.packageName)
}
fun setShowManagerUpdateDialogOnLaunch(value: Boolean) {
viewModelScope.launch {
prefs.showManagerUpdateDialogOnLaunch.update(value)