highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-27 18:26:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'vitorpamplona:main' into configurable-media-compression

Browse Source
This commit is contained in:
David Kaspar
2024-09-05 14:32:59 +01:00
committed by GitHub
parent e52e2bfdc9 a34c763656
commit 790b9359bd
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt
View File

@@ -32,7 +32,6 @@ import com.vitorpamplona.quartz.encoders.HexKey
import com.vitorpamplona.quartz.encoders.Nip47WalletConnect import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
import com.vitorpamplona.quartz.encoders.RelayUrlFormatter import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
import com.vitorpamplona.quartz.encoders.toHexKey import com.vitorpamplona.quartz.encoders.toHexKey
import com.vitorpamplona.quartz.encoders.toNpub
import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
import com.vitorpamplona.quartz.events.ContactListEvent import com.vitorpamplona.quartz.events.ContactListEvent
@@ -162,7 +161,7 @@ class AccountSettings(
} else { } else {
when (val packageName = externalSignerPackageName) { when (val packageName = externalSignerPackageName) {
null -> NostrSignerInternal(keyPair) null -> NostrSignerInternal(keyPair)
else -> NostrSignerExternal(keyPair.pubKey.toHexKey(), ExternalSignerLauncher(keyPair.pubKey.toNpub(), packageName)) else -> NostrSignerExternal(keyPair.pubKey.toHexKey(), ExternalSignerLauncher(keyPair.pubKey.toHexKey(), packageName))
} }
} }

1
amethyst/src/main/res/values-fr/strings.xml
View File

@@ -819,4 +819,5 @@
<string name="torrent_download">Télécharger</string> <string name="torrent_download">Télécharger</string>
<string name="torrent_failure">Échec de l\'ouverture du fichier</string> <string name="torrent_failure">Échec de l\'ouverture du fichier</string>
<string name="torrent_no_apps">Aucune application torrent installée pour ouvrir et télécharger le fichier.</string> <string name="torrent_no_apps">Aucune application torrent installée pour ouvrir et télécharger le fichier.</string>
<string name="select_list_to_filter">Sélectionnez une liste pour filtrer le fil</string>
</resources> </resources>

6
quartz/src/main/java/com/vitorpamplona/quartz/signers/ExternalSignerLauncher.kt
View File

@@ -92,7 +92,7 @@ class Result(
} }
class ExternalSignerLauncher( class ExternalSignerLauncher(
private val npub: String, private val currentUserPubKeyHex: String,
val signerPackageName: String, val signerPackageName: String,
) { ) {
private val contentCache = LruCache<String, (String) -> Unit>(50) private val contentCache = LruCache<String, (String) -> Unit>(50)
@@ -222,7 +222,7 @@ class ExternalSignerLauncher(
intent.putExtra("pubKey", pubKey) intent.putExtra("pubKey", pubKey)
intent.putExtra("id", id) intent.putExtra("id", id)
if (type !== SignerType.GET_PUBLIC_KEY) { if (type !== SignerType.GET_PUBLIC_KEY) {
intent.putExtra("current_user", npub) intent.putExtra("current_user", currentUserPubKeyHex)
} else { } else {
intent.putExtra("permissions", defaultPermissions()) intent.putExtra("permissions", defaultPermissions())
} }
@@ -278,7 +278,7 @@ class ExternalSignerLauncher(
): kotlin.Result<String?> { ): kotlin.Result<String?> {
val localData = val localData =
if (signerType !== SignerType.GET_PUBLIC_KEY) { if (signerType !== SignerType.GET_PUBLIC_KEY) {
arrayOf(*data, npub) arrayOf(*data, currentUserPubKeyHex)
} else { } else {
data data
} }