From fb90dca6dba3ea8df0a41d62de03c62618396842 Mon Sep 17 00:00:00 2001
From: millanp <millan.philipose@gmail.com>
Date: Mon, 19 Feb 2024 17:28:37 -0800
Subject: [PATCH] Ask for alarm and notification permissions to fix #1106

---
 .../src/main/AndroidManifest.xml              |  2 ++
 .../android/ui/TripInfoActivity.java          | 20 ++++++++++++++-----
 .../android/util/PermissionUtils.java         |  1 +
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/onebusaway-android/src/main/AndroidManifest.xml b/onebusaway-android/src/main/AndroidManifest.xml
index 594a251c2..98ace5da4 100644
--- a/onebusaway-android/src/main/AndroidManifest.xml
+++ b/onebusaway-android/src/main/AndroidManifest.xml
@@ -45,6 +45,8 @@
     <!--<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>-->
     <!-- For reminders - SCHEDULE_EXACT_ALARM is required when targeting Android 12 or higher-->
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
+    <!-- For notifications, POST_NOTIFICATIONS is required when targeting Android 12 or higher-->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application
         android:allowBackup="false"
diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/ui/TripInfoActivity.java b/onebusaway-android/src/main/java/org/onebusaway/android/ui/TripInfoActivity.java
index 119c4c6d9..19e6a7fe7 100644
--- a/onebusaway-android/src/main/java/org/onebusaway/android/ui/TripInfoActivity.java
+++ b/onebusaway-android/src/main/java/org/onebusaway/android/ui/TripInfoActivity.java
@@ -15,6 +15,7 @@
  */
 package org.onebusaway.android.ui;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -26,6 +27,7 @@
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.text.format.DateUtils;
@@ -52,6 +54,7 @@
 import java.util.List;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -59,6 +62,8 @@
 import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;
 
+import static org.onebusaway.android.util.PermissionUtils.NOTIFICATION_PERMISSION_REQUEST;
+
 public class TripInfoActivity extends AppCompatActivity {
 
     private static final String TAG = "TripInfoActivity";
@@ -418,11 +423,16 @@ public void saveTrip() {
             // Repeats
             //
 
-            // On Android Tiramisu and up, we must request
-            // permission to schedule exact alarms.
-            if (!TripService.canScheduleExactAlarms(getActivity())) {
-                showRequestAlarmsPermissionDialog(getActivity());
-                return;
+            // Make sure that the user has granted permission for notifications
+            // and exact alarms.
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                if (!TripService.canScheduleExactAlarms(getActivity())) {
+                    showRequestAlarmsPermissionDialog(getActivity());
+                    return;
+                }
+                ActivityCompat.requestPermissions(this.getActivity(),
+                        new String[] {Manifest.permission.POST_NOTIFICATIONS},
+                        NOTIFICATION_PERMISSION_REQUEST);
             }
 
             View view = getView();
diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/util/PermissionUtils.java b/onebusaway-android/src/main/java/org/onebusaway/android/util/PermissionUtils.java
index 2e4fc5182..b7a809cd7 100644
--- a/onebusaway-android/src/main/java/org/onebusaway/android/util/PermissionUtils.java
+++ b/onebusaway-android/src/main/java/org/onebusaway/android/util/PermissionUtils.java
@@ -30,6 +30,7 @@ public class PermissionUtils {
     public static final int SAVE_BACKUP_PERMISSION_REQUEST = 2;
     public static final int RESTORE_BACKUP_PERMISSION_REQUEST = 3;
     public static final int BACKGROUND_LOCATION_PERMISSION_REQUEST = 4;
+    public static final int NOTIFICATION_PERMISSION_REQUEST = 5;
 
     public static final String[] LOCATION_PERMISSIONS = {
             Manifest.permission.ACCESS_FINE_LOCATION,