Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to swallow erroneous cancel alarm security exceptions.

Browse Source
This commit is contained in:
Cody Henthorne
2023-07-26 14:07:10 -04:00
parent 82e7050864
commit 1e9a0cdc16
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/org/thoughtcrime/securesms/service/TimedEventManager.java
View File

@@ -126,8 +126,23 @@ public abstract class TimedEventManager<E> {
try {
pendingIntent.cancel();
ServiceUtil.getAlarmManager(context).cancel(pendingIntent);
} catch (SecurityException e) {
Log.i(TAG, "Unable to cancel alarm because we don't have permission");
} catch (Exception e) {
Throwable cause = e;
int depth = 0;
while (cause != null && depth < 5) {
if (cause instanceof SecurityException) {
break;
} else {
cause = e.getCause();
depth++;
}
}
if (e instanceof SecurityException) {
Log.i(TAG, "Unable to cancel alarm because we don't have permission");
} else {
throw e;
}
}
}
}