Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

rename package

Browse source
This commit is contained in:
Benoit Marty 2023-04-14 17:17:52 +02:00
parent a9881341f1
commit 0677b10de3
5 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationUtils.kt
View file

@ -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.matrix.api.core.ThreadId
import io.element.android.libraries.push.impl.R import io.element.android.libraries.push.impl.R
import io.element.android.libraries.push.impl.intent.IntentProvider 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.factories.AcceptInvitationActionFactory
import io.element.android.libraries.push.impl.notifications.actions.MarkAsReadActionFactory import io.element.android.libraries.push.impl.notifications.factories.MarkAsReadActionFactory
import io.element.android.libraries.push.impl.notifications.actions.QuickReplyActionFactory import io.element.android.libraries.push.impl.notifications.factories.QuickReplyActionFactory
import io.element.android.libraries.push.impl.notifications.actions.RejectInvitationActionFactory 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.InviteNotifiableEvent
import io.element.android.libraries.push.impl.notifications.model.SimpleNotifiableEvent import io.element.android.libraries.push.impl.notifications.model.SimpleNotifiableEvent
import io.element.android.services.toolbox.api.strings.StringProvider import io.element.android.services.toolbox.api.strings.StringProvider
@ -306,7 +306,7 @@ class NotificationUtils @Inject constructor(
if (largeIcon != null) { if (largeIcon != null) {
setLargeIcon(largeIcon) setLargeIcon(largeIcon)
} }
setDeleteIntent(getDismissRoomPendingIntent(roomInfo)) setDeleteIntent(getDismissRoomPendingIntent(roomInfo.sessionId, roomInfo.roomId))
} }
.setTicker(tickerText) .setTicker(tickerText)
.build() .build()
@ -471,7 +471,7 @@ class NotificationUtils @Inject constructor(
private fun getDismissSummaryPendingIntent(sessionId: SessionId): PendingIntent { private fun getDismissSummaryPendingIntent(sessionId: SessionId): PendingIntent {
val intent = Intent(context, NotificationBroadcastReceiver::class.java) val intent = Intent(context, NotificationBroadcastReceiver::class.java)
intent.action = actionIds.dismissSummary intent.action = actionIds.dismissSummary
intent.data = createIgnoredUri("deleteSummary?$sessionId") intent.data = createIgnoredUri("deleteSummary?${sessionId.value}")
intent.putExtra(NotificationBroadcastReceiver.KEY_SESSION_ID, sessionId) intent.putExtra(NotificationBroadcastReceiver.KEY_SESSION_ID, sessionId)
return PendingIntent.getBroadcast( return PendingIntent.getBroadcast(
context, 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) val intent = Intent(context, NotificationBroadcastReceiver::class.java)
intent.action = actionIds.dismissRoom intent.action = actionIds.dismissRoom
intent.putExtra(NotificationBroadcastReceiver.KEY_SESSION_ID, roomInfo.sessionId) intent.data = createIgnoredUri("deleteRoom?${sessionId.value}&${roomId.value}")
intent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomInfo.roomId) intent.putExtra(NotificationBroadcastReceiver.KEY_SESSION_ID, sessionId)
intent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomId)
return PendingIntent.getBroadcast( return PendingIntent.getBroadcast(
context, context,
clock.epochMillis().toInt(), clock.epochMillis().toInt(),

2
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/AcceptInvitationActionFactory.kt → libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/AcceptInvitationActionFactory.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * 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.app.PendingIntent
import android.content.Context import android.content.Context

2
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/MarkAsReadActionFactory.kt → libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/MarkAsReadActionFactory.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * 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.app.PendingIntent
import android.content.Context import android.content.Context

2
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/QuickReplyActionFactory.kt → libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/QuickReplyActionFactory.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * 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.app.PendingIntent
import android.content.Context import android.content.Context

2
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/actions/RejectInvitationActionFactory.kt → libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/RejectInvitationActionFactory.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * 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.app.PendingIntent
import android.content.Context import android.content.Context