From a20d5fd6cf99cf5394aa13123c1b13b3152755da Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Mon, 27 Feb 2023 12:49:04 -0500 Subject: [PATCH] Fix crash when trying to cancel alarm without permission. --- .../thoughtcrime/securesms/service/TimedEventManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/TimedEventManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/TimedEventManager.java index 9b32fb1de..6bc9f1011 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/TimedEventManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/TimedEventManager.java @@ -122,7 +122,11 @@ public abstract class TimedEventManager { Intent intent = new Intent(context, alarmClass); PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, intent, PendingIntentFlags.mutable()); - pendingIntent.cancel(); - ServiceUtil.getAlarmManager(context).cancel(pendingIntent); + try { + pendingIntent.cancel(); + ServiceUtil.getAlarmManager(context).cancel(pendingIntent); + } catch (SecurityException e) { + Log.i(TAG, "Unable to cancel alarm because we don't have permission"); + } } }