laantungir/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2026-08-11 16:57:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes tests

Browse Source
This commit is contained in:
Vitor Pamplona
2026-06-23 11:08:24 -04:00
parent f6ea3e1999
commit 1eca812aec
3 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/androidTest/java/com/vitorpamplona/amethyst/NotificationFeedFilterModeOverrideTest.kt
+10 -7
View File
@@ -67,13 +67,16 @@ class NotificationFeedFilterModeOverrideTest {
private val client =
NostrClient(
OkHttpWebSocket.Builder {
OkHttpClient
.Builder()
.followRedirects(true)
.followSslRedirects(true)
.build()
},
OkHttpWebSocket.Builder(
httpClient = {
OkHttpClient
.Builder()
.followRedirects(true)
.followSslRedirects(true)
.build()
},
canDial = { true },
),
scope,
)
amethyst/src/androidTest/java/com/vitorpamplona/amethyst/ThreadDualAxisChartAssemblerTest.kt
+10 -7
View File
@@ -58,13 +58,16 @@ class ThreadDualAxisChartAssemblerTest {
val client =
NostrClient(
OkHttpWebSocket.Builder {
OkHttpClient
.Builder()
.followRedirects(true)
.followSslRedirects(true)
.build()
},
OkHttpWebSocket.Builder(
httpClient = {
OkHttpClient
.Builder()
.followRedirects(true)
.followSslRedirects(true)
.build()
},
canDial = { true },
),
scope,
)
amethyst/src/main/java/com/vitorpamplona/amethyst/napplet/gateways/AccountNappletGateways.kt
+12 -5
View File
@@ -57,6 +57,7 @@ import com.vitorpamplona.quartz.utils.sha256.sha256
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.withTimeout
import java.io.ByteArrayInputStream
import kotlin.time.Duration.Companion.seconds
/**
* The account adapter: turns a signed-in [Account] into a configured [NappletBroker] by wiring the
@@ -137,6 +138,8 @@ class AccountNappletGateways(
body: String,
) {
val manager = NotificationManagerCompat.from(context)
if (!manager.areNotificationsEnabled()) return
val channel =
NotificationChannelCompat
.Builder(NOTIFY_CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_DEFAULT)
@@ -151,7 +154,11 @@ class AccountNappletGateways(
.setContentText(body)
.setAutoCancel(true)
.build()
manager.notify(id.hashCode(), notification)
try {
manager.notify(id.hashCode(), notification)
} catch (_: SecurityException) {
// Best effort: if the user revoked permission between the check and here, just no-op.
}
}
/**
@@ -213,7 +220,7 @@ class AccountNappletGateways(
emptyList()
} else {
runCatching {
account.client.fetchAll(filters = relays.associateWith { filters }, timeoutMs = QUERY_TIMEOUT_MS)
account.client.fetchAll(filters = relays.associateWith { filters }, timeoutMs = QUERY_TIMEOUT.inWholeMilliseconds)
}.getOrDefault(emptyList())
}
val fromCache = filters.flatMap { filter -> account.cache.filter(filter).mapNotNull { it.event } }
@@ -245,12 +252,12 @@ class AccountNappletGateways(
else -> result.completeExceptionally(RuntimeException("Unexpected wallet response."))
}
}
return withTimeout(WALLET_TIMEOUT_MS) { result.await() }
return withTimeout(WALLET_TIMEOUT) { result.await() }
}
companion object {
private const val QUERY_TIMEOUT_MS = 8_000L
private const val WALLET_TIMEOUT_MS = 60_000L
private val QUERY_TIMEOUT = 8.seconds
private val WALLET_TIMEOUT = 60.seconds
/** Amethyst's brand purple (`AmethystPurple`, commons Colors.kt), exposed as the theme primary. */
private const val AMETHYST_PURPLE = "#9A82DB"