Handle tapping the notification

This commit is contained in:
PapaTutuWawa 2023-07-28 14:11:13 +02:00
parent fb9dab3d1e
commit f90b3866ab
3 changed files with 42 additions and 14 deletions

View File

@ -15,6 +15,8 @@ const val MARK_AS_READ_ACTION = "mark_as_read"
// The key for the notification id to mark as read // The key for the notification id to mark as read
const val MARK_AS_READ_ID_KEY = "notification_id" const val MARK_AS_READ_ID_KEY = "notification_id"
const val TAP_ACTION = "tap";
// TODO: Maybe try again to rewrite the entire plugin in Kotlin // TODO: Maybe try again to rewrite the entire plugin in Kotlin
//const val METHOD_CHANNEL_KEY = "me.polynom.moxplatform_android" //const val METHOD_CHANNEL_KEY = "me.polynom.moxplatform_android"
//const val BACKGROUND_METHOD_CHANNEL_KEY = METHOD_CHANNEL_KEY + "_bg" //const val BACKGROUND_METHOD_CHANNEL_KEY = METHOD_CHANNEL_KEY + "_bg"

View File

@ -1,6 +1,7 @@
package me.polynom.moxplatform_android package me.polynom.moxplatform_android
import android.app.NotificationManager import android.app.NotificationManager
import android.app.PendingIntent
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@ -10,6 +11,18 @@ import androidx.core.app.RemoteInput
import me.polynom.moxplatform_android.Api.NotificationEvent import me.polynom.moxplatform_android.Api.NotificationEvent
class NotificationReceiver : BroadcastReceiver() { class NotificationReceiver : BroadcastReceiver() {
private fun dismissNotification(context: Context, intent: Intent) {
// Dismiss the notification
val notificationId = intent.getLongExtra("notification_id", -1).toInt()
if (notificationId != -1) {
NotificationManagerCompat.from(context).cancel(
notificationId,
)
} else {
Log.e("NotificationReceiver", "No id specified. Cannot dismiss notification")
}
}
private fun handleMarkAsRead(context: Context, intent: Intent) { private fun handleMarkAsRead(context: Context, intent: Intent) {
Log.d("NotificationReceiver", "Marking ${intent.getStringExtra("jid")} as read") Log.d("NotificationReceiver", "Marking ${intent.getStringExtra("jid")} as read")
val jidWrapper = intent.getStringExtra("jid") ?: "" val jidWrapper = intent.getStringExtra("jid") ?: ""
@ -24,15 +37,7 @@ class NotificationReceiver : BroadcastReceiver() {
}.toList() }.toList()
) )
// Dismiss the notification dismissNotification(context, intent);
val notificationId = intent.getLongExtra("notification_id", -1).toInt()
if (notificationId != -1) {
NotificationManagerCompat.from(context).cancel(
notificationId,
)
} else {
Log.e("NotificationReceiver", "No id specified. Cannot dismiss notification")
}
} }
private fun handleReply(context: Context, intent: Intent) { private fun handleReply(context: Context, intent: Intent) {
@ -52,6 +57,25 @@ class NotificationReceiver : BroadcastReceiver() {
// TODO: Update the notification to prevent showing the spinner // TODO: Update the notification to prevent showing the spinner
} }
private fun handleTap(context: Context, intent: Intent) {
Log.d("NotificationReceiver", "Received a tap")
MoxplatformAndroidPlugin.notificationSink?.success(
NotificationEvent().apply {
jid = intent.getStringExtra("jid")!!
type = Api.NotificationEventType.OPEN
payload = null
}.toList()
)
// Bring the app into the foreground
val tapIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)!!
context.startActivity(tapIntent)
// Dismiss the notification
dismissNotification(context, intent)
}
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
// TODO: We need to be careful to ensure that the Flutter engine is running. // TODO: We need to be careful to ensure that the Flutter engine is running.
// If it's not, we have to start it. However, that's only an issue when we expect to // If it's not, we have to start it. However, that's only an issue when we expect to
@ -59,7 +83,7 @@ class NotificationReceiver : BroadcastReceiver() {
when (intent.action) { when (intent.action) {
MARK_AS_READ_ACTION -> handleMarkAsRead(context, intent) MARK_AS_READ_ACTION -> handleMarkAsRead(context, intent)
REPLY_ACTION -> handleReply(context, intent) REPLY_ACTION -> handleReply(context, intent)
// TODO: Handle tap TAP_ACTION -> handleTap(context, intent)
} }
} }
} }

View File

@ -39,6 +39,7 @@ fun showMessagingNotification(context: Context, notification: Api.MessagingNotif
replyPendingIntent, replyPendingIntent,
).apply { ).apply {
addRemoteInput(remoteInput) addRemoteInput(remoteInput)
setAllowGeneratedReplies(true)
}.build() }.build()
// -> Mark as read action // -> Mark as read action
@ -64,12 +65,13 @@ fun showMessagingNotification(context: Context, notification: Api.MessagingNotif
// -> Tap action // -> Tap action
// Thanks https://github.com/MaikuB/flutter_local_notifications/blob/master/flutter_local_notifications/android/src/main/java/com/dexterous/flutterlocalnotifications/FlutterLocalNotificationsPlugin.java#L246 // Thanks https://github.com/MaikuB/flutter_local_notifications/blob/master/flutter_local_notifications/android/src/main/java/com/dexterous/flutterlocalnotifications/FlutterLocalNotificationsPlugin.java#L246
// TODO: Copy the interface of awesome_notifications val tapIntent = Intent(context, NotificationReceiver::class.java).apply {
val tapIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)!!.apply { action = TAP_ACTION
// TODO: Use a constant // TODO: Use constants
putExtra("jid", notification.jid) putExtra("jid", notification.jid)
putExtra("notification_id", notification.id)
} }
val tapPendingIntent = PendingIntent.getActivity( val tapPendingIntent = PendingIntent.getBroadcast(
context, context,
notification.id.toInt(), notification.id.toInt(),
tapIntent, tapIntent,