From be6b8ff9e680dc2f7c9bd09ce3c9b66b4070e165 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Thu, 2 Nov 2023 14:14:37 +0200
Subject: [PATCH] Fix notifications mapping
---
.../feature/notifications/NotifiableEventResolver.kt | 3 +--
.../main/java/org/futo/circles/model/NotificationAction.kt | 7 +++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/org/futo/circles/feature/notifications/NotifiableEventResolver.kt b/app/src/main/java/org/futo/circles/feature/notifications/NotifiableEventResolver.kt
index d8f1cf50c..9b749b3df 100644
--- a/app/src/main/java/org/futo/circles/feature/notifications/NotifiableEventResolver.kt
+++ b/app/src/main/java/org/futo/circles/feature/notifications/NotifiableEventResolver.kt
@@ -209,8 +209,7 @@ class NotifiableEventResolver @Inject constructor(
payload = result.clearEvent,
senderKey = result.senderCurve25519Key,
keysClaimed = result.claimedEd25519Key?.let { mapOf("ed25519" to it) },
- forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain,
- isSafe = result.isSafe
+ forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
)
} catch (ignore: MXCryptoError) {
}
diff --git a/app/src/main/java/org/futo/circles/model/NotificationAction.kt b/app/src/main/java/org/futo/circles/model/NotificationAction.kt
index 43fda9a57..78a9ce7f1 100644
--- a/app/src/main/java/org/futo/circles/model/NotificationAction.kt
+++ b/app/src/main/java/org/futo/circles/model/NotificationAction.kt
@@ -3,9 +3,9 @@ package org.futo.circles.model
import org.matrix.android.sdk.api.session.pushrules.Action
data class NotificationAction(
- val shouldNotify: Boolean,
- val highlight: Boolean,
- val soundName: String?
+ val shouldNotify: Boolean,
+ val highlight: Boolean,
+ val soundName: String?
)
fun List<Action>.toNotificationAction(): NotificationAction {
@@ -15,7 +15,6 @@ fun List<Action>.toNotificationAction(): NotificationAction {
forEach { action ->
when (action) {
is Action.Notify -> shouldNotify = true
- is Action.DoNotNotify -> shouldNotify = false
is Action.Highlight -> highlight = action.highlight
is Action.Sound -> sound = action.sound
}
--
GitLab