mirror of
https://github.com/sudoxnym/habitica-android.git
synced 2026-05-22 05:38:55 +00:00
Fixes #1301
This commit is contained in:
parent
caa0804cc3
commit
f507bf4104
1 changed files with 15 additions and 9 deletions
|
|
@ -70,14 +70,6 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
|
|||
val useReminder = preferenceManager.sharedPreferences?.getBoolean("use_reminder", false)
|
||||
timePreference?.isEnabled = useReminder ?: false
|
||||
|
||||
pushNotificationsPreference = findPreference("pushNotifications") as? PreferenceScreen
|
||||
val usePushNotifications = preferenceManager.sharedPreferences?.getBoolean("usePushNotifications", true)
|
||||
pushNotificationsPreference?.isEnabled = usePushNotifications ?: false
|
||||
|
||||
emailNotificationsPreference = findPreference("emailNotifications") as? PreferenceScreen
|
||||
val useEmailNotifications = preferenceManager.sharedPreferences?.getBoolean("useEmailNotifications", true)
|
||||
emailNotificationsPreference?.isEnabled = useEmailNotifications ?: false
|
||||
|
||||
classSelectionPreference = findPreference("choose_class")
|
||||
|
||||
val weekdayPreference = findPreference("FirstDayOfTheWeek") as? ListPreference
|
||||
|
|
@ -193,15 +185,17 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
|
|||
"usePushNotifications" -> {
|
||||
val userPushNotifications = sharedPreferences.getBoolean(key, false)
|
||||
pushNotificationsPreference?.isEnabled = userPushNotifications
|
||||
userRepository.updateUser("preferences.pushNotifications.unsubscribeFromAll", userPushNotifications).subscribe()
|
||||
if (userPushNotifications) {
|
||||
pushNotificationManager.addPushDeviceUsingStoredToken()
|
||||
} else {
|
||||
pushNotificationManager.removePushDeviceUsingStoredToken()
|
||||
}
|
||||
}
|
||||
"useEmailNotifications" -> {
|
||||
"useEmails" -> {
|
||||
val useEmailNotifications = sharedPreferences.getBoolean(key, false)
|
||||
emailNotificationsPreference?.isEnabled = useEmailNotifications
|
||||
userRepository.updateUser("preferences.emailNotifications.unsubscribeFromAll", useEmailNotifications).subscribe()
|
||||
}
|
||||
"cds_time" -> {
|
||||
val timeval = sharedPreferences.getString("cds_time", "0") ?: "0"
|
||||
|
|
@ -345,6 +339,18 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
|
|||
val inbox = user?.inbox
|
||||
disablePMsPreference?.isChecked = inbox?.optOut ?: true
|
||||
|
||||
val usePushPreference = findPreference("usePushNotifications") as? CheckBoxPreference
|
||||
pushNotificationsPreference = findPreference("pushNotifications") as? PreferenceScreen
|
||||
val usePushNotifications = user?.preferences?.pushNotifications?.unsubscribeFromAll ?: false
|
||||
pushNotificationsPreference?.isEnabled = usePushNotifications
|
||||
usePushPreference?.isChecked = usePushNotifications
|
||||
|
||||
val useEmailPreference = findPreference("useEmails") as? CheckBoxPreference
|
||||
emailNotificationsPreference = findPreference("emailNotifications") as? PreferenceScreen
|
||||
val useEmailNotifications = user?.preferences?.emailNotifications?.unsubscribeFromAll ?: false
|
||||
emailNotificationsPreference?.isEnabled = useEmailNotifications
|
||||
useEmailPreference?.isChecked = useEmailNotifications
|
||||
|
||||
if (configManager.testingLevel() == AppTestingLevel.STAFF || BuildConfig.DEBUG) {
|
||||
serverUrlPreference?.isVisible = true
|
||||
taskListPreference?.isVisible = true
|
||||
|
|
|
|||
Loading…
Reference in a new issue