From 6927e26bd276202f9fad260dacf2583925cce443 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 14 Apr 2023 17:17:52 +0200 Subject: [PATCH] rename package --- .../impl/notifications/NotificationUtils.kt | 19 ++++++++++--------- .../AcceptInvitationActionFactory.kt | 2 +- .../MarkAsReadActionFactory.kt | 2 +- .../QuickReplyActionFactory.kt | 2 +- .../RejectInvitationActionFactory.kt | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) rename libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/{actions => factories}/AcceptInvitationActionFactory.kt (97%) rename libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/{actions => factories}/MarkAsReadActionFactory.kt (97%) rename libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/{actions => factories}/QuickReplyActionFactory.kt (98%) rename libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/{actions => factories}/RejectInvitationActionFactory.kt (97%) diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationUtils.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationUtils.kt index 196f7efb05..83bf1fb414 100755 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationUtils.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationUtils.kt @@ -50,10 +50,10 @@ import io.element.android.libraries.matrix.api.core.SessionId import io.element.android.libraries.matrix.api.core.ThreadId import io.element.android.libraries.push.impl.R import io.element.android.libraries.push.impl.intent.IntentProvider -import io.element.android.libraries.push.impl.notifications.actions.AcceptInvitationActionFactory -import io.element.android.libraries.push.impl.notifications.actions.MarkAsReadActionFactory -import io.element.android.libraries.push.impl.notifications.actions.QuickReplyActionFactory -import io.element.android.libraries.push.impl.notifications.actions.RejectInvitationActionFactory +import io.element.android.libraries.push.impl.notifications.factories.AcceptInvitationActionFactory +import io.element.android.libraries.push.impl.notifications.factories.MarkAsReadActionFactory +import io.element.android.libraries.push.impl.notifications.factories.QuickReplyActionFactory +import io.element.android.libraries.push.impl.notifications.factories.RejectInvitationActionFactory import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent import io.element.android.libraries.push.impl.notifications.model.SimpleNotifiableEvent import io.element.android.services.toolbox.api.strings.StringProvider @@ -306,7 +306,7 @@ class NotificationUtils @Inject constructor( if (largeIcon != null) { setLargeIcon(largeIcon) } - setDeleteIntent(getDismissRoomPendingIntent(roomInfo)) + setDeleteIntent(getDismissRoomPendingIntent(roomInfo.sessionId, roomInfo.roomId)) } .setTicker(tickerText) .build() @@ -471,7 +471,7 @@ class NotificationUtils @Inject constructor( private fun getDismissSummaryPendingIntent(sessionId: SessionId): PendingIntent { val intent = Intent(context, NotificationBroadcastReceiver::class.java) intent.action = actionIds.dismissSummary - intent.data = createIgnoredUri("deleteSummary?$sessionId") + intent.data = createIgnoredUri("deleteSummary?${sessionId.value}") intent.putExtra(NotificationBroadcastReceiver.KEY_SESSION_ID, sessionId) return PendingIntent.getBroadcast( context, @@ -481,11 +481,12 @@ class NotificationUtils @Inject constructor( ) } - private fun getDismissRoomPendingIntent(roomInfo: RoomEventGroupInfo): PendingIntent { + private fun getDismissRoomPendingIntent(sessionId: SessionId, roomId: RoomId): PendingIntent { val intent = Intent(context, NotificationBroadcastReceiver::class.java) intent.action = actionIds.dismissRoom - intent.putExtra(NotificationBroadcastReceiver.KEY_SESSION_ID, roomInfo.sessionId) - intent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomInfo.roomId) + intent.data = createIgnoredUri("deleteRoom?${sessionId.value}&${roomId.value}") + intent.putExtra(NotificationBroadcastReceiver.KEY_SESSION_ID, sessionId) + intent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomId) return PendingIntent.getBroadcast( context, clock.epochMillis().toInt(), diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/AcceptInvitationActionFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/AcceptInvitationActionFactory.kt similarity index 97% rename from libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/AcceptInvitationActionFactory.kt rename to libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/AcceptInvitationActionFactory.kt index 00ea4e407d..e9be6aafb7 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/AcceptInvitationActionFactory.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/AcceptInvitationActionFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.push.impl.notifications.actions +package io.element.android.libraries.push.impl.notifications.factories import android.app.PendingIntent import android.content.Context diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/MarkAsReadActionFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/MarkAsReadActionFactory.kt similarity index 97% rename from libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/MarkAsReadActionFactory.kt rename to libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/MarkAsReadActionFactory.kt index 54159c23cc..52b01dd8f9 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/MarkAsReadActionFactory.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/MarkAsReadActionFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.push.impl.notifications.actions +package io.element.android.libraries.push.impl.notifications.factories import android.app.PendingIntent import android.content.Context diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/QuickReplyActionFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/QuickReplyActionFactory.kt similarity index 98% rename from libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/QuickReplyActionFactory.kt rename to libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/QuickReplyActionFactory.kt index 6139fab6bb..07e3053b4d 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/QuickReplyActionFactory.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/QuickReplyActionFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.push.impl.notifications.actions +package io.element.android.libraries.push.impl.notifications.factories import android.app.PendingIntent import android.content.Context diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/RejectInvitationActionFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/RejectInvitationActionFactory.kt similarity index 97% rename from libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/RejectInvitationActionFactory.kt rename to libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/RejectInvitationActionFactory.kt index 8b571d3318..b49115b4e5 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/RejectInvitationActionFactory.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/RejectInvitationActionFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.push.impl.notifications.actions +package io.element.android.libraries.push.impl.notifications.factories import android.app.PendingIntent import android.content.Context