Merge pull request #276 from amberin/fix-getcurrentactivity-npe

Fix NPE during permission check introduced in 67ccf2f
orgzly-revived · Jun 10, 2024 · bb71453 · bb71453
2 parents d019b7a + 3b30a8b
commit bb71453
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/app/src/main/java/com/orgzly/android/reminders/RemindersScheduler.kt b/app/src/main/java/com/orgzly/android/reminders/RemindersScheduler.kt
@@ -78,10 +78,14 @@ class RemindersScheduler @Inject constructor(val context: Application, val logs:
  val alarmManager = context.getAlarmManager()
 
  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
- if (!AppPermissions.isGrantedOrRequest(
- App.getCurrentActivity(), AppPermissions.Usage.POST_NOTIFICATIONS
- )
- ) {
+ if (!AppPermissions.isGranted(context, AppPermissions.Usage.POST_NOTIFICATIONS)) {
+ val activity = App.getCurrentActivity()
+ if (activity != null) {
+ AppPermissions.isGrantedOrRequest(
+ App.getCurrentActivity(),
+ AppPermissions.Usage.POST_NOTIFICATIONS
+ )
+ }
  return
  }
  }