From 109c1f842790bb40aaf75c2b70406f5e9ce1a4e0 Mon Sep 17 00:00:00 2001 From: Hafiz Date: Thu, 15 Dec 2022 01:14:11 -0500 Subject: [PATCH] Removed redundant Tiramisu check for Android 13 Notification permissions --- .../com/habitrpg/android/habitica/ui/activities/MainActivity.kt | 2 +- .../habitica/ui/fragments/preferences/PreferencesFragment.kt | 2 +- .../android/habitica/ui/viewmodels/MainActivityViewModel.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt index aace8c7c4..d3c979b16 100755 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt @@ -359,7 +359,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity { } viewModel.requestNotificationPermission.observe(this) { requestNotificationPermission -> - if (requestNotificationPermission && (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)) { + if (requestNotificationPermission) { notificationPermissionLauncher.launch(android.Manifest.permission.POST_NOTIFICATIONS) viewModel.requestNotificationPermission.value = false } 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 33e3fd37f..110882abb 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 @@ -219,7 +219,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare userRepository.updateUser("preferences.pushNotifications.unsubscribeFromAll", !usePushNotifications) } if (usePushNotifications) { - if (!pushNotificationManager.notificationPermissionEnabled() && (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)) { + if (!pushNotificationManager.notificationPermissionEnabled()) { notificationPermissionLauncher.launch(android.Manifest.permission.POST_NOTIFICATIONS) } else { pushNotificationManager.addPushDeviceUsingStoredToken() diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt index 9528b5bda..bd2d67e3f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt @@ -100,7 +100,7 @@ class MainActivityViewModel : BaseViewModel(), TutorialView.OnTutorialReaction { analyticsManager.setUserProperty("checkin_count", user.loginIncentives.toString()) analyticsManager.setUserProperty("level", user.stats?.lvl?.toString() ?: "") pushNotificationManager.setUser(user) - if (!pushNotificationManager.notificationPermissionEnabled() && (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)) { + if (!pushNotificationManager.notificationPermissionEnabled()) { if (sharedPreferences.getBoolean("usePushNotifications", true)) { requestNotificationPermission.value = true }