mirror of
https://github.com/bitfireAT/davx5-ose
synced 2024-10-15 15:59:18 +00:00
App settings: show "Battery optimizations" dialog even when DAVx5 is already exempted
This commit is contained in:
parent
ea66838cd6
commit
9742913a3e
|
@ -142,6 +142,11 @@ class AppSettingsActivity: AppCompatActivity() {
|
||||||
android.provider.Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
|
android.provider.Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
|
||||||
Uri.parse("package:" + BuildConfig.APPLICATION_ID)
|
Uri.parse("package:" + BuildConfig.APPLICATION_ID)
|
||||||
))
|
))
|
||||||
|
},
|
||||||
|
onBatterySavingSettings = {
|
||||||
|
startActivity(Intent(
|
||||||
|
android.provider.Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS
|
||||||
|
))
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -193,7 +198,8 @@ class AppSettingsActivity: AppCompatActivity() {
|
||||||
verboseLogging: Boolean,
|
verboseLogging: Boolean,
|
||||||
onUpdateVerboseLogging: (Boolean) -> Unit,
|
onUpdateVerboseLogging: (Boolean) -> Unit,
|
||||||
batterySavingExempted: Boolean,
|
batterySavingExempted: Boolean,
|
||||||
onExemptFromBatterySaving: () -> Unit
|
onExemptFromBatterySaving: () -> Unit,
|
||||||
|
onBatterySavingSettings: () -> Unit
|
||||||
) {
|
) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
|
|
||||||
|
@ -221,13 +227,15 @@ class AppSettingsActivity: AppCompatActivity() {
|
||||||
|
|
||||||
SwitchSetting(
|
SwitchSetting(
|
||||||
checked = batterySavingExempted,
|
checked = batterySavingExempted,
|
||||||
enabled = !batterySavingExempted,
|
|
||||||
icon = Icons.Default.SyncProblem.takeUnless { batterySavingExempted },
|
icon = Icons.Default.SyncProblem.takeUnless { batterySavingExempted },
|
||||||
name = stringResource(R.string.app_settings_battery_optimization),
|
name = stringResource(R.string.app_settings_battery_optimization),
|
||||||
summaryOn = stringResource(R.string.app_settings_battery_optimization_exempted),
|
summaryOn = stringResource(R.string.app_settings_battery_optimization_exempted),
|
||||||
summaryOff = stringResource(R.string.app_settings_battery_optimization_optimized)
|
summaryOff = stringResource(R.string.app_settings_battery_optimization_optimized)
|
||||||
) {
|
) {
|
||||||
onExemptFromBatterySaving()
|
if (batterySavingExempted)
|
||||||
|
onBatterySavingSettings()
|
||||||
|
else
|
||||||
|
onExemptFromBatterySaving()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -239,7 +247,8 @@ class AppSettingsActivity: AppCompatActivity() {
|
||||||
verboseLogging = false,
|
verboseLogging = false,
|
||||||
onUpdateVerboseLogging = {},
|
onUpdateVerboseLogging = {},
|
||||||
batterySavingExempted = true,
|
batterySavingExempted = true,
|
||||||
onExemptFromBatterySaving = {}
|
onExemptFromBatterySaving = {},
|
||||||
|
onBatterySavingSettings = {}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue