highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-11-10 20:46:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'vitorpamplona:main' into profiles-list-management

Browse Source
This commit is contained in:
KotlinGeekDev
2025-08-28 15:08:48 +00:00
committed by GitHub
parent a23bc875cf da5816a6c6
commit e3cfa76843
8 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
View File

@@ -117,10 +117,11 @@ class Amethyst : Application() {
// Connects the NostrClient class with okHttp
val websocketBuilder =
OkHttpWebSocket.Builder { url ->
val useTor = torProxySettingsAnchor.useProxy(url)
if (torProxySettingsAnchor.isDM(url)) {
okHttpClientForRelaysForDms.getHttpClient(torProxySettingsAnchor.useProxy(url))
okHttpClientForRelaysForDms.getHttpClient(useTor)
} else {
okHttpClientForRelays.getHttpClient(torProxySettingsAnchor.useProxy(url))
okHttpClientForRelays.getHttpClient(useTor)
}
}

9
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt
View File

@@ -341,7 +341,14 @@ fun UpdateZapAmountContent(
IconButton(
onClick = {
clipboardManager.getText()?.let { postViewModel.copyFromClipboard(it.text) }
val uri = clipboardManager.getText()?.text
try {
uri?.let {
postViewModel.copyFromClipboard(it)
}
} catch (e: IllegalArgumentException) {
accountViewModel.toastManager.toast(R.string.invalid_nip47_uri_title, R.string.invalid_nip47_uri_description)
}
},
) {
Icon(

2
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
View File

@@ -1485,7 +1485,7 @@ class AccountViewModel(
dvmPublicKey: User,
onReady: (event: Note) -> Unit,
) {
viewModelScope.launch(Dispatchers.IO) {
runIOCatching {
account.requestDVMContentDiscovery(dvmPublicKey) {
onReady(LocalCache.getOrCreateNote(it.id))
}

2
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorSettings.kt
View File

@@ -27,7 +27,7 @@ class TorSettings(
val externalSocksPort: Int = 9050,
val onionRelaysViaTor: Boolean = true,
val dmRelaysViaTor: Boolean = true,
val newRelaysViaTor: Boolean = true,
val newRelaysViaTor: Boolean = false,
val trustedRelaysViaTor: Boolean = false,
val urlPreviewsViaTor: Boolean = false,
val profilePicsViaTor: Boolean = false,

2
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorSettingsFlow.kt
View File

@@ -27,7 +27,7 @@ class TorSettingsFlow(
val externalSocksPort: MutableStateFlow<Int> = MutableStateFlow(9050),
val onionRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(true),
val dmRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(true),
val newRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(true),
val newRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
val trustedRelaysViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
val urlPreviewsViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),
val profilePicsViaTor: MutableStateFlow<Boolean> = MutableStateFlow(false),

4
amethyst/src/main/res/values/strings.xml
View File

@@ -787,6 +787,10 @@
<string name="paste_from_clipboard">Paste from clipboard</string>
<string name="invalid_nip47_uri_title">Invalid NIP-47 URI</string>
<string name="invalid_nip47_uri_description">The URI %1$s is not a valid NIP-47 login URI.</string>
<string name="language_description">For the App\'s Interface</string>
<string name="theme_description">Dark, Light or System theme</string>
<string name="automatically_load_images_gifs_description">Automatically load images and GIFs</string>

4
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip01Core/metadata/MetadataEvent.kt
View File

@@ -117,7 +117,7 @@ class MetadataEvent(
lnURL?.let { addIfNotBlank(currentMetadata, Lud06Tag.TAG_NAME, it.trim()) }
return eventTemplate(KIND, currentMetadata.toString(), createdAt) {
alt("User profile for ${currentMetadata.get("name").asText() ?: "Anonymous"}")
alt("User profile for ${currentMetadata.get("name")?.asText() ?: "Anonymous"}")
// For https://github.com/nostr-protocol/nips/pull/1770
currentMetadata.get(NameTag.TAG_NAME)?.asText()?.let { name(it) }
@@ -132,7 +132,7 @@ class MetadataEvent(
currentMetadata.get(Lud06Tag.TAG_NAME)?.asText()?.let { lud06(it) }
twitter?.let { twitterClaim(it) }
?: mastodon?.let { mastodonClaim(it) }
mastodon?.let { mastodonClaim(it) }
github?.let { githubClaim(it) }
initializer()

8
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/Response.kt
View File

@@ -37,9 +37,9 @@ class PayInvoiceSuccessResponse(
val result: PayInvoiceResultParams? = null,
) : Response("pay_invoice") {
class PayInvoiceResultParams(
val preimage: String,
val preimage: String? = null,
) {
fun countMemory(): Long = pointerSizeInBytes + preimage.bytesUsedInMemory()
fun countMemory(): Long = pointerSizeInBytes + (preimage?.bytesUsedInMemory() ?: 0)
}
override fun countMemory(): Long = pointerSizeInBytes + (result?.countMemory() ?: 0)
@@ -49,8 +49,8 @@ class PayInvoiceErrorResponse(
val error: PayInvoiceErrorParams? = null,
) : Response("pay_invoice") {
class PayInvoiceErrorParams(
val code: ErrorType?,
val message: String?,
val code: ErrorType? = null,
val message: String? = null,
) {
fun countMemory(): Long = pointerSizeInBytes + pointerSizeInBytes + (message?.bytesUsedInMemory() ?: 0)
}