forked from upstream-mirrors/quik
Merge pull request #475 from Inhishonor/resend-notification
Add a notification action to resend a failed message
This commit is contained in:
@@ -53,6 +53,7 @@ import dev.octoshrimpy.quik.receiver.MarkReadReceiver
|
|||||||
import dev.octoshrimpy.quik.receiver.MarkSeenReceiver
|
import dev.octoshrimpy.quik.receiver.MarkSeenReceiver
|
||||||
import dev.octoshrimpy.quik.receiver.RemoteMessagingReceiver
|
import dev.octoshrimpy.quik.receiver.RemoteMessagingReceiver
|
||||||
import dev.octoshrimpy.quik.receiver.SpeakThreadsReceiver
|
import dev.octoshrimpy.quik.receiver.SpeakThreadsReceiver
|
||||||
|
import dev.octoshrimpy.quik.receiver.SendSmsReceiver
|
||||||
import dev.octoshrimpy.quik.repository.ContactRepository
|
import dev.octoshrimpy.quik.repository.ContactRepository
|
||||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||||
@@ -371,9 +372,29 @@ class NotificationManagerImpl @Inject constructor(
|
|||||||
.addNextIntent(contentIntent)
|
.addNextIntent(contentIntent)
|
||||||
val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
|
val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
|
||||||
|
|
||||||
|
//Action for resending a failed message
|
||||||
|
val resendIntent = Intent(context, SendSmsReceiver::class.java).apply {
|
||||||
|
putExtra("id", message.id)
|
||||||
|
}
|
||||||
|
val resendPendingIntent = PendingIntent.getBroadcast(
|
||||||
|
context,
|
||||||
|
message.id.toInt(),
|
||||||
|
resendIntent,
|
||||||
|
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
|
||||||
|
)
|
||||||
|
|
||||||
|
val resendAction = NotificationCompat.Action.Builder(
|
||||||
|
R.drawable.ic_send_black_24dp,
|
||||||
|
context.getString(R.string.notification_message_failed_action),
|
||||||
|
resendPendingIntent
|
||||||
|
)
|
||||||
|
.setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_NONE)
|
||||||
|
.build()
|
||||||
|
|
||||||
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))
|
||||||
.setContentText(context.getString(R.string.notification_message_failed_text, conversation.getTitle()))
|
.setContentText(context.getString(R.string.notification_message_failed_text, conversation.getTitle()))
|
||||||
|
.addAction(resendAction)
|
||||||
.setColor(colors.theme(lastRecipient).theme)
|
.setColor(colors.theme(lastRecipient).theme)
|
||||||
.setPriority(NotificationManagerCompat.IMPORTANCE_MAX)
|
.setPriority(NotificationManagerCompat.IMPORTANCE_MAX)
|
||||||
.setSmallIcon(R.drawable.ic_notification_failed)
|
.setSmallIcon(R.drawable.ic_notification_failed)
|
||||||
|
|||||||
@@ -486,6 +486,7 @@
|
|||||||
</plurals>
|
</plurals>
|
||||||
<string name="notification_message_failed_title">Message not sent</string>
|
<string name="notification_message_failed_title">Message not sent</string>
|
||||||
<string name="notification_message_failed_text">The message to %s failed to send</string>
|
<string name="notification_message_failed_text">The message to %s failed to send</string>
|
||||||
|
<string name="notification_message_failed_action">Resend</string>
|
||||||
|
|
||||||
<string-array name="night_modes">
|
<string-array name="night_modes">
|
||||||
<item>System</item>
|
<item>System</item>
|
||||||
|
|||||||
Reference in New Issue
Block a user