wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3785 from wiktor-k/fix-notifications

Browse source 
Fix NPE when accessing settings screens
This commit is contained in:
cketti 2018-12-02 18:25:12 +01:00 committed by GitHub
commit 1552c151a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/ui/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsFragment.kt
View file

@ -165,10 +165,12 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
}
private fun initializeNotifications() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
PRE_SDK26_NOTIFICATION_PREFERENCES.forEach { findPreference(it).remove() }
} else {
findPreference(PREFERENCE_OPEN_NOTIFICATION_SETTINGS).remove()
findPreference(PREFERENCE_OPEN_NOTIFICATION_SETTINGS)?.let {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
PRE_SDK26_NOTIFICATION_PREFERENCES.forEach { findPreference(it).remove() }
} else {
it.remove()
}
}
}