From d650a289043d677ca6113472c6db567ef770762d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 5 Apr 2023 09:46:49 +0200 Subject: [PATCH] Finish and test NotificationIdProvider --- .../android/libraries/matrix/test/TestData.kt | 2 ++ .../notifications/NotificationIdProvider.kt | 8 ++--- .../NotificationIdProviderTest.kt | 36 +++++++++++++++++++ 3 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationIdProviderTest.kt diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/TestData.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/TestData.kt index fe9ab7e37f..ec749025dc 100644 --- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/TestData.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/TestData.kt @@ -28,7 +28,9 @@ const val A_USER_NAME = "alice" const val A_PASSWORD = "password" val A_USER_ID = UserId("@alice:server.org") +val A_USER_ID_2 = UserId("@bob:server.org") val A_SESSION_ID = SessionId(A_USER_ID.value) +val A_SESSION_ID_2 = SessionId(A_USER_ID_2.value) val A_SPACE_ID = SpaceId("!aSpaceId") val A_ROOM_ID = RoomId("!aRoomId") val A_ROOM_ID_2 = RoomId("!aRoomId2") diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationIdProvider.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationIdProvider.kt index 04fc43221b..3ce941de2f 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationIdProvider.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationIdProvider.kt @@ -16,12 +16,10 @@ package io.element.android.libraries.push.impl.notifications -import io.element.android.libraries.di.AppScope -import io.element.android.libraries.di.SingleIn import io.element.android.libraries.matrix.api.core.SessionId import javax.inject.Inject +import kotlin.math.abs -@SingleIn(AppScope::class) class NotificationIdProvider @Inject constructor() { fun getSummaryNotificationId(sessionId: SessionId): Int { return getOffset(sessionId) + SUMMARY_NOTIFICATION_ID @@ -40,8 +38,8 @@ class NotificationIdProvider @Inject constructor() { } private fun getOffset(sessionId: SessionId): Int { - // TODO EAx multi account: return different value for users and persist data - return 0 + // Compute a int from a string with a low risk of collision. + return abs(sessionId.value.hashCode() % 100_000) * 10 } companion object { diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationIdProviderTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationIdProviderTest.kt new file mode 100644 index 0000000000..57f28e72db --- /dev/null +++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationIdProviderTest.kt @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2023 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.libraries.push.impl.notifications + +import com.google.common.truth.Truth.assertThat +import io.element.android.libraries.matrix.test.A_SESSION_ID +import io.element.android.libraries.matrix.test.A_SESSION_ID_2 +import org.junit.Test + +class NotificationIdProviderTest { + @Test + fun `test notification id provider`() { + val sut = NotificationIdProvider() + val offsetForASessionId = 305410 + assertThat(sut.getSummaryNotificationId(A_SESSION_ID)).isEqualTo(offsetForASessionId + 0) + assertThat(sut.getRoomMessagesNotificationId(A_SESSION_ID)).isEqualTo(offsetForASessionId + 1) + assertThat(sut.getRoomEventNotificationId(A_SESSION_ID)).isEqualTo(offsetForASessionId + 2) + assertThat(sut.getRoomInvitationNotificationId(A_SESSION_ID)).isEqualTo(offsetForASessionId + 3) + // Check that value will be different for another sessionId + assertThat(sut.getSummaryNotificationId(A_SESSION_ID)).isNotEqualTo(sut.getSummaryNotificationId(A_SESSION_ID_2)) + } +}