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 d8f1cf50c6814195edb1e163c1bcb7b0a486998c..9b749b3df705cc6f1d39460d6bb65b9d0dc9f2b9 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 43fda9a57df0ae58d3b2b34359b10fa8593e550f..78a9ce7f170172447eb68277dc36f4917e20529a 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 }