diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt index f63bf8362..035b054f5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt @@ -205,19 +205,19 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare TaskAlarmManager.scheduleDailyReminder(context) } "usePushNotifications" -> { - val userPushNotifications = sharedPreferences.getBoolean(key, false) - pushNotificationsPreference?.isEnabled = userPushNotifications - userRepository.updateUser("preferences.pushNotifications.unsubscribeFromAll", userPushNotifications).subscribe() - if (userPushNotifications) { + val usePushNotifications = sharedPreferences.getBoolean(key, true) + pushNotificationsPreference?.isEnabled = usePushNotifications + userRepository.updateUser("preferences.pushNotifications.unsubscribeFromAll", !usePushNotifications).subscribe() + if (usePushNotifications) { pushNotificationManager.addPushDeviceUsingStoredToken() } else { pushNotificationManager.removePushDeviceUsingStoredToken() } } "useEmails" -> { - val useEmailNotifications = sharedPreferences.getBoolean(key, false) + val useEmailNotifications = sharedPreferences.getBoolean(key, true) emailNotificationsPreference?.isEnabled = useEmailNotifications - userRepository.updateUser("preferences.emailNotifications.unsubscribeFromAll", useEmailNotifications).subscribe() + userRepository.updateUser("preferences.emailNotifications.unsubscribeFromAll", !useEmailNotifications).subscribe() } "cds_time" -> { val timeval = sharedPreferences.getString("cds_time", "0") ?: "0" @@ -356,13 +356,13 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare val usePushPreference = findPreference("usePushNotifications") as? CheckBoxPreference pushNotificationsPreference = findPreference("pushNotifications") as? PreferenceScreen - val usePushNotifications = user?.preferences?.pushNotifications?.unsubscribeFromAll ?: false + 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 + val useEmailNotifications = !(user?.preferences?.emailNotifications?.unsubscribeFromAll ?: false) emailNotificationsPreference?.isEnabled = useEmailNotifications useEmailPreference?.isChecked = useEmailNotifications diff --git a/build.gradle b/build.gradle index 9e0ea00e0..41ced8bc4 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,6 @@ buildscript { app_version_name = '' app_version_code = 0 - amplitude_version = '3.35.1' appcompat_version = '1.5.1' coil_version = '2.1.0'