summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2025-05-15 10:45:41 +0200
committerDavid Göransson <david.goransson@mullvad.net>2025-05-15 13:23:36 +0200
commit986a4560540ff1ad3fe13c0bd9b4708ab7a9ab62 (patch)
tree4b683ef035364e5680b46eacef860a495346e983
parent4b3a06f022dc83fa2b0ce0bcf43af8b4b500d767 (diff)
downloadmullvadvpn-986a4560540ff1ad3fe13c0bd9b4708ab7a9ab62.tar.xz
mullvadvpn-986a4560540ff1ad3fe13c0bd9b4708ab7a9ab62.zip
Rework StatusLevel
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/InAppNotificationController.kt2
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/InAppNotification.kt8
2 files changed, 5 insertions, 5 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/InAppNotificationController.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/InAppNotificationController.kt
index 752e185d14..a792d2347a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/InAppNotificationController.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/InAppNotificationController.kt
@@ -33,8 +33,8 @@ class InAppNotificationController(
.map {
it.sortedWith(
compareBy(
- { notification -> notification.statusLevel.ordinal },
{ notification -> -notification.priority },
+ { notification -> notification.statusLevel.ordinal },
)
)
}
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/InAppNotification.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/InAppNotification.kt
index b1cc474af4..7a681da66c 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/InAppNotification.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/InAppNotification.kt
@@ -20,17 +20,17 @@ sealed class InAppNotification {
} else {
StatusLevel.Error
}
- override val priority: Long = 1001
+ override val priority: Long = 1004
}
data object TunnelStateBlocked : InAppNotification() {
override val statusLevel = StatusLevel.None
- override val priority: Long = 1000
+ override val priority: Long = 1003
}
data class UnsupportedVersion(val versionInfo: VersionInfo) : InAppNotification() {
override val statusLevel = StatusLevel.Error
- override val priority: Long = 999
+ override val priority: Long = 1002
}
data class AccountExpiry(val expiry: Duration) : InAppNotification() {
@@ -45,6 +45,6 @@ sealed class InAppNotification {
data object NewVersionChangelog : InAppNotification() {
override val statusLevel = StatusLevel.Info
- override val priority: Long = 1001
+ override val priority: Long = 1000
}
}