nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix double encryption on nip04

Browse Source
This commit is contained in:
greenart7c3
2023-10-11 15:14:10 -03:00
parent dd2e590475
commit 173245d900
1 changed files with 86 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/service/ExternalSignerUtils.kt
+36 -38
View File
@@ -156,11 +156,7 @@ object ExternalSignerUtils {
checkNotInMainThread()
val result = getDataFromResolver(SignerType.SIGN_EVENT, arrayOf(event.toJson(), event.pubKey()), columnName)
if (result !== null) {
content.put(event.id(), result)
return
}
if (result == null) {
ServiceManager.shouldPauseService = false
isActivityRunning = true
openSigner(
@@ -173,15 +169,14 @@ object ExternalSignerUtils {
while (isActivityRunning) {
Thread.sleep(100)
}
} else {
content.put(event.id(), result)
}
}
fun decryptBlockList(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
if (result !== null) {
content.put(id, result)
cachedDecryptedContent[id] = result
return
}
if (result == null) {
isActivityRunning = true
openSigner(
encryptedContent,
@@ -190,6 +185,10 @@ object ExternalSignerUtils {
pubKey,
id
)
} else {
content.put(id, result)
cachedDecryptedContent[id] = result
}
}
fun getDataFromResolver(signerType: SignerType, data: Array<out String>, columnName: String = "signature"): String? {
@@ -206,7 +205,9 @@ object ExternalSignerUtils {
null,
null
).use {
if (it !== null) {
if (it == null) {
return null
}
if (it.moveToFirst()) {
val index = it.getColumnIndex(columnName)
if (index < 0) {
@@ -216,18 +217,12 @@ object ExternalSignerUtils {
return it.getString(index)
}
}
}
return null
}
fun decrypt(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
if (result !== null) {
content.put(id, result)
cachedDecryptedContent[id] = result
return
}
if (result == null) {
isActivityRunning = true
openSigner(
encryptedContent,
@@ -239,15 +234,15 @@ object ExternalSignerUtils {
while (isActivityRunning) {
// do nothing
}
} else {
content.put(id, result)
cachedDecryptedContent[id] = result
}
}
fun decryptDM(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
if (result !== null) {
content.put(id, result)
cachedDecryptedContent[id] = result
return
}
if (result == null) {
openSigner(
encryptedContent,
signerType,
@@ -255,15 +250,15 @@ object ExternalSignerUtils {
pubKey,
id
)
} else {
content.put(id, result)
cachedDecryptedContent[id] = result
}
}
fun decryptBookmark(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
if (result !== null) {
content.put(id, result)
cachedDecryptedContent[id] = result
return
}
if (result == null) {
openSigner(
encryptedContent,
signerType,
@@ -271,17 +266,17 @@ object ExternalSignerUtils {
pubKey,
id
)
} else {
content.put(id, result)
cachedDecryptedContent[id] = result
}
}
fun encrypt(decryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_ENCRYPT) {
content.remove(id)
cachedDecryptedContent.remove(id)
val result = getDataFromResolver(signerType, arrayOf(decryptedContent, pubKey))
if (result !== null) {
content.put(id, result)
return
}
if (result == null) {
isActivityRunning = true
openSigner(
decryptedContent,
@@ -293,15 +288,14 @@ object ExternalSignerUtils {
while (isActivityRunning) {
Thread.sleep(100)
}
} else {
content.put(id, result)
}
}
fun decryptZapEvent(event: LnZapRequestEvent) {
val result = getDataFromResolver(SignerType.DECRYPT_ZAP_EVENT, arrayOf(event.toJson(), event.pubKey))
if (result !== null) {
content.put(event.id, result)
cachedDecryptedContent[event.id] = result
return
}
if (result == null) {
openSigner(
event.toJson(),
SignerType.DECRYPT_ZAP_EVENT,
@@ -309,5 +303,9 @@ object ExternalSignerUtils {
event.pubKey,
event.id
)
} else {
content.put(event.id, result)
cachedDecryptedContent[event.id] = result
}
}
}