Browse Source
* Notifications: Add some extra mappings so we keep the original contents and can pass it later to an UI layer * Fix notifications not appearing for a room if the app was on that room when it went to background. * Modernize how we create spannable strings for notifications, remove unneeded dependency * Remove actions from invite notifications temporarily * Add `NotificationDrawerManager` interface to be able to clear membership notifications when accepting or rejecting a room invite * Fix tests * Add comment to clarify some weird behaviours * Address review comments * Set circle shape for `largeBitmap` in message notifications * Fix no avatar in DM rooms * Fix rebase issues * Add invite list pending intent: - Refactor pending intents. - Make `DeepLinkData` a sealed interface. - Fix and add tests. * Rename `navigate__` functions to `attach__` * Add an extra test case for the `InviteList` deep link * Address most review comments. * Fix rebase issue * Add fallback notification type, allow dismissing invite notifications. Fallback notifications have a different underlying type and can be dismissed at will. * Fix testspull/835/head
Jorge Martin Espinosa
1 year ago
committed by
GitHub
55 changed files with 905 additions and 327 deletions
@ -0,0 +1,25 @@ |
|||||||
|
/* |
||||||
|
* 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.api.notifications |
||||||
|
|
||||||
|
import io.element.android.libraries.matrix.api.core.RoomId |
||||||
|
import io.element.android.libraries.matrix.api.core.SessionId |
||||||
|
|
||||||
|
interface NotificationDrawerManager { |
||||||
|
fun clearMembershipNotificationForSession(sessionId: SessionId) |
||||||
|
fun clearMembershipNotificationForRoom(sessionId: SessionId, roomId: RoomId) |
||||||
|
} |
@ -0,0 +1,33 @@ |
|||||||
|
/* |
||||||
|
* 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.di |
||||||
|
|
||||||
|
import com.squareup.anvil.annotations.ContributesTo |
||||||
|
import dagger.Binds |
||||||
|
import dagger.Module |
||||||
|
import io.element.android.libraries.di.AppScope |
||||||
|
import io.element.android.libraries.push.api.notifications.NotificationDrawerManager |
||||||
|
import io.element.android.libraries.push.impl.notifications.DefaultNotificationDrawerManager |
||||||
|
|
||||||
|
@Module |
||||||
|
@ContributesTo(AppScope::class) |
||||||
|
abstract class PushBindsModule { |
||||||
|
@Binds |
||||||
|
abstract fun bindNotificationDrawerManager( |
||||||
|
defaultNotificationDrawerManager: DefaultNotificationDrawerManager |
||||||
|
): NotificationDrawerManager |
||||||
|
} |
@ -0,0 +1,37 @@ |
|||||||
|
/* |
||||||
|
* 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.model |
||||||
|
|
||||||
|
import io.element.android.libraries.matrix.api.core.EventId |
||||||
|
import io.element.android.libraries.matrix.api.core.RoomId |
||||||
|
import io.element.android.libraries.matrix.api.core.SessionId |
||||||
|
|
||||||
|
/** |
||||||
|
* Used for notifications with events that couldn't be retrieved or decrypted, so we don't know their contents. |
||||||
|
* These are created separately from message notifications, so they can be displayed differently. |
||||||
|
*/ |
||||||
|
data class FallbackNotifiableEvent( |
||||||
|
override val sessionId: SessionId, |
||||||
|
override val roomId: RoomId, |
||||||
|
override val eventId: EventId, |
||||||
|
override val editedEventId: EventId?, |
||||||
|
override val description: String?, |
||||||
|
override val canBeReplaced: Boolean, |
||||||
|
override val isRedacted: Boolean, |
||||||
|
override val isUpdated: Boolean, |
||||||
|
val timestamp: Long, |
||||||
|
) : NotifiableEvent |
@ -0,0 +1,29 @@ |
|||||||
|
/* |
||||||
|
* 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. |
||||||
|
*/ |
||||||
|
|
||||||
|
plugins { |
||||||
|
id("io.element.android-library") |
||||||
|
} |
||||||
|
|
||||||
|
android { |
||||||
|
namespace = "io.element.android.libraries.push.test" |
||||||
|
} |
||||||
|
|
||||||
|
dependencies { |
||||||
|
api(projects.libraries.push.api) |
||||||
|
implementation(projects.libraries.matrix.api) |
||||||
|
implementation(projects.tests.testutils) |
||||||
|
} |
@ -0,0 +1,48 @@ |
|||||||
|
/* |
||||||
|
* 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.test.notifications |
||||||
|
|
||||||
|
import io.element.android.libraries.matrix.api.core.RoomId |
||||||
|
import io.element.android.libraries.matrix.api.core.SessionId |
||||||
|
import io.element.android.libraries.push.api.notifications.NotificationDrawerManager |
||||||
|
|
||||||
|
class FakeNotificationDrawerManager : NotificationDrawerManager { |
||||||
|
private val clearMemberShipNotificationForSessionCallsCount = mutableMapOf<String, Int>() |
||||||
|
private val clearMemberShipNotificationForRoomCallsCount = mutableMapOf<String, Int>() |
||||||
|
|
||||||
|
override fun clearMembershipNotificationForSession(sessionId: SessionId) { |
||||||
|
clearMemberShipNotificationForSessionCallsCount.merge(sessionId.value, 1) { oldValue, value -> oldValue + value } |
||||||
|
} |
||||||
|
|
||||||
|
override fun clearMembershipNotificationForRoom(sessionId: SessionId, roomId: RoomId) { |
||||||
|
val key = getMembershipNotificationKey(sessionId, roomId) |
||||||
|
clearMemberShipNotificationForRoomCallsCount.merge(key, 1) { oldValue, value -> oldValue + value } |
||||||
|
} |
||||||
|
|
||||||
|
fun getClearMembershipNotificationForSessionCount(sessionId: SessionId): Int { |
||||||
|
return clearMemberShipNotificationForRoomCallsCount[sessionId.value] ?: 0 |
||||||
|
} |
||||||
|
|
||||||
|
fun getClearMembershipNotificationForRoomCount(sessionId: SessionId, roomId: RoomId): Int { |
||||||
|
val key = getMembershipNotificationKey(sessionId, roomId) |
||||||
|
return clearMemberShipNotificationForRoomCallsCount[key] ?: 0 |
||||||
|
} |
||||||
|
|
||||||
|
private fun getMembershipNotificationKey(sessionId: SessionId, roomId: RoomId): String { |
||||||
|
return "$sessionId-$roomId" |
||||||
|
} |
||||||
|
} |
Loading…
Reference in new issue