Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mobile_app_notification_cleared for wearos #4035

Merged
merged 7 commits into from
Dec 13, 2023
Merged

mobile_app_notification_cleared for wearos #4035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bffc1e9
mobile_app_notification_cleared for wearos
JosephAbbey Nov 15, 2023
4eaf89d
Merge branch 'home-assistant:master' into wear-notification-cleared-e…
JosephAbbey Nov 28, 2023
cbcd513
Fix imports
JosephAbbey Nov 28, 2023
aee8085
Remove database id extra
JosephAbbey Nov 28, 2023
a8c29ba
Fix whitespace
JosephAbbey Nov 28, 2023
97a1291
Reformatted imports and added the receiver to the manifest
JosephAbbey Nov 29, 2023
bebdbb1
Move `handleDeleteIntent` to common
JosephAbbey Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,11 +871,6 @@
android:enabled="true"
android:exported="true" />

<receiver
android:name=".notifications.NotificationDeleteReceiver"
android:enabled="true"
android:exported="true" />

</application>

</manifest>
26 changes: 2 additions & 24 deletions app/src/main/java/io/homeassistant/companion/android/notifications/MessagingManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import io.homeassistant.companion.android.common.notifications.createChannelID
import io.homeassistant.companion.android.common.notifications.getGroupNotificationBuilder
import io.homeassistant.companion.android.common.notifications.handleChannel
import io.homeassistant.companion.android.common.notifications.handleColor
import io.homeassistant.companion.android.common.notifications.handleDeleteIntent
import io.homeassistant.companion.android.common.notifications.handleSmallIcon
import io.homeassistant.companion.android.common.notifications.handleText
import io.homeassistant.companion.android.common.notifications.parseColor
Expand Down Expand Up @@ -935,7 +936,7 @@ class MessagingManager @Inject constructor(

handleReplyHistory(notificationBuilder, data)

handleDeleteIntent(notificationBuilder, data, messageId, group, groupId, id)
handleDeleteIntent(context, notificationBuilder, data, messageId, group, groupId, id)

handleContentIntent(notificationBuilder, data)

Expand Down Expand Up @@ -1033,29 +1034,6 @@ class MessagingManager @Inject constructor(
}
}

private fun handleDeleteIntent(
builder: NotificationCompat.Builder,
data: Map<String, String>,
messageId: Int,
group: String?,
groupId: Int,
databaseId: Long?
) {
val deleteIntent = Intent(context, NotificationDeleteReceiver::class.java).apply {
putExtra(NotificationDeleteReceiver.EXTRA_DATA, HashMap(data))
putExtra(NotificationDeleteReceiver.EXTRA_NOTIFICATION_GROUP, group)
putExtra(NotificationDeleteReceiver.EXTRA_NOTIFICATION_GROUP_ID, groupId)
putExtra(NotificationDeleteReceiver.EXTRA_NOTIFICATION_DB, databaseId)
}
val deletePendingIntent = PendingIntent.getBroadcast(
context,
messageId,
deleteIntent,
PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
builder.setDeleteIntent(deletePendingIntent)
}

private fun handlePersistent(
builder: NotificationCompat.Builder,
tag: String?,
Expand Down
5 changes: 5 additions & 0 deletions common/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
<action android:name="io.homeassistant.companion.android.UPDATE_SENSORS" />
</intent-filter>
</receiver>

<receiver
android:name=".notifications.NotificationDeleteReceiver"
android:enabled="true"
android:exported="true" />
</application>

</manifest>
2 changes: 1 addition & 1 deletion ...tifications/NotificationDeleteReceiver.kt → ...tifications/NotificationDeleteReceiver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.homeassistant.companion.android.notifications
package io.homeassistant.companion.android.common.notifications

import android.content.BroadcastReceiver
import android.content.Context
Expand Down
26 changes: 26 additions & 0 deletions ...ain/java/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package io.homeassistant.companion.android.common.notifications

import android.app.NotificationChannel
import android.app.NotificationManager
import android.app.PendingIntent
import android.content.Context
import android.content.Intent
import android.graphics.Color
import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter
Expand Down Expand Up @@ -290,3 +292,27 @@ fun clearNotification(context: Context, tag: String) {
val messageId = tag.hashCode()
notificationManagerCompat.cancel(tag, messageId, true)
}

fun handleDeleteIntent(
context: Context,
builder: NotificationCompat.Builder,
data: Map<String, String>,
messageId: Int,
group: String?,
groupId: Int,
databaseId: Long?
) {
val deleteIntent = Intent(context, NotificationDeleteReceiver::class.java).apply {
putExtra(NotificationDeleteReceiver.EXTRA_DATA, HashMap(data))
putExtra(NotificationDeleteReceiver.EXTRA_NOTIFICATION_GROUP, group)
putExtra(NotificationDeleteReceiver.EXTRA_NOTIFICATION_GROUP_ID, groupId)
putExtra(NotificationDeleteReceiver.EXTRA_NOTIFICATION_DB, databaseId)
}
val deletePendingIntent = PendingIntent.getBroadcast(
context,
messageId,
deleteIntent,
PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
builder.setDeleteIntent(deletePendingIntent)
}
1 change: 1 addition & 0 deletions wear/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>
</service>

</application>

</manifest>
3 changes: 3 additions & 0 deletions wear/src/main/java/io/homeassistant/companion/android/notifications/MessagingManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import io.homeassistant.companion.android.common.notifications.commandBeaconMoni
import io.homeassistant.companion.android.common.notifications.commandBleTransmitter
import io.homeassistant.companion.android.common.notifications.getGroupNotificationBuilder
import io.homeassistant.companion.android.common.notifications.handleChannel
import io.homeassistant.companion.android.common.notifications.handleDeleteIntent
import io.homeassistant.companion.android.common.notifications.handleSmallIcon
import io.homeassistant.companion.android.common.notifications.handleText
import io.homeassistant.companion.android.common.util.TextToSpeechData
Expand Down Expand Up @@ -116,6 +117,8 @@ class MessagingManager @Inject constructor(

handleText(notificationBuilder, data)

handleDeleteIntent(context, notificationBuilder, data, messageId, group, groupId, null)

notificationManagerCompat.apply {
Log.d(TAG, "Show notification with tag \"$tag\" and id \"$messageId\"")
notify(tag, messageId, notificationBuilder.build())
Expand Down