nostr/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2024-09-29 16:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix decryption of dms whe new message is send

Browse Source
This commit is contained in:
greenart7c3 2023-09-15 20:46:29 -03:00
parent 6876a7f0d2
commit 3d80ee1984
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/com/vitorpamplona/amethyst/service/AmberUtils.kt
View File

@ -30,6 +30,7 @@ object AmberUtils {
val cachedDecryptedContent = mutableMapOf<HexKey, String>()
lateinit var account: Account
lateinit var activityResultLauncher: ActivityResultLauncher<Intent>
lateinit var decryptResultLauncher: ActivityResultLauncher<Intent>
lateinit var blockListResultLauncher: ActivityResultLauncher<Intent>
lateinit var signEventResultLauncher: ActivityResultLauncher<Intent>
@ -62,6 +63,32 @@ object AmberUtils {
activityResultLauncher = activity.registerForActivityResult(
ActivityResultContracts.StartActivityForResult()
) {
if (it.resultCode != Activity.RESULT_OK) {
GlobalScope.launch(Dispatchers.Main) {
Toast.makeText(
Amethyst.instance,
"Sign request rejected",
Toast.LENGTH_SHORT
).show()
}
} else {
val event = it.data?.getStringExtra("signature") ?: ""
val id = it.data?.getStringExtra("id") ?: ""
if (id.isNotBlank()) {
content.put(id, event)
}
}
isActivityRunning = false
ServiceManager.shouldPauseService = true
GlobalScope.launch(Dispatchers.IO) {
isActivityRunning = false
ServiceManager.shouldPauseService = true
}
}
decryptResultLauncher = activity.registerForActivityResult(
ActivityResultContracts.StartActivityForResult()
) {
if (it.resultCode != Activity.RESULT_OK) {
GlobalScope.launch(Dispatchers.Main) {
@ -223,7 +250,7 @@ object AmberUtils {
openAmber(
encryptedContent,
signerType,
activityResultLauncher,
decryptResultLauncher,
pubKey,
id
)
@ -242,7 +269,7 @@ object AmberUtils {
openAmber(
encryptedContent,
signerType,
activityResultLauncher,
decryptResultLauncher,
pubKey,
id
)
@ -258,7 +285,7 @@ object AmberUtils {
openAmber(
encryptedContent,
signerType,
activityResultLauncher,
decryptResultLauncher,
pubKey,
id
)
@ -277,7 +304,7 @@ object AmberUtils {
signerType,
activityResultLauncher,
pubKey,
"encrypt"
id
)
while (isActivityRunning) {
Thread.sleep(100)
@ -294,7 +321,7 @@ object AmberUtils {
openAmber(
event.toJson(),
SignerType.DECRYPT_ZAP_EVENT,
activityResultLauncher,
decryptResultLauncher,
event.pubKey,
event.id
)