Skip to content

Fix stale/unresponsive battery-optimization item in About #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hawkff merged 2 commits into from
Jun 21, 2026
+33 −23
Merged

Fix stale/unresponsive battery-optimization item in About #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a75da5
fix(about): reflect battery-optimization state; fix stale unresponsiv…
hawkff Jun 21, 2026
f9c283e
review: guard refreshMaterialAboutList with isAdded (avoid null adapter)
hawkff Jun 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 31 additions & 23 deletions app/src/main/java/io/nekohasekai/sagernet/ui/AboutFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.nekohasekai.sagernet.ui

import android.app.Activity
import android.content.Context
import android.content.Intent
import android.net.Uri
Expand All @@ -10,8 +9,6 @@ import android.os.PowerManager
import android.provider.Settings
import android.view.View
import android.widget.Toast
import androidx.activity.result.component1
import androidx.activity.result.component2
import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.view.ViewCompat
import androidx.recyclerview.widget.RecyclerView
Expand Down Expand Up @@ -51,12 +48,13 @@ class AboutFragment : ToolbarFragment(R.layout.layout_about) {

val requestIgnoreBatteryOptimizations = registerForActivityResult(
ActivityResultContracts.StartActivityForResult()
) { (resultCode, _) ->
if (resultCode == Activity.RESULT_OK) {
parentFragmentManager.beginTransaction()
.replace(R.id.about_fragment_holder, AboutContent())
.commitAllowingStateLoss()
}
) {
// The battery-optimization request/settings screen returns RESULT_CANCELED even
// when the user actually granted the exemption, so don't gate on the result code
// — just rebuild the list so the item's on/off subtext reflects the new state.
// Guard with isAdded: the fragment may be detached while the settings screen was
// open, and refreshMaterialAboutList() would otherwise touch a null adapter.
if (isAdded) refreshMaterialAboutList()
}
Comment thread
greptile-apps[bot] marked this conversation as resolved.

override fun getMaterialAboutList(activityContext: Context): MaterialAboutList {
Expand Down Expand Up @@ -131,22 +129,32 @@ class AboutFragment : ToolbarFragment(R.layout.layout_about) {
.apply {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
val pm = app.getSystemService(Context.POWER_SERVICE) as PowerManager
if (!pm.isIgnoringBatteryOptimizations(app.packageName)) {
addItem(
MaterialAboutActionItem.Builder()
.icon(R.drawable.ic_baseline_running_with_errors_24)
.text(R.string.ignore_battery_optimizations)
.subText(R.string.ignore_battery_optimizations_sum)
.setOnClickAction {
requestIgnoreBatteryOptimizations.launch(
Intent(
Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
"package:${app.packageName}".toUri()
)
val ignoring = pm.isIgnoringBatteryOptimizations(app.packageName)
addItem(
MaterialAboutActionItem.Builder()
.icon(R.drawable.ic_baseline_running_with_errors_24)
.text(R.string.ignore_battery_optimizations)
.subText(
if (ignoring) R.string.battery_optimization_enabled
else R.string.battery_optimization_disabled
)
.setOnClickAction {
// The ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
// dialog only appears while the app is still
// optimized; once exempt it is a no-op. So when
// already exempt, send the user to the battery
// settings screen where they can toggle it back off.
val intent = if (ignoring) {
Intent(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS)
} else {
Intent(
Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
"package:${app.packageName}".toUri()
)
}
.build())
}
requestIgnoreBatteryOptimizations.launch(intent)
}
.build())
}
}
.build())
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,8 @@
<string name="donate_info">I love money</string>
<string name="ignore_battery_optimizations">Ignore battery optimizations</string>
<string name="ignore_battery_optimizations_sum">Remove some restrictions</string>
<string name="battery_optimization_enabled">Enabled — the app can run unrestricted in the background</string>
<string name="battery_optimization_disabled">Disabled — tap to allow background activity</string>
<!-- plugin -->
<string name="plugin">Plugin</string>
<string name="plugin_configure">Configure…</string>
Expand Down
Loading