forked from upstream-mirrors/quik
Don't modify PendingIntent requestCode unnecessarily
This commit is contained in:
@@ -114,10 +114,10 @@ class NotificationManagerImpl @Inject constructor(
|
|||||||
val taskStackBuilder = TaskStackBuilder.create(context)
|
val taskStackBuilder = TaskStackBuilder.create(context)
|
||||||
.addParentStack(ComposeActivity::class.java)
|
.addParentStack(ComposeActivity::class.java)
|
||||||
.addNextIntent(contentIntent)
|
.addNextIntent(contentIntent)
|
||||||
val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt() + 10000, PendingIntent.FLAG_UPDATE_CURRENT)
|
val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
|
|
||||||
val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", threadId)
|
val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", threadId)
|
||||||
val seenPI = PendingIntent.getBroadcast(context, threadId.toInt() + 20000, seenIntent,
|
val seenPI = PendingIntent.getBroadcast(context, threadId.toInt(), seenIntent,
|
||||||
PendingIntent.FLAG_UPDATE_CURRENT)
|
PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
|
|
||||||
// We can't store a null preference, so map it to a null Uri if the pref string is empty
|
// We can't store a null preference, so map it to a null Uri if the pref string is empty
|
||||||
@@ -232,7 +232,7 @@ class NotificationManagerImpl @Inject constructor(
|
|||||||
when (action) {
|
when (action) {
|
||||||
Preferences.NOTIFICATION_ACTION_ARCHIVE -> {
|
Preferences.NOTIFICATION_ACTION_ARCHIVE -> {
|
||||||
val intent = Intent(context, MarkArchivedReceiver::class.java).putExtra("threadId", threadId)
|
val intent = Intent(context, MarkArchivedReceiver::class.java).putExtra("threadId", threadId)
|
||||||
val pi = PendingIntent.getBroadcast(context, threadId.toInt() + 30000, intent,
|
val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
|
||||||
PendingIntent.FLAG_UPDATE_CURRENT)
|
PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
NotificationCompat.Action.Builder(R.drawable.ic_archive_white_24dp, actionLabels[action], pi)
|
NotificationCompat.Action.Builder(R.drawable.ic_archive_white_24dp, actionLabels[action], pi)
|
||||||
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_ARCHIVE).build()
|
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_ARCHIVE).build()
|
||||||
@@ -243,7 +243,7 @@ class NotificationManagerImpl @Inject constructor(
|
|||||||
val intent = Intent(context, DeleteMessagesReceiver::class.java)
|
val intent = Intent(context, DeleteMessagesReceiver::class.java)
|
||||||
.putExtra("threadId", threadId)
|
.putExtra("threadId", threadId)
|
||||||
.putExtra("messageIds", messageIds)
|
.putExtra("messageIds", messageIds)
|
||||||
val pi = PendingIntent.getBroadcast(context, threadId.toInt() + 40000, intent,
|
val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
|
||||||
PendingIntent.FLAG_UPDATE_CURRENT)
|
PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
NotificationCompat.Action.Builder(R.drawable.ic_delete_white_24dp, actionLabels[action], pi)
|
NotificationCompat.Action.Builder(R.drawable.ic_delete_white_24dp, actionLabels[action], pi)
|
||||||
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_DELETE).build()
|
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_DELETE).build()
|
||||||
@@ -251,7 +251,7 @@ class NotificationManagerImpl @Inject constructor(
|
|||||||
|
|
||||||
Preferences.NOTIFICATION_ACTION_BLOCK -> {
|
Preferences.NOTIFICATION_ACTION_BLOCK -> {
|
||||||
val intent = Intent(context, BlockThreadReceiver::class.java).putExtra("threadId", threadId)
|
val intent = Intent(context, BlockThreadReceiver::class.java).putExtra("threadId", threadId)
|
||||||
val pi = PendingIntent.getBroadcast(context, threadId.toInt() + 50000, intent,
|
val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
|
||||||
PendingIntent.FLAG_UPDATE_CURRENT)
|
PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
NotificationCompat.Action.Builder(R.drawable.ic_block_white_24dp, actionLabels[action], pi)
|
NotificationCompat.Action.Builder(R.drawable.ic_block_white_24dp, actionLabels[action], pi)
|
||||||
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MUTE).build()
|
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MUTE).build()
|
||||||
@@ -259,7 +259,7 @@ class NotificationManagerImpl @Inject constructor(
|
|||||||
|
|
||||||
Preferences.NOTIFICATION_ACTION_READ -> {
|
Preferences.NOTIFICATION_ACTION_READ -> {
|
||||||
val intent = Intent(context, MarkReadReceiver::class.java).putExtra("threadId", threadId)
|
val intent = Intent(context, MarkReadReceiver::class.java).putExtra("threadId", threadId)
|
||||||
val pi = PendingIntent.getBroadcast(context, threadId.toInt() + 60000, intent,
|
val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
|
||||||
PendingIntent.FLAG_UPDATE_CURRENT)
|
PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
NotificationCompat.Action.Builder(R.drawable.ic_check_white_24dp, actionLabels[action], pi)
|
NotificationCompat.Action.Builder(R.drawable.ic_check_white_24dp, actionLabels[action], pi)
|
||||||
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ).build()
|
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ).build()
|
||||||
@@ -270,7 +270,7 @@ class NotificationManagerImpl @Inject constructor(
|
|||||||
getReplyAction(threadId)
|
getReplyAction(threadId)
|
||||||
} else {
|
} else {
|
||||||
val intent = Intent(context, QkReplyActivity::class.java).putExtra("threadId", threadId)
|
val intent = Intent(context, QkReplyActivity::class.java).putExtra("threadId", threadId)
|
||||||
val pi = PendingIntent.getActivity(context, threadId.toInt() + 70000, intent,
|
val pi = PendingIntent.getActivity(context, threadId.toInt(), intent,
|
||||||
PendingIntent.FLAG_UPDATE_CURRENT)
|
PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
NotificationCompat.Action
|
NotificationCompat.Action
|
||||||
.Builder(R.drawable.ic_reply_white_24dp, actionLabels[action], pi)
|
.Builder(R.drawable.ic_reply_white_24dp, actionLabels[action], pi)
|
||||||
@@ -282,7 +282,7 @@ class NotificationManagerImpl @Inject constructor(
|
|||||||
val address = conversation.recipients[0]?.address
|
val address = conversation.recipients[0]?.address
|
||||||
val intentAction = if (permissions.hasCalling()) Intent.ACTION_CALL else Intent.ACTION_DIAL
|
val intentAction = if (permissions.hasCalling()) Intent.ACTION_CALL else Intent.ACTION_DIAL
|
||||||
val intent = Intent(intentAction, Uri.parse("tel:$address"))
|
val intent = Intent(intentAction, Uri.parse("tel:$address"))
|
||||||
val pi = PendingIntent.getActivity(context, threadId.toInt() + 80000, intent,
|
val pi = PendingIntent.getActivity(context, threadId.toInt(), intent,
|
||||||
PendingIntent.FLAG_UPDATE_CURRENT)
|
PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
NotificationCompat.Action.Builder(R.drawable.ic_call_white_24dp, actionLabels[action], pi)
|
NotificationCompat.Action.Builder(R.drawable.ic_call_white_24dp, actionLabels[action], pi)
|
||||||
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_CALL).build()
|
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_CALL).build()
|
||||||
@@ -335,9 +335,9 @@ class NotificationManagerImpl @Inject constructor(
|
|||||||
|
|
||||||
val contentIntent = Intent(context, ComposeActivity::class.java).putExtra("threadId", threadId)
|
val contentIntent = Intent(context, ComposeActivity::class.java).putExtra("threadId", threadId)
|
||||||
val taskStackBuilder = TaskStackBuilder.create(context)
|
val taskStackBuilder = TaskStackBuilder.create(context)
|
||||||
taskStackBuilder.addParentStack(ComposeActivity::class.java)
|
.addParentStack(ComposeActivity::class.java)
|
||||||
taskStackBuilder.addNextIntent(contentIntent)
|
.addNextIntent(contentIntent)
|
||||||
val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt() + 90000, PendingIntent.FLAG_UPDATE_CURRENT)
|
val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
|
|
||||||
val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId))
|
val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId))
|
||||||
.setContentTitle(context.getString(R.string.notification_message_failed_title))
|
.setContentTitle(context.getString(R.string.notification_message_failed_title))
|
||||||
@@ -356,7 +356,7 @@ class NotificationManagerImpl @Inject constructor(
|
|||||||
|
|
||||||
private fun getReplyAction(threadId: Long): NotificationCompat.Action {
|
private fun getReplyAction(threadId: Long): NotificationCompat.Action {
|
||||||
val replyIntent = Intent(context, RemoteMessagingReceiver::class.java).putExtra("threadId", threadId)
|
val replyIntent = Intent(context, RemoteMessagingReceiver::class.java).putExtra("threadId", threadId)
|
||||||
val replyPI = PendingIntent.getBroadcast(context, threadId.toInt() + 70000, replyIntent,
|
val replyPI = PendingIntent.getBroadcast(context, threadId.toInt(), replyIntent,
|
||||||
PendingIntent.FLAG_UPDATE_CURRENT)
|
PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
|
|
||||||
val title = context.resources.getStringArray(R.array.notification_actions)[
|
val title = context.resources.getStringArray(R.array.notification_actions)[
|
||||||
|
|||||||
Reference in New Issue
Block a user