centralcloud/oncall-mobile-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hide "Exact alarms" setting if battery optimization exemption has been granted

Browse source
This commit is contained in:
Philipp Heckel 2026-01-03 11:53:10 -05:00
parent 62f4e1701b
commit 50d3e9b038
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt
View file

@ -225,7 +225,7 @@ class MainActivity : AppCompatActivity(), AddFragment.SubscribeListener, Notific
// Update battery banner + WebSocket banner + websocket reconnect banner
showHideBatteryBanner(subscriptions)
showHideWebSocketBanner(subscriptions)
showHideWebSocketReconnectBanner(subscriptions)
showHideWebSocketReconnectBanner()
}
}
@ -310,7 +310,7 @@ class MainActivity : AppCompatActivity(), AddFragment.SubscribeListener, Notific
// Maybe show WebSocketReconnectBanner
viewModel.list().observe(this) {
it?.let { subscriptions ->
showHideWebSocketReconnectBanner(subscriptions)
showHideWebSocketReconnectBanner()
}
}
}
@ -404,15 +404,14 @@ class MainActivity : AppCompatActivity(), AddFragment.SubscribeListener, Notific
}
}
private fun showHideWebSocketReconnectBanner(subscriptions: List<Subscription>) {
private fun showHideWebSocketReconnectBanner() {
val wsReconnectBanner = findViewById<View>(R.id.main_banner_websocket_reconnect)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
val hasSelfHostedSubscriptions = subscriptions.count { it.baseUrl != appBaseUrl } > 0
val usingWebSockets = repository.getConnectionProtocol() == Repository.CONNECTION_PROTOCOL_WS
val wsReconnectRemindTimeReached = repository.getWebSocketReconnectRemindTime() < System.currentTimeMillis()
val canScheduleExactAlarms = (getSystemService(ALARM_SERVICE) as AlarmManager).canScheduleExactAlarms()
val showBanner = hasSelfHostedSubscriptions && wsReconnectRemindTimeReached && usingWebSockets && !canScheduleExactAlarms
Log.d(TAG, "hasSelfHostedSubscriptions: ${hasSelfHostedSubscriptions}, wsReconnectRemindTimeReached: ${wsReconnectRemindTimeReached}, usingWebSockets: ${usingWebSockets}, canScheduleExactAlarms: ${canScheduleExactAlarms}")
val showBanner = wsReconnectRemindTimeReached && usingWebSockets && !canScheduleExactAlarms
Log.d(TAG, "wsReconnectRemindTimeReached: ${wsReconnectRemindTimeReached}, usingWebSockets: ${usingWebSockets}, canScheduleExactAlarms: ${canScheduleExactAlarms}")
wsReconnectBanner.visibility = if (showBanner) View.VISIBLE else View.GONE
} else {
wsReconnectBanner.visibility = View.GONE

11
app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt
View file

@ -845,7 +845,8 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
}
fun updateExactAlarmsPref() {
val exactAlarmsPrefId = context?.getString(R.string.settings_advanced_exact_alarms_key) ?: return
val context = context ?: return
val exactAlarmsPrefId = context.getString(R.string.settings_advanced_exact_alarms_key)
val exactAlarmsPref: Preference? = findPreference(exactAlarmsPrefId)
val canScheduleExactAlarms = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
(activity?.getSystemService(ALARM_SERVICE) as AlarmManager).canScheduleExactAlarms()
@ -859,6 +860,14 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
}
true
}
// Android doesn't show "ntfy" in the "Alarms & reminders" list if battery optimizations are disabled.
//
// In fact, if the user has granted the battery optimization exemption (see battery banner in MainActivity),
// the alarm manager's canScheduleExactAlarms() method will return true.
//
// This is undocumented behavior. See https://github.com/binwiederhier/ntfy/issues/1456#issuecomment-3707174262
exactAlarmsPref?.isVisible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
&& !isIgnoringBatteryOptimizations(context)
}
@Keep

2
fastlane/metadata/android/en-US/changelog/NEXT.txt Normal file
View file

@ -0,0 +1,2 @@
Maintenance + bug fixes:
* Hide "Exact alarms" setting if battery optimization exemption has been granted (#1456, thanks for reporting @HappyLer)