Explicitly define mutability for PendingIntents

This commit is contained in:
Moez Bhatti
2022-12-12 18:25:46 -05:00
parent 2c332c06b6
commit 634f04b7aa
8 changed files with 22 additions and 22 deletions
@@ -114,11 +114,11 @@ class NotificationManagerImpl @Inject constructor(
val taskStackBuilder = TaskStackBuilder.create(context)
.addParentStack(ComposeActivity::class.java)
.addNextIntent(contentIntent)
val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT)
val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", threadId)
val seenPI = PendingIntent.getBroadcast(context, threadId.toInt(), seenIntent,
PendingIntent.FLAG_UPDATE_CURRENT)
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
// We can't store a null preference, so map it to a null Uri if the pref string is empty
val ringtone = prefs.ringtone(threadId).get()
@@ -233,7 +233,7 @@ class NotificationManagerImpl @Inject constructor(
Preferences.NOTIFICATION_ACTION_ARCHIVE -> {
val intent = Intent(context, MarkArchivedReceiver::class.java).putExtra("threadId", threadId)
val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
PendingIntent.FLAG_UPDATE_CURRENT)
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
NotificationCompat.Action.Builder(R.drawable.ic_archive_white_24dp, actionLabels[action], pi)
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_ARCHIVE).build()
}
@@ -244,7 +244,7 @@ class NotificationManagerImpl @Inject constructor(
.putExtra("threadId", threadId)
.putExtra("messageIds", messageIds)
val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
PendingIntent.FLAG_UPDATE_CURRENT)
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
NotificationCompat.Action.Builder(R.drawable.ic_delete_white_24dp, actionLabels[action], pi)
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_DELETE).build()
}
@@ -252,7 +252,7 @@ class NotificationManagerImpl @Inject constructor(
Preferences.NOTIFICATION_ACTION_BLOCK -> {
val intent = Intent(context, BlockThreadReceiver::class.java).putExtra("threadId", threadId)
val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
PendingIntent.FLAG_UPDATE_CURRENT)
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
NotificationCompat.Action.Builder(R.drawable.ic_block_white_24dp, actionLabels[action], pi)
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MUTE).build()
}
@@ -260,7 +260,7 @@ class NotificationManagerImpl @Inject constructor(
Preferences.NOTIFICATION_ACTION_READ -> {
val intent = Intent(context, MarkReadReceiver::class.java).putExtra("threadId", threadId)
val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
PendingIntent.FLAG_UPDATE_CURRENT)
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
NotificationCompat.Action.Builder(R.drawable.ic_check_white_24dp, actionLabels[action], pi)
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ).build()
}
@@ -271,7 +271,7 @@ class NotificationManagerImpl @Inject constructor(
} else {
val intent = Intent(context, QkReplyActivity::class.java).putExtra("threadId", threadId)
val pi = PendingIntent.getActivity(context, threadId.toInt(), intent,
PendingIntent.FLAG_UPDATE_CURRENT)
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
NotificationCompat.Action
.Builder(R.drawable.ic_reply_white_24dp, actionLabels[action], pi)
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY).build()
@@ -283,7 +283,7 @@ class NotificationManagerImpl @Inject constructor(
val intentAction = if (permissions.hasCalling()) Intent.ACTION_CALL else Intent.ACTION_DIAL
val intent = Intent(intentAction, Uri.parse("tel:$address"))
val pi = PendingIntent.getActivity(context, threadId.toInt(), intent,
PendingIntent.FLAG_UPDATE_CURRENT)
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
NotificationCompat.Action.Builder(R.drawable.ic_call_white_24dp, actionLabels[action], pi)
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_CALL).build()
}
@@ -337,7 +337,7 @@ class NotificationManagerImpl @Inject constructor(
val taskStackBuilder = TaskStackBuilder.create(context)
.addParentStack(ComposeActivity::class.java)
.addNextIntent(contentIntent)
val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT)
val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId))
.setContentTitle(context.getString(R.string.notification_message_failed_title))
@@ -357,7 +357,7 @@ class NotificationManagerImpl @Inject constructor(
private fun getReplyAction(threadId: Long): NotificationCompat.Action {
val replyIntent = Intent(context, RemoteMessagingReceiver::class.java).putExtra("threadId", threadId)
val replyPI = PendingIntent.getBroadcast(context, threadId.toInt(), replyIntent,
PendingIntent.FLAG_UPDATE_CURRENT)
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE)
val title = context.resources.getStringArray(R.array.notification_actions)[
Preferences.NOTIFICATION_ACTION_REPLY]
@@ -140,17 +140,17 @@ class WidgetProvider : AppWidgetProvider() {
// Main intent
val mainIntent = Intent(context, MainActivity::class.java)
val mainPI = PendingIntent.getActivity(context, 0, mainIntent, PendingIntent.FLAG_UPDATE_CURRENT)
val mainPI = PendingIntent.getActivity(context, 0, mainIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
remoteViews.setOnClickPendingIntent(R.id.title, mainPI)
// Compose intent
val composeIntent = Intent(context, ComposeActivity::class.java)
val composePI = PendingIntent.getActivity(context, 0, composeIntent, PendingIntent.FLAG_UPDATE_CURRENT)
val composePI = PendingIntent.getActivity(context, 0, composeIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
remoteViews.setOnClickPendingIntent(R.id.compose, composePI)
// Conversation intent
val startActivityIntent = Intent(context, MainActivity::class.java)
val startActivityPendingIntent = PendingIntent.getActivity(context, 0, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT)
val startActivityPendingIntent = PendingIntent.getActivity(context, 0, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
remoteViews.setPendingIntentTemplate(R.id.conversations, startActivityPendingIntent)
AppWidgetManager.getInstance(context).updateAppWidget(appWidgetId, remoteViews)